From 747de9f849bed1f233bd30100c9c0c5195e0ffb1 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Mon, 25 Jan 2021 12:21:38 +0000 Subject: [PATCH] CMake cores: fix NS cores Set DOMAIN_NS=1 only for _NS cores. We had it otherway around. I verified one non NS target that was failing to build, plus also checked the old tools that had this definitions: ``` 91: "Cortex-M23-NS": ["__CORTEX_M23", "ARM_MATH_ARMV8MBL", "DOMAIN_NS=1", 92 "__CMSIS_RTOS", "__MBED_CMSIS_RTOS_CM"], 93 "Cortex-M23": ["__CORTEX_M23", "ARM_MATH_ARMV8MBL", "__CMSIS_RTOS", 94 "__MBED_CMSIS_RTOS_CM"], ``` --- tools/cmake/cores/Cortex-M23-NS.cmake | 1 + tools/cmake/cores/Cortex-M23.cmake | 1 - tools/cmake/cores/Cortex-M33-NS.cmake | 1 + tools/cmake/cores/Cortex-M33.cmake | 1 - tools/cmake/cores/Cortex-M33F-NS.cmake | 1 + tools/cmake/cores/Cortex-M33F.cmake | 1 - 6 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/cmake/cores/Cortex-M23-NS.cmake b/tools/cmake/cores/Cortex-M23-NS.cmake index 7e8e0c85ae..b78cc8eb25 100644 --- a/tools/cmake/cores/Cortex-M23-NS.cmake +++ b/tools/cmake/cores/Cortex-M23-NS.cmake @@ -18,6 +18,7 @@ function(mbed_set_cpu_core_definitions target) INTERFACE __CORTEX_M23 ARM_MATH_ARMV8MBL + DOMAIN_NS=1 __CMSIS_RTOS __MBED_CMSIS_RTOS_CM ) diff --git a/tools/cmake/cores/Cortex-M23.cmake b/tools/cmake/cores/Cortex-M23.cmake index b78cc8eb25..7e8e0c85ae 100644 --- a/tools/cmake/cores/Cortex-M23.cmake +++ b/tools/cmake/cores/Cortex-M23.cmake @@ -18,7 +18,6 @@ function(mbed_set_cpu_core_definitions target) INTERFACE __CORTEX_M23 ARM_MATH_ARMV8MBL - DOMAIN_NS=1 __CMSIS_RTOS __MBED_CMSIS_RTOS_CM ) diff --git a/tools/cmake/cores/Cortex-M33-NS.cmake b/tools/cmake/cores/Cortex-M33-NS.cmake index 94123bb7c8..5b4a40c816 100644 --- a/tools/cmake/cores/Cortex-M33-NS.cmake +++ b/tools/cmake/cores/Cortex-M33-NS.cmake @@ -20,6 +20,7 @@ function(mbed_set_cpu_core_definitions target) INTERFACE __CORTEX_M33 ARM_MATH_ARMV8MML + DOMAIN_NS=1 __CMSIS_RTOS __MBED_CMSIS_RTOS_CM ) diff --git a/tools/cmake/cores/Cortex-M33.cmake b/tools/cmake/cores/Cortex-M33.cmake index 5b4a40c816..94123bb7c8 100644 --- a/tools/cmake/cores/Cortex-M33.cmake +++ b/tools/cmake/cores/Cortex-M33.cmake @@ -20,7 +20,6 @@ function(mbed_set_cpu_core_definitions target) INTERFACE __CORTEX_M33 ARM_MATH_ARMV8MML - DOMAIN_NS=1 __CMSIS_RTOS __MBED_CMSIS_RTOS_CM ) diff --git a/tools/cmake/cores/Cortex-M33F-NS.cmake b/tools/cmake/cores/Cortex-M33F-NS.cmake index 7e610477aa..6252566f67 100644 --- a/tools/cmake/cores/Cortex-M33F-NS.cmake +++ b/tools/cmake/cores/Cortex-M33F-NS.cmake @@ -23,6 +23,7 @@ function(mbed_set_cpu_core_definitions target) INTERFACE __CORTEX_M33 ARM_MATH_ARMV8MML + DOMAIN_NS=1 __FPU_PRESENT=1U __CMSIS_RTOS __MBED_CMSIS_RTOS_CM diff --git a/tools/cmake/cores/Cortex-M33F.cmake b/tools/cmake/cores/Cortex-M33F.cmake index 4e0b3bdf3b..f787fd6f26 100644 --- a/tools/cmake/cores/Cortex-M33F.cmake +++ b/tools/cmake/cores/Cortex-M33F.cmake @@ -22,7 +22,6 @@ function(mbed_set_cpu_core_definitions target) INTERFACE __CORTEX_M33 ARM_MATH_ARMV8MML - DOMAIN_NS=1 __FPU_PRESENT=1U __CMSIS_RTOS __MBED_CMSIS_RTOS_CM