UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / EmulatorPkg / EmulatorPkg.fdf

diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf
index 94a060c999385eb87faf6f5b8414f53df663a8af..5420756eaa6fe7af9cefdfabe89bd8b063e4bfef 100644 (file)
--- a/EmulatorPkg/EmulatorPkg.fdf
+++ b/EmulatorPkg/EmulatorPkg.fdf
@@ -46,10 +46,17 @@ DATA = {
   # Blockmap[1]: End\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   ## This is the VARIABLE_STORE_HEADER\r
+!if $(SECURE_BOOT_ENABLE) == FALSE\r
   #Signature: gEfiVariableGuid =\r
   #  { 0xddcf3616, 0x3275, 0x4164, { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}\r
   0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x64, 0x41,\r
   0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d,\r
+!else\r
+  # Signature: gEfiAuthenticatedVariableGuid =\r
+  #  { 0xaaf32c78, 0x947b, 0x439a, { 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92 }}\r
+  0x78, 0x2c, 0xf3, 0xaa, 0x7b, 0x94, 0x9a, 0x43,\r
+  0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92,\r
+!endif\r
   #Size: 0xc000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize) - 0x48 (size of EFI_FIRMWARE_VOLUME_HEADER) = 0xBFB8\r
   # This can speed up the Variable Dispatch a bit.\r
   0xB8, 0xBF, 0x00, 0x00,\r
@@ -178,31 +185,39 @@ INF  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
 INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
 INF  MdeModulePkg/Universal/PrintDxe/PrintDxe.inf\r
 INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+!if "XCODE5" not in $(TOOL_CHAIN_TAG)\r
 INF  MdeModulePkg/Logo/LogoDxe.inf\r
+!endif\r
 INF  MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.inf\r
 INF  RuleOverride = UI MdeModulePkg/Application/UiApp/UiApp.inf\r
 INF  MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf\r
 INF  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf\r
 \r
+#\r
+# Secure Boot Key Enroll\r
+#\r
+!if $(SECURE_BOOT_ENABLE) == TRUE\r
+INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
+!endif\r
+\r
 #\r
 # Network stack drivers\r
 #\r
 !if $(NETWORK_SUPPORT)\r
 INF  EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf\r
 !endif\r
-INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
-INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
-INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
-INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
-INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-INF  NetworkPkg/TcpDxe/TcpDxe.inf\r
-INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
+!include NetworkPkg/Network.fdf.inc\r
+\r
+#\r
+# EFI Redfish drivers\r
+#\r
+!include RedfishPkg/Redfish.fdf.inc\r
 \r
 INF FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
+!if "XCODE5" not in $(TOOL_CHAIN_TAG)\r
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
+!endif\r
 INF  ShellPkg/Application/Shell/Shell.inf\r
 \r
 [Rule.Common.SEC]\r