ArmPlatformPkg/FVP: unify support for Foundation and Base models

[mirror_edk2.git] / ArmPlatformPkg / ArmVExpressPkg / ArmVExpress-FVP-AArch64.dsc

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
index 71c794b9fdc54808cf9c83e58d9a80bdf98bbd1b..3f363064b23f46c92e638f2c032c2830a4754da8 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
@@ -41,9 +41,7 @@
 \r
   ArmPlatformSysConfigLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf\r
   NorFlashPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf\r
-!ifndef ARM_FOUNDATION_FVP\r
   LcdPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf\r
-!endif\r
 \r
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf\r
 \r
@@ -85,14 +83,9 @@
   gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Fixed Virtual Platform"\r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"ARM-FVP"\r
 \r
-!ifndef ARM_FOUNDATION_FVP\r
   # Up to 8 cores on Base models. This works fine if model happens to have less.\r
   gArmPlatformTokenSpaceGuid.PcdCoreCount|8\r
   gArmPlatformTokenSpaceGuid.PcdClusterCount|2\r
-!else\r
-  # Up to 4 cores on Foundation models. This works fine if model happens to have less.\r
-  gArmPlatformTokenSpaceGuid.PcdCoreCount|4\r
-!endif\r
 \r
   #\r
   # NV Storage PCDs. Use base of 0x0C000000 for NOR1\r
@@ -149,14 +142,12 @@
   ## PL031 RealTimeClock\r
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x1C170000\r
 \r
-!ifndef ARM_FOUNDATION_FVP\r
   ## PL111 Versatile Express Motherboard controller\r
   gArmPlatformTokenSpaceGuid.PcdPL111LcdBase|0x1C1F0000\r
 \r
   ## PL180 MMC/SD card controller\r
   gArmPlatformTokenSpaceGuid.PcdPL180SysMciRegAddress|0x1C010048\r
   gArmPlatformTokenSpaceGuid.PcdPL180MciBaseAddress|0x1C050000\r
-!endif\r
 \r
   #\r
   # ARM General Interrupt Controller\r
@@ -283,9 +274,7 @@
   ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
   ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf\r
-!ifndef ARM_FOUNDATION_FVP\r
   ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf\r
-!endif\r
   ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf\r
 \r
   #\r
@@ -293,13 +282,11 @@
   #\r
   ArmPkg/Filesystem/SemihostFs/SemihostFs.inf\r
 \r
-!ifndef ARM_FOUNDATION_FVP\r
   #\r
   # Multimedia Card Interface\r
   #\r
   EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
   ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
-!endif\r
 \r
   #\r
   # Platform Driver\r