Skip to content

Commit 33e57ee

Browse files
committed
TFM: Remove BL2 macro workaround for mbed-cli1/ARMClang
We worked around an issue with mbed-cli1 not recognising the BL2 macro from targets.json by adding patched versions of region_defs.h and flash_layout.h for ARM_MUSCA targets. In the patched headers we defined the BL2 macro to ensure it can be picked up by the ARM scatter files that include the headers. The current solution is not robust, because it means that the aforementioned headers easily become out of date. A workaround of defining the macros in the scatter files which need them was suggested in #14762 This commit applies the suggested changes to the ARM_MUSCA scatter files.
1 parent 98e3730 commit 33e57ee

File tree

2 files changed

+8
-0
lines changed
  • targets/TARGET_ARM_SSG

2 files changed

+8
-0
lines changed

targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/device/TOOLCHAIN_ARMC6/musca_ns.sct

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
* limitations under the License.
1919
*/
2020

21+
#if !defined(BL2)
22+
#define BL2
23+
#endif
24+
2125
#include "../../partition/region_defs.h"
2226
#include "../cmsis_nvic.h"
2327

targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/device/TOOLCHAIN_ARMC6/musca_ns.sct

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
* limitations under the License.
1919
*/
2020

21+
#if !defined(BL2)
22+
#define BL2
23+
#endif
24+
2125
#include "../../partition/region_defs.h"
2226
#include "../cmsis_nvic.h"
2327

0 commit comments

Comments
 (0)