diff options
author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-11-16 14:26:27 +0000 |
---|---|---|
committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-11-16 16:02:23 +0000 |
commit | 302e8eda3b2f848e54bd21d0a8b2e5d8b891bffd (patch) | |
tree | 7bfbfcf16f95d57c38436d807923be2924a33b11 /ArmPkg | |
parent | 44d71c217ccbd87e8c42768b4e84b1c899d779e2 (diff) | |
download | edk2-302e8eda3b2f848e54bd21d0a8b2e5d8b891bffd.tar.gz edk2-302e8eda3b2f848e54bd21d0a8b2e5d8b891bffd.tar.bz2 edk2-302e8eda3b2f848e54bd21d0a8b2e5d8b891bffd.zip |
ArmPkg: move RVCT PLATFORM_FLAGS override into ArmHvcLib/ArmSmcLib
Currently, each ARM platform built with RVCT that uses ArmHvcLib
or ArmSmcLib needs to specify a CPU target that implements both the
security and virtualization extensions, so that the assembler does
not choke on the 'hvc' and 'smc' instructions in ArmHvcLib/ArmSvcLib.
Let's move these overrides into the module .INFs so we can lift this
requirement at the platform side.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Diffstat (limited to 'ArmPkg')
-rw-r--r-- | ArmPkg/ArmPkg.dsc | 2 | ||||
-rw-r--r-- | ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf | 3 | ||||
-rw-r--r-- | ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index cf9a5c1210..a396c96bf8 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -33,8 +33,6 @@ [BuildOptions]
XCODE:*_*_ARM_PLATFORM_FLAGS == -arch armv7
GCC:*_*_ARM_PLATFORM_FLAGS == -march=armv7-a -mfpu=neon
- # We use A15 to get the Secure and Virtualization extensions
- RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15
RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
*_*_*_CC_FLAGS = -DDISABLE_NEW_DEPRECATED_INTERFACES
diff --git a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf b/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf index 92efac5741..d046ef3ba2 100644 --- a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf +++ b/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf @@ -30,3 +30,6 @@ [Packages]
MdePkg/MdePkg.dec
ArmPkg/ArmPkg.dec
+
+[BuildOptions]
+ RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15
diff --git a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf index 9f9ba72996..f00c73821f 100644 --- a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf +++ b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf @@ -29,3 +29,6 @@ [Packages]
MdePkg/MdePkg.dec
ArmPkg/ArmPkg.dec
+
+[BuildOptions]
+ RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu 7-A.security
|