ArmVirtPkg: ArmVirtQemuKernel: make ACPI support AARCH64 only

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemuKernel.fdf

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf
index 38bd1d3b3d7482f3e3ed4aa5b285b68fdc3d7934..772b0f6ed982463903b7ed510fd8486a8e7070af 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.fdf
+++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf
@@ -1,7 +1,7 @@
 #\r
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.\r
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.\r
-#  Copyright (c) 2015, Intel Corporation. All rights reserved.\r
+#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -91,6 +91,7 @@ DATA = {
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize\r
 FV = FVMAIN_COMPACT\r
 \r
+!include VarStore.fdf.inc\r
 \r
 ################################################################################\r
 #\r
@@ -123,13 +124,10 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
-  APRIORI DXE {\r
-    INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
-    INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.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/VirtioFdtDxe/VirtioFdtDxe.inf\r
+  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
 \r
   #\r
   # PI DXE Drivers producing Architectural Protocols (EFI Services)\r
@@ -160,11 +158,7 @@ READ_LOCK_STATUS   = TRUE
 \r
   INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf\r
-!if $(SECURE_BOOT_ENABLE) == TRUE\r
-  INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf\r
-!else\r
   INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
-!endif\r
   INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
 \r
   #\r
@@ -172,7 +166,7 @@ READ_LOCK_STATUS   = TRUE
   #\r
   INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
-  INF FatBinPkg/EnhancedFatDxe/Fat.inf\r
+  INF FatPkg/EnhancedFatDxe/Fat.inf\r
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
 \r
   #\r
@@ -193,7 +187,9 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
   INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
-  INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+  INF MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf\r
+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+  INF MdeModulePkg/Application/UiApp/UiApp.inf\r
 \r
   #\r
   # Networking stack\r
@@ -222,11 +218,13 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
   INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
 \r
+!if $(ARCH) == AARCH64\r
   #\r
   # ACPI Support\r
   #\r
   INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
   INF OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf\r
+!endif\r
 \r
   #\r
   # PCI support\r