ARM Packages: Fixed missing braces (the warning was disabled by GCC)

[mirror_edk2.git] / ArmPlatformPkg / ArmVExpressPkg / ArmVExpress-CTA9x4.dsc

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index 42a5119e74a2305f4c2fcaf1f0df184e06ddcb11..df1073d144b2554c143bb546297fb113892e9e47 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011-2014, 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
@@ -70,9 +70,9 @@
 [BuildOptions]\r
   RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A9 -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4\r
 \r
-  GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a9 -mfpu=neon -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4\r
+  GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a9 -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4\r
   \r
-  XCODE:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a9 -mfpu=neon -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4\r
+  XCODE:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a9 -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4\r
 \r
 ################################################################################\r
 #\r
@@ -81,7 +81,7 @@
 ################################################################################\r
 \r
 [PcdsFeatureFlag.common]\r
-!ifdef EDK2_ARMVE_STANDALONE\r
+!if $(EDK2_ARMVE_STANDALONE) == 1\r
   gArmPlatformTokenSpaceGuid.PcdStandalone|TRUE\r
 !else\r
   gArmPlatformTokenSpaceGuid.PcdStandalone|FALSE\r
@@ -167,7 +167,7 @@
   gArmPlatformTokenSpaceGuid.PcdPL180MciBaseAddress|0x10005000\r
   \r
   #\r
-  # ARM PL390 General Interrupt Controller\r
+  # ARM General Interrupt Controller\r
   #\r
   gArmTokenSpaceGuid.PcdGicDistributorBase|0x1e001000\r
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x1e000100\r
@@ -179,7 +179,6 @@
   gArmTokenSpaceGuid.PcdArmMachineType|2272\r
   gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"NorFlash"\r
   gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)/MemoryMapped(0x0,0x46000000,0x46400000)"\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|""\r
   gArmPlatformTokenSpaceGuid.PcdDefaultBootType|1\r
 \r
   # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)\r
@@ -191,6 +190,12 @@
   #\r
   gArmTokenSpaceGuid.PcdL2x0ControllerBase|0x1E00A000\r
 \r
+  # ISP1761 USB OTG Controller\r
+  gEmbeddedTokenSpaceGuid.PcdIsp1761BaseAddress|0x4f000000\r
+
+  # LAN9118 Ethernet Driver PCDs\r
+  gEmbeddedTokenSpaceGuid.PcdLan9118DxeBaseAddress|0x4E000000\r
+\r
 ################################################################################\r
 #\r
 # Components Section - list of all EDK II Modules needed by this Platform\r
@@ -204,7 +209,7 @@
   ArmPlatformPkg/Sec/Sec.inf {\r
     <LibraryClasses>\r
       # Use the implementation which set the Secure bits\r
-      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf\r
+      ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf\r
   }\r
   \r
   #\r
@@ -270,12 +275,17 @@
   \r
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
 \r
-  ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf\r
+  ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
   ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
   ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf\r
   ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf\r
   ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf\r
 \r
+  #\r
+  # Platform\r
+  #\r
+  ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf\r
+\r
   #\r
   # Filesystems\r
   #\r
@@ -286,7 +296,10 @@
   #\r
   EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
   ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
-  \r
+\r
+  # SMSC LAN 9118\r
+  EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf\r
+\r
   #\r
   # FAT filesystem + GPT/MBR partitioning\r
   #\r