aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSami Mujawar <sami.mujawar@arm.com>2020-04-23 09:28:37 +0100
committerManish Pandey <manish.pandey2@arm.com>2020-06-29 21:50:45 +0000
commit4a565bd88896944bf5f457f7bd6b148151fbf4dc (patch)
tree5e249900be52fe45190db89337ff7e2fadcc45f5
parentd6296e3a9f09fb288f93a82cf54e4a25d2dd9faa (diff)
downloadtrusted-firmware-a-4a565bd88896944bf5f457f7bd6b148151fbf4dc.tar.gz
Fix makefile to build on a Windows host PC
The TF-A firmware build system is capable of building on both Unix like and Windows host PCs. The commit ID 7ff088 "Enable MTE support" updated the Makefile to conditionally enable the MTE support if the AArch64 architecture revision was greater than 8.5. However, the Makefile changes were dependent on shell commands that are only available on unix shells, resulting in build failures on a Windows host PC. This patch fixes the Makefile by using a more portable approach for comparing the architecture revision. Change-Id: Icb56cbecd8af5b0b9056d105970ff4a6edd1755a Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
-rw-r--r--Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 160cd44cc..becbf0341 100644
--- a/Makefile
+++ b/Makefile
@@ -197,10 +197,8 @@ endif
# Memory tagging is supported in architecture Armv8.5-A AArch64 and onwards
ifeq ($(ARCH), aarch64)
-ifeq ($(shell test $(ARM_ARCH_MAJOR) -gt 8; echo $$?),0)
-mem_tag_arch_support = yes
-else ifeq ($(shell test $(ARM_ARCH_MAJOR) -eq 8 -a $(ARM_ARCH_MINOR) -ge 5; \
- echo $$?),0)
+# Check if revision is greater than or equal to 8.5
+ifeq "8.5" "$(word 1, $(sort 8.5 $(ARM_ARCH_MAJOR).$(ARM_ARCH_MINOR)))"
mem_tag_arch_support = yes
endif
endif