ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8025 from deepikabhavnani/flag_update 

Align to CMSIS defines for Non-Secure
pull/8187/head
Martin Kojtal 2018-09-19 14:18:41 +02:00 committed by GitHub
parent 962273c4a1 ff80e298d2
commit 81d0948c09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
targets/TARGET_NUVOTON/TARGET_M2351/device/TOOLCHAIN_ARM_MICRO/M2351.sct
View File

@ -10,7 +10,7 @@
* Secure: 32KiB * Secure: 32KiB
* Non-secure: 64KiB * Non-secure: 64KiB
*/ */
#if defined(__DOMAIN_NS) && __DOMAIN_NS #if defined(DOMAIN_NS) && DOMAIN_NS
#ifndef MBED_APP_START #ifndef MBED_APP_START
#define MBED_APP_START 0x10040000 #define MBED_APP_START 0x10040000
@ -64,14 +64,14 @@
/* Initial/ISR stack size */ /* Initial/ISR stack size */
#if (! defined(NU_INITIAL_STACK_SIZE)) #if (! defined(NU_INITIAL_STACK_SIZE))
#if defined(__DOMAIN_NS) && __DOMAIN_NS #if defined(DOMAIN_NS) && DOMAIN_NS
#define NU_INITIAL_STACK_SIZE 0x800 #define NU_INITIAL_STACK_SIZE 0x800
#else #else
#define NU_INITIAL_STACK_SIZE 0x800 #define NU_INITIAL_STACK_SIZE 0x800
#endif #endif
#endif #endif
#if defined(__DOMAIN_NS) && __DOMAIN_NS #if defined(DOMAIN_NS) && DOMAIN_NS
LR_IROM1 MBED_APP_START LR_IROM1 MBED_APP_START
{ {

6
targets/TARGET_NUVOTON/TARGET_M2351/device/TOOLCHAIN_ARM_STD/M2351.sct
View File

@ -10,7 +10,7 @@
* Secure: 32KiB * Secure: 32KiB
* Non-secure: 64KiB * Non-secure: 64KiB
*/ */
#if defined(__DOMAIN_NS) && __DOMAIN_NS #if defined(DOMAIN_NS) && DOMAIN_NS
#ifndef MBED_APP_START #ifndef MBED_APP_START
#define MBED_APP_START 0x10040000 #define MBED_APP_START 0x10040000
@ -64,14 +64,14 @@
/* Initial/ISR stack size */ /* Initial/ISR stack size */
#if (! defined(NU_INITIAL_STACK_SIZE)) #if (! defined(NU_INITIAL_STACK_SIZE))
#if defined(__DOMAIN_NS) && __DOMAIN_NS #if defined(DOMAIN_NS) && DOMAIN_NS
#define NU_INITIAL_STACK_SIZE 0x800 #define NU_INITIAL_STACK_SIZE 0x800
#else #else
#define NU_INITIAL_STACK_SIZE 0x800 #define NU_INITIAL_STACK_SIZE 0x800
#endif #endif
#endif #endif
#if defined(__DOMAIN_NS) && __DOMAIN_NS #if defined(DOMAIN_NS) && DOMAIN_NS
LR_IROM1 MBED_APP_START LR_IROM1 MBED_APP_START
{ {

8
targets/TARGET_NUVOTON/TARGET_M2351/device/TOOLCHAIN_GCC_ARM/M2351.ld
View File

@ -12,7 +12,7 @@
* Secure: 32KiB * Secure: 32KiB
* Non-secure: 64KiB * Non-secure: 64KiB
*/ */
#if defined(__DOMAIN_NS) && __DOMAIN_NS #if defined(DOMAIN_NS) && DOMAIN_NS
#ifndef MBED_APP_START #ifndef MBED_APP_START
#define MBED_APP_START 0x10040000 #define MBED_APP_START 0x10040000
@ -50,7 +50,7 @@
#endif #endif
#if defined(__DOMAIN_NS) && __DOMAIN_NS #if defined(DOMAIN_NS) && DOMAIN_NS
StackSize = 0x800; StackSize = 0x800;
#else #else
StackSize = 0x800; StackSize = 0x800;
@ -71,7 +71,7 @@ StackSize = 0x800;
#endif #endif
#if defined(__DOMAIN_NS) && __DOMAIN_NS #if defined(DOMAIN_NS) && DOMAIN_NS
MEMORY MEMORY
{ {
@ -192,7 +192,7 @@ SECTIONS
KEEP(*(.eh_frame*)) KEEP(*(.eh_frame*))
} > FLASH } > FLASH
#if (! defined(__DOMAIN_NS)) || (! __DOMAIN_NS) #if (! defined(DOMAIN_NS)) || (! DOMAIN_NS)
/* Veneer$$CMSE : */ /* Veneer$$CMSE : */
.gnu.sgstubs : .gnu.sgstubs :
{ {

4
targets/TARGET_NUVOTON/TARGET_M2351/device/TOOLCHAIN_IAR/M2351.icf
View File

@ -2,7 +2,7 @@
/*-Editor annotation file-*/ /*-Editor annotation file-*/
/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */ /* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */
if (isdefinedsymbol(__DOMAIN_NS)) { if (isdefinedsymbol(DOMAIN_NS)) {
if (! isdefinedsymbol(MBED_APP_START)) { if (! isdefinedsymbol(MBED_APP_START)) {
define symbol MBED_APP_START = 0x10040000; define symbol MBED_APP_START = 0x10040000;
@ -85,7 +85,7 @@ do not initialize { section .noinit };
place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
place in ROM_region { readonly }; place in ROM_region { readonly };
if (! isdefinedsymbol(__DOMAIN_NS)) { if (! isdefinedsymbol(DOMAIN_NS)) {
place at address mem:__ICFEDIT_region_NSCROM_start__ { readonly section Veneer$$CMSE }; place at address mem:__ICFEDIT_region_NSCROM_start__ { readonly section Veneer$$CMSE };
} }
place at start of IRAM_region { block CSTACK }; place at start of IRAM_region { block CSTACK };

4
tools/toolchains/arm.py
View File

@ -424,9 +424,9 @@ class ARMC6(ARM_STD):
build_dir = kwargs['build_dir'] build_dir = kwargs['build_dir']
secure_file = join(build_dir, "cmse_lib.o") secure_file = join(build_dir, "cmse_lib.o")
self.flags["ld"] += ["--import_cmse_lib_out=%s" % secure_file] self.flags["ld"] += ["--import_cmse_lib_out=%s" % secure_file]
# Add linking time preprocessor macro __DOMAIN_NS # Add linking time preprocessor macro DOMAIN_NS
if target.core == "Cortex-M23-NS" or self.target.core == "Cortex-M33-NS": if target.core == "Cortex-M23-NS" or self.target.core == "Cortex-M33-NS":
define_string = self.make_ld_define("__DOMAIN_NS", "0x1") define_string = self.make_ld_define("DOMAIN_NS", "0x1")
self.flags["ld"].append(define_string) self.flags["ld"].append(define_string)
asm_cpu = { asm_cpu = {

2
tools/toolchains/gcc.py
View File

@ -97,7 +97,7 @@ class GCC(mbedToolchain):
"-Wl,--out-implib=%s" % join(build_dir, "cmse_lib.o") "-Wl,--out-implib=%s" % join(build_dir, "cmse_lib.o")
]) ])
elif target.core == "Cortex-M23-NS" or target.core == "Cortex-M33-NS": elif target.core == "Cortex-M23-NS" or target.core == "Cortex-M33-NS":
self.flags["ld"].append("-D__DOMAIN_NS=1") self.flags["ld"].append("-DDOMAIN_NS=1")
self.flags["common"] += self.cpu self.flags["common"] += self.cpu