Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Include/Guid

Timestamp:

Oct 28, 2015 8:17:18 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103761

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• ShellPkg/Include/Guid/ShellAliasGuid.h (modified) (1 diff)
• ShellPkg/Include/Guid/ShellLibHiiGuid.h (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Include/Guid/ShellAliasGuid.h

@@ -24 +24 @@
 
 #endif
-

trunk/src/VBox/Devices/EFI/Firmware/ShellPkg/Include/Guid/ShellLibHiiGuid.h

@@ -55 +55 @@
     0xf3d301bb, 0xf4a5, 0x45a8, { 0xb0, 0xb7, 0xfa, 0x99, 0x9c, 0x62, 0x37, 0xae } \
   }
+#define SHELL_BCFG_HII_GUID \
+  { \
+    0x5f5f605d, 0x1583, 0x4a2d, {0xa6, 0xb2, 0xeb, 0x12, 0xda, 0xb4, 0xa2, 0xb6 } \
+  }
 
 extern EFI_GUID gHandleParsingHiiGuid;
@@ -64 +68 @@
 extern EFI_GUID gShellLevel3HiiGuid;
 extern EFI_GUID gShellNetwork1HiiGuid;
+extern EFI_GUID gShellBcfgHiiGuid;
 
 #endif