ARM Packages: Clean code (Remove unused PCDs, ...)

[mirror_edk2.git] / ArmPlatformPkg / ArmVExpressPkg / ArmVExpress-RTSM-A15.dsc

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
index a11c51d1b1bb33e7513d62c2367ca45f360d9890..4f92fa7ff4af8a678c994c7af9b849a7a23d58b7 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2011, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011-2012, ARM Limited. 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
@@ -40,15 +40,13 @@
 \r
   #DebugAgentTimerLib|ArmPlatformPkg/ArmVExpressPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf\r
 \r
-  # ARM PL390 General Interrupt Driver in Secure and Non-secure\r
-  ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf\r
-  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
-\r
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf \r
 \r
 [LibraryClasses.common.SEC]\r
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf\r
-  ArmPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressSecLib.inf\r
+  ArmPlatformSecLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/ArmVExpressSecLib.inf\r
+  ArmPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf\r
+\r
 [BuildOptions]\r
   RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM\r
 \r
@@ -123,11 +121,6 @@
   ## PL011 - Serial Terminal\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x1c090000\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|38400\r
-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8\r
-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1\r
-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1\r
-  gArmPlatformTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|32\r
-  gArmPlatformTokenSpaceGuid.PcdUartDefaultTimeout|1000000\r
 \r
   ## PL031 RealTimeClock\r
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x1C170000\r
@@ -135,6 +128,10 @@
   ## 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
+  \r
   #\r
   # ARM PL390 General Interrupt Controller\r
   #\r
@@ -146,8 +143,8 @@
   #\r
   # Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux: \r
   gArmTokenSpaceGuid.PcdArmMachineType|2272\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"NorFlash"\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)/MemoryMapped(0x0,0x46000000,0x46400000)"\r
+  gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"SemiHosting"\r
+  gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/zImage"\r
   gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|""\r
   gArmPlatformTokenSpaceGuid.PcdDefaultBootType|1\r
 \r
@@ -176,7 +173,11 @@
   #\r
   # SEC\r
   #\r
-  ArmPlatformPkg/Sec/Sec.inf\r
+  ArmPlatformPkg/Sec/Sec.inf {\r
+    <LibraryClasses>\r
+      # Use the implementation which set the Secure bits\r
+      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf\r
+  }\r
   \r
   #\r
   # PEI Phase modules\r