diff options
author | David Hu <david.hu@arm.com> | 2019-09-19 14:49:41 +0800 |
---|---|---|
committer | David Hu <david.hu@arm.com> | 2019-09-26 09:39:24 +0800 |
commit | 3f9547df5f243a57df7a49b9e8aa348ba995b9ab (patch) | |
tree | 7ba175f57dfd0fdf59b57f064246e0b633d9dfe7 /cmake | |
parent | d9a6f597187cb3cf76f332d748fdacc554ea7c6d (diff) | |
download | trusted-firmware-m-3f9547df5f243a57df7a49b9e8aa348ba995b9ab.tar.gz |
Build: Add support of Cortex-M0plus and Cortex-M4 in GNUARM
Add Cortex-M0plus and Cortex-M4 entries in GNUARM cmake files.
Change-Id: I3180642d77092189be0e885ff8521b95c440c923
Signed-off-by: David Hu <david.hu@arm.com>
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/Common/CompilerGNUARM63.cmake | 17 | ||||
-rw-r--r-- | cmake/Common/CompilerGNUARM73.cmake | 17 | ||||
-rw-r--r-- | cmake/Common/CompilerGNUARM83.cmake | 18 |
3 files changed, 44 insertions, 8 deletions
diff --git a/cmake/Common/CompilerGNUARM63.cmake b/cmake/Common/CompilerGNUARM63.cmake index a9bdd89f52..2d3d051937 100644 --- a/cmake/Common/CompilerGNUARM63.cmake +++ b/cmake/Common/CompilerGNUARM63.cmake @@ -30,6 +30,11 @@ elseif(${ARM_CPU_ARCHITECTURE} STREQUAL "ARMv7-M") string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") +elseif(${ARM_CPU_ARCHITECTURE} STREQUAL "ARMv6-M") + string_append_unique_item(STRING CMAKE_C_FLAGS_CPU KEY "-march=" VAL "-march=armv6-m") + string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-march=" VAL "-march=armv6-m") + string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "-march=" VAL "-march=armv6-m") + string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "-march=" VAL "-march=armv6-m") else() message(FATAL_ERROR "Unknown or unsupported ARM cpu architecture setting.") endif() @@ -53,6 +58,18 @@ if(NOT DEFINED ARM_CPU_ARCHITECTURE) string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=cortex-m23") string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "--cpu=" VAL "--cpu=Cortex-M23") string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "--cpu=" VAL "--cpu=Cortex-M23") + elseif(${ARM_CPU_TYPE} STREQUAL "Cortex-M4") + string_append_unique_item(STRING CMAKE_C_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") + string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") + string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") + string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") + set(ARM_CPU_ARCHITECTURE "ARMv7-M") + elseif(${ARM_CPU_TYPE} STREQUAL "Cortex-M0p") + string_append_unique_item(STRING CMAKE_C_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=cortex-m0plus") + string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=cortex-m0plus") + string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=Cortex-M0plus") + string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=Cortex-M0plus") + set(ARM_CPU_ARCHITECTURE "ARMv6-M") else() message(FATAL_ERROR "Unknown ARM cpu setting.") endif() diff --git a/cmake/Common/CompilerGNUARM73.cmake b/cmake/Common/CompilerGNUARM73.cmake index 5b173e05ef..861e32928d 100644 --- a/cmake/Common/CompilerGNUARM73.cmake +++ b/cmake/Common/CompilerGNUARM73.cmake @@ -30,6 +30,11 @@ elseif(${ARM_CPU_ARCHITECTURE} STREQUAL "ARMv7-M") string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") +elseif(${ARM_CPU_ARCHITECTURE} STREQUAL "ARMv6-M") + string_append_unique_item(STRING CMAKE_C_FLAGS_CPU KEY "-march=" VAL "-march=armv6-m") + string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-march=" VAL "-march=armv6-m") + string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "-march=" VAL "-march=armv6-m") + string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "-march=" VAL "-march=armv6-m") else() message(FATAL_ERROR "Unknown or unsupported ARM cpu architecture setting.") endif() @@ -53,6 +58,18 @@ if(NOT DEFINED ARM_CPU_ARCHITECTURE) string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=cortex-m23") string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "--cpu=" VAL "--cpu=Cortex-M23") string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "--cpu=" VAL "--cpu=Cortex-M23") + elseif(${ARM_CPU_TYPE} STREQUAL "Cortex-M4") + string_append_unique_item(STRING CMAKE_C_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") + string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") + string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") + string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") + set(ARM_CPU_ARCHITECTURE "ARMv7-M") + elseif(${ARM_CPU_TYPE} STREQUAL "Cortex-M0p") + string_append_unique_item(STRING CMAKE_C_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=cortex-m0plus") + string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=cortex-m0plus") + string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=Cortex-M0plus") + string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=Cortex-M0plus") + set(ARM_CPU_ARCHITECTURE "ARMv6-M") else() message(FATAL_ERROR "Unknown ARM cpu setting.") endif() diff --git a/cmake/Common/CompilerGNUARM83.cmake b/cmake/Common/CompilerGNUARM83.cmake index 9931deae02..2b973e5251 100644 --- a/cmake/Common/CompilerGNUARM83.cmake +++ b/cmake/Common/CompilerGNUARM83.cmake @@ -59,15 +59,17 @@ if(NOT DEFINED ARM_CPU_ARCHITECTURE) string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "--cpu=" VAL "--cpu=Cortex-M23") string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "--cpu=" VAL "--cpu=Cortex-M23") elseif(${ARM_CPU_TYPE} STREQUAL "Cortex-M4") - string_append_unique_item (STRING CMAKE_C_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") - string_append_unique_item (STRING CMAKE_CXX_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") - string_append_unique_item (STRING CMAKE_ASM_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") - string_append_unique_item (STRING CMAKE_LINK_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") + string_append_unique_item(STRING CMAKE_C_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") + string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") + string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") + string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m") + set(ARM_CPU_ARCHITECTURE "ARMv7-M") elseif(${ARM_CPU_TYPE} STREQUAL "Cortex-M0p") - string_append_unique_item (STRING CMAKE_C_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=cortex-m0plus") - string_append_unique_item (STRING CMAKE_CXX_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=cortex-m0plus") - string_append_unique_item (STRING CMAKE_ASM_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=Cortex-m0plus") - string_append_unique_item (STRING CMAKE_LINK_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=Cortex-m0plus") + string_append_unique_item(STRING CMAKE_C_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=cortex-m0plus") + string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=cortex-m0plus") + string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=Cortex-m0plus") + string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=Cortex-m0plus") + set(ARM_CPU_ARCHITECTURE "ARMv6-M") else() message(FATAL_ERROR "Unknown ARM cpu setting.") endif() |