diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2013-01-16 09:23:38 +0000 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2013-01-16 09:23:38 +0000 |
| commit | 7c92ab233164f6d9956368784c5c22882ea58459 (patch) | |
| tree | d3060b1dfe3713ba558cbde7a3761fe8bc5f292d | |
| parent | 0f586755428cde64f4e46fd0171c416e030d6759 (diff) | |
| parent | 545efadfb62411c60daba6daf3de50ef716e521a (diff) | |
Merging linaro-topic-tc2 into linaro-tracking-13.01linaro-uefi-2013.01-rc1
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
| -rw-r--r-- | ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc index 38101dfa84..cbacd315c9 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -21,12 +21,18 @@ PLATFORM_GUID = 0b511920-978d-4b34-acc0-3d9f8e6f9d81
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x00010005
+!ifdef $(EDK2_OUT_DIR) + OUTPUT_DIRECTORY = $(EDK2_OUT_DIR) +!else OUTPUT_DIRECTORY = Build/ArmVExpress-CTA15-A7
+!endif SUPPORTED_ARCHITECTURES = ARM
BUILD_TARGETS = DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
FLASH_DEFINITION = ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
+!ifndef $(EDK2_SKIP_PEICORE) DEFINE EDK2_SKIP_PEICORE=1
+!endif !include ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
@@ -121,8 +127,8 @@ # A7_0 = 0x100, GicCoreId = 2
# A7_1 = 0x101, GicCoreId = 3
# A7_2 = 0x102, GicCoreId = 4
- gArmTokenSpaceGuid.PcdArmPrimaryCore|0x100
- gArmTokenSpaceGuid.PcdGicPrimaryCoreId|2
+ gArmTokenSpaceGuid.PcdArmPrimaryCore|0 + gArmTokenSpaceGuid.PcdGicPrimaryCoreId|0 !endif
#
|