Revision: 16508
          http://sourceforge.net/p/edk2/code/16508
Author:   oliviermartin
Date:     2014-12-12 18:58:47 +0000 (Fri, 12 Dec 2014)
Log Message:
-----------
ArmPlatformPkg: The toolchain family name can be omitted if the options are 
common

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <[email protected]>

Modified Paths:
--------------
    trunk/edk2/ArmPkg/ArmPkg.dsc
    trunk/edk2/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc
    trunk/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
    trunk/edk2/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc

Modified: trunk/edk2/ArmPkg/ArmPkg.dsc
===================================================================
--- trunk/edk2/ArmPkg/ArmPkg.dsc        2014-12-12 06:22:13 UTC (rev 16507)
+++ trunk/edk2/ArmPkg/ArmPkg.dsc        2014-12-12 18:58:47 UTC (rev 16508)
@@ -31,15 +31,12 @@
 
 [BuildOptions]
   XCODE:*_*_ARM_PLATFORM_FLAGS  == -arch armv7
-  XCODE:RELEASE_*_*_CC_FLAGS     = -DMDEPKG_NDEBUG
-
   GCC:*_*_ARM_PLATFORM_FLAGS    == -march=armv7-a -mfpu=neon
-  GCC:RELEASE_*_*_CC_FLAGS     = -DMDEPKG_NDEBUG
-
   # We use A15 to get the Secure and Virtualization extensions
   RVCT:*_*_ARM_PLATFORM_FLAGS  == --cpu Cortex-A15
-  RVCT:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG
 
+  RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG
+
 [LibraryClasses.common]
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

Modified: trunk/edk2/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc
===================================================================
--- trunk/edk2/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc    2014-12-12 06:22:13 UTC 
(rev 16507)
+++ trunk/edk2/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc    2014-12-12 18:58:47 UTC 
(rev 16508)
@@ -60,7 +60,7 @@
   MemoryInitPeiLib|ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf
 
 [BuildOptions]
-  GCC:*_*_*_PLATFORM_FLAGS == 
-I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include 
-I$(WORKSPACE)/ArmPlatformPkg/ArmJunoPkg/Include
+  *_*_*_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include 
-I$(WORKSPACE)/ArmPlatformPkg/ArmJunoPkg/Include
 
 
################################################################################
 #

Modified: trunk/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
===================================================================
--- trunk/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc   
2014-12-12 06:22:13 UTC (rev 16507)
+++ trunk/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc   
2014-12-12 18:58:47 UTC (rev 16508)
@@ -49,11 +49,8 @@
 
 [BuildOptions]
 !ifdef ARM_BIGLITTLE_TC2
-  RVCT:*_*_ARM_ARCHCC_FLAGS  = -DARM_BIGLITTLE_TC2=1
-  RVCT:*_*_ARM_PP_FLAGS  = -DARM_BIGLITTLE_TC2=1
-
-  GCC:*_*_ARM_ARCHCC_FLAGS  = -DARM_BIGLITTLE_TC2=1
-  GCC:*_*_ARM_PP_FLAGS  = -DARM_BIGLITTLE_TC2=1
+  *_*_ARM_ARCHCC_FLAGS  = -DARM_BIGLITTLE_TC2=1
+  *_*_ARM_PP_FLAGS  = -DARM_BIGLITTLE_TC2=1
 !endif
 
   RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 
-I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include 
-I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA15-A7

Modified: 
trunk/edk2/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
===================================================================
--- trunk/edk2/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc    
2014-12-12 06:22:13 UTC (rev 16507)
+++ trunk/edk2/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc    
2014-12-12 18:58:47 UTC (rev 16508)
@@ -67,7 +67,7 @@
 [BuildOptions]
   RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 
-I$(WORKSPACE)/ArmPlatformPkg/ArmVirtualizationPkg/Include
   GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 
-I$(WORKSPACE)/ArmPlatformPkg/ArmVirtualizationPkg/Include
-  GCC:*_*_AARCH64_PLATFORM_FLAGS == 
-I$(WORKSPACE)/ArmPlatformPkg/ArmVirtualizationPkg/Include
+  *_*_AARCH64_PLATFORM_FLAGS == 
-I$(WORKSPACE)/ArmPlatformPkg/ArmVirtualizationPkg/Include
 
 
 
################################################################################


------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to