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

NUVOTON: Fix for target.boot-stack-size config in linker script (#351) 

"target.boot-stack-size" can expand to MBED_CONF_TARGET_BOOT_STACK_SIZE
or legacy MBED_BOOT_STACK_SIZE. Though MBED_BOOT_STACK_SIZE is unsupported
in Mbed CE, make its preprocess consistent in linker scripts by prioritizing
MBED_CONF_TARGET_BOOT_STACK_SIZE, then MBED_BOOT_STACK_SIZE for being
compatible.
pull/15530/head
ccli8 2024-09-23 10:22:33 +08:00 committed by GitHub
parent cfee81c7ce
commit 037fe9b619
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 56 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
targets/TARGET_NUVOTON/TARGET_M2354/device/TOOLCHAIN_ARMC6/M2354.sct
View File

@ -20,8 +20,12 @@
#include "../partition_M2354_mem.h" #include "../partition_M2354_mem.h"
#if !defined(MBED_BOOT_STACK_SIZE) #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
#define MBED_BOOT_STACK_SIZE 0x400 # if defined(MBED_BOOT_STACK_SIZE)
# define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
# else
# define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400
# endif
#endif #endif
LR_IROM1 MBED_APP_START LR_IROM1 MBED_APP_START
@ -34,7 +38,7 @@ LR_IROM1 MBED_APP_START
.ANY (+RO) .ANY (+RO)
} }
ARM_LIB_STACK MBED_RAM_APP_START EMPTY MBED_BOOT_STACK_SIZE ARM_LIB_STACK MBED_RAM_APP_START EMPTY MBED_CONF_TARGET_BOOT_STACK_SIZE
{ {
} }

10
targets/TARGET_NUVOTON/TARGET_M2354/device/TOOLCHAIN_GCC_ARM/M2354.ld
View File

@ -22,11 +22,15 @@
#include "../partition_M2354_mem.h" #include "../partition_M2354_mem.h"
#if !defined(MBED_BOOT_STACK_SIZE) #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
#define MBED_BOOT_STACK_SIZE 0x400 # if defined(MBED_BOOT_STACK_SIZE)
# define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
# else
# define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400
# endif
#endif #endif
StackSize = MBED_BOOT_STACK_SIZE; StackSize = MBED_CONF_TARGET_BOOT_STACK_SIZE;
MEMORY MEMORY
{ {

6
targets/TARGET_NUVOTON/TARGET_M251/device/TOOLCHAIN_GCC_ARM/M251.ld
View File

@ -21,7 +21,11 @@
#include "../M251_mem.h" #include "../M251_mem.h"
#if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE) #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
#define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400 # if defined(MBED_BOOT_STACK_SIZE)
# define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
# else
# define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400
# endif
#endif #endif
StackSize = MBED_CONF_TARGET_BOOT_STACK_SIZE; StackSize = MBED_CONF_TARGET_BOOT_STACK_SIZE;

6
targets/TARGET_NUVOTON/TARGET_M261/device/TOOLCHAIN_GCC_ARM/M261.ld
View File

@ -23,7 +23,11 @@
#include "../M261_mem.h" #include "../M261_mem.h"
#if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE) #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
#define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400 # if defined(MBED_BOOT_STACK_SIZE)
# define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
# else
# define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400
# endif
#endif #endif
M_CRASH_DATA_RAM_SIZE = 0x100; M_CRASH_DATA_RAM_SIZE = 0x100;

6
targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_GCC_ARM/M453.ld
View File

@ -23,7 +23,11 @@
#include "../M451_mem.h" #include "../M451_mem.h"
#if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE) #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
#define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400 # if defined(MBED_BOOT_STACK_SIZE)
# define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
# else
# define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400
# endif
#endif #endif
StackSize = MBED_CONF_TARGET_BOOT_STACK_SIZE; StackSize = MBED_CONF_TARGET_BOOT_STACK_SIZE;

10
targets/TARGET_NUVOTON/TARGET_M460/device/TOOLCHAIN_GCC_ARM/M467.ld
View File

@ -22,8 +22,12 @@
#include "../M460_mem.h" #include "../M460_mem.h"
#if !defined(MBED_BOOT_STACK_SIZE) #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
#define MBED_BOOT_STACK_SIZE 0x400 # if defined(MBED_BOOT_STACK_SIZE)
# define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
# else
# define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400
# endif
#endif #endif
#if !defined(NU_HYPERRAM_START) #if !defined(NU_HYPERRAM_START)
@ -35,7 +39,7 @@
#endif #endif
M_CRASH_DATA_RAM_SIZE = 0x100; M_CRASH_DATA_RAM_SIZE = 0x100;
StackSize = MBED_BOOT_STACK_SIZE; StackSize = MBED_CONF_TARGET_BOOT_STACK_SIZE;
MEMORY MEMORY
{ {

6
targets/TARGET_NUVOTON/TARGET_M480/device/TOOLCHAIN_GCC_ARM/M487.ld
View File

@ -23,7 +23,11 @@
#include "../M480_mem.h" #include "../M480_mem.h"
#if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE) #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
#define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400 # if defined(MBED_BOOT_STACK_SIZE)
# define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
# else
# define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400
# endif
#endif #endif
M_CRASH_DATA_RAM_SIZE = 0x100; M_CRASH_DATA_RAM_SIZE = 0x100;

6
targets/TARGET_NUVOTON/TARGET_NANO100/device/TOOLCHAIN_GCC_ARM/NANO130.ld
View File

@ -23,7 +23,11 @@
#include "../NANO100_mem.h" #include "../NANO100_mem.h"
#if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE) #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
#define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400 # if defined(MBED_BOOT_STACK_SIZE)
# define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
# else
# define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400
# endif
#endif #endif
StackSize = MBED_CONF_TARGET_BOOT_STACK_SIZE; StackSize = MBED_CONF_TARGET_BOOT_STACK_SIZE;

6
targets/TARGET_NUVOTON/TARGET_NUC472/device/TOOLCHAIN_GCC_ARM/TARGET_NU_XRAM_SUPPORTED/NUC472.ld
View File

@ -11,7 +11,11 @@
#endif #endif
#if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE) #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
#define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400 # if defined(MBED_BOOT_STACK_SIZE)
# define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
# else
# define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400
# endif
#endif #endif
M_CRASH_DATA_RAM_SIZE = 0x100; M_CRASH_DATA_RAM_SIZE = 0x100;

6
targets/TARGET_NUVOTON/TARGET_NUC472/device/TOOLCHAIN_GCC_ARM/TARGET_NU_XRAM_UNSUPPORTED/NUC472.ld
View File

@ -11,7 +11,11 @@
#endif #endif
#if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE) #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
#define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400 # if defined(MBED_BOOT_STACK_SIZE)
# define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
# else
# define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400
# endif
#endif #endif
M_CRASH_DATA_RAM_SIZE = 0x100; M_CRASH_DATA_RAM_SIZE = 0x100;