ArmPlatformPkg/LcdGraphicsOutputDxe: check PrimeCell ID before initializing

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemu.fdf

diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
index 4ef0f8bb6aa49919f536d326c18b05f0726703bf..89a4015e595b0308e51f6d41318d6d4ea8cfbd45 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.fdf
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
@@ -104,12 +104,10 @@ READ_LOCK_STATUS   = TRUE
   APRIORI DXE {\r
     INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
     INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf\r
-    INF ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf\r
   }\r
   INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
   INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf\r
-  INF ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf\r
 \r
   #\r
   # PI DXE Drivers producing Architectural Protocols (EFI Services)\r
@@ -171,13 +169,9 @@ READ_LOCK_STATUS   = TRUE
   # Bds\r
   #\r
   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
-!if $(INTEL_BDS) == TRUE\r
   INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
   INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
   INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
-!else\r
-  INF ArmPlatformPkg/Bds/Bds.inf\r
-!endif\r
 \r
   #\r
   # Networking stack\r
@@ -234,13 +228,16 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
   INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
 \r
-!if $(INTEL_BDS) == TRUE\r
   #\r
   # TianoCore logo (splash screen)\r
   #\r
   FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
   }\r
+\r
+!if $(ARCH) == ARM\r
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
+  INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf\r
 !endif\r
 \r
 [FV.FVMAIN_COMPACT]\r
@@ -309,20 +306,20 @@ READ_LOCK_STATUS   = TRUE
 ############################################################################\r
 \r
 [Rule.Common.SEC]\r
-  FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {\r
-    TE  TE Align = 128                  $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+  FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED FIXED {\r
+    TE  TE Align = Auto                 $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r
 [Rule.Common.PEI_CORE]\r
-  FILE PEI_CORE = $(NAMED_GUID) {\r
-    TE     TE Align = 8                 $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+  FILE PEI_CORE = $(NAMED_GUID) FIXED {\r
+    TE     TE Align = Auto              $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI     STRING ="$(MODULE_NAME)" Optional\r
   }\r
 \r
 [Rule.Common.PEIM]\r
-  FILE PEIM = $(NAMED_GUID) {\r
+  FILE PEIM = $(NAMED_GUID) FIXED {\r
      PEI_DEPEX PEI_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex\r
-     TE       TE Align = 8              $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+     TE       TE Align = Auto           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
      UI       STRING="$(MODULE_NAME)" Optional\r
   }\r
 \r