diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2012-11-26 17:04:36 +0000 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2012-11-26 17:04:36 +0000 |
| commit | 939b6e81660592d245a12e69a94a2590fc0eb505 (patch) | |
| tree | b121f045b93c54a310ca92190ca73d9836c7181e | |
| parent | 924f109a5b1080c65c28c9210453b725fec71520 (diff) | |
| parent | 612127769e3fd89789adccc971157ca428b06f3d (diff) | |
Merge branch 'armlt-tracking-tc2' into armlt-tracking
| -rw-r--r-- | edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc b/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc index 38101dfa8..963243d8f 100644 --- a/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/edk2/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
#
|