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.
mbed-ce · Sep 23, 2024 · 037fe9b · 037fe9b
1 parent cfee81c
commit 037fe9b
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 16 deletions.
diff --git a/targets/TARGET_NUVOTON/TARGET_M2354/device/TOOLCHAIN_ARMC6/M2354.sct b/targets/TARGET_NUVOTON/TARGET_M2354/device/TOOLCHAIN_ARMC6/M2354.sct
@@ -20,8 +20,12 @@
 
 #include "../partition_M2354_mem.h"
 
-#if !defined(MBED_BOOT_STACK_SIZE)
-#define MBED_BOOT_STACK_SIZE    0x400
+#if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
+#  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
 
 LR_IROM1    MBED_APP_START
@@ -34,7 +38,7 @@ LR_IROM1    MBED_APP_START
         .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
     {
     }
 

diff --git a/targets/TARGET_NUVOTON/TARGET_M2354/device/TOOLCHAIN_GCC_ARM/M2354.ld b/targets/TARGET_NUVOTON/TARGET_M2354/device/TOOLCHAIN_GCC_ARM/M2354.ld
@@ -22,11 +22,15 @@
 
 #include "../partition_M2354_mem.h"
 
-#if !defined(MBED_BOOT_STACK_SIZE)
-#define MBED_BOOT_STACK_SIZE    0x400
+#if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
+#  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
 
-StackSize = MBED_BOOT_STACK_SIZE;
+StackSize = MBED_CONF_TARGET_BOOT_STACK_SIZE;
 
 MEMORY
 {

diff --git a/targets/TARGET_NUVOTON/TARGET_M251/device/TOOLCHAIN_GCC_ARM/M251.ld b/targets/TARGET_NUVOTON/TARGET_M251/device/TOOLCHAIN_GCC_ARM/M251.ld
@@ -21,7 +21,11 @@
 #include "../M251_mem.h"
 
 #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
 
 StackSize = MBED_CONF_TARGET_BOOT_STACK_SIZE;

diff --git a/targets/TARGET_NUVOTON/TARGET_M261/device/TOOLCHAIN_GCC_ARM/M261.ld b/targets/TARGET_NUVOTON/TARGET_M261/device/TOOLCHAIN_GCC_ARM/M261.ld
@@ -23,7 +23,11 @@
 #include "../M261_mem.h"
 
 #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
 
 M_CRASH_DATA_RAM_SIZE = 0x100;

diff --git a/targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_GCC_ARM/M453.ld b/targets/TARGET_NUVOTON/TARGET_M451/device/TOOLCHAIN_GCC_ARM/M453.ld
@@ -23,7 +23,11 @@
 #include "../M451_mem.h"
 
 #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
 
 StackSize = MBED_CONF_TARGET_BOOT_STACK_SIZE;

diff --git a/targets/TARGET_NUVOTON/TARGET_M460/device/TOOLCHAIN_GCC_ARM/M467.ld b/targets/TARGET_NUVOTON/TARGET_M460/device/TOOLCHAIN_GCC_ARM/M467.ld
@@ -22,8 +22,12 @@
 
 #include "../M460_mem.h"
 
-#if !defined(MBED_BOOT_STACK_SIZE)
-#define MBED_BOOT_STACK_SIZE        0x400
+#if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
+#  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
 
 #if !defined(NU_HYPERRAM_START)
@@ -35,7 +39,7 @@
 #endif
 
 M_CRASH_DATA_RAM_SIZE = 0x100;
-StackSize = MBED_BOOT_STACK_SIZE;
+StackSize = MBED_CONF_TARGET_BOOT_STACK_SIZE;
 
 MEMORY
 {

diff --git a/targets/TARGET_NUVOTON/TARGET_M480/device/TOOLCHAIN_GCC_ARM/M487.ld b/targets/TARGET_NUVOTON/TARGET_M480/device/TOOLCHAIN_GCC_ARM/M487.ld
@@ -23,7 +23,11 @@
 #include "../M480_mem.h"
 
 #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
 
 M_CRASH_DATA_RAM_SIZE = 0x100;

diff --git a/targets/TARGET_NUVOTON/TARGET_NANO100/device/TOOLCHAIN_GCC_ARM/NANO130.ld b/targets/TARGET_NUVOTON/TARGET_NANO100/device/TOOLCHAIN_GCC_ARM/NANO130.ld
@@ -23,7 +23,11 @@
 #include "../NANO100_mem.h"
 
 #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
 
 StackSize = MBED_CONF_TARGET_BOOT_STACK_SIZE;

diff --git a/.../TARGET_NUVOTON/TARGET_NUC472/device/TOOLCHAIN_GCC_ARM/TARGET_NU_XRAM_SUPPORTED/NUC472.ld b/.../TARGET_NUVOTON/TARGET_NUC472/device/TOOLCHAIN_GCC_ARM/TARGET_NU_XRAM_SUPPORTED/NUC472.ld
@@ -11,7 +11,11 @@
 #endif 
 
 #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
 
 M_CRASH_DATA_RAM_SIZE = 0x100;

diff --git a/...ARGET_NUVOTON/TARGET_NUC472/device/TOOLCHAIN_GCC_ARM/TARGET_NU_XRAM_UNSUPPORTED/NUC472.ld b/...ARGET_NUVOTON/TARGET_NUC472/device/TOOLCHAIN_GCC_ARM/TARGET_NU_XRAM_UNSUPPORTED/NUC472.ld
@@ -11,7 +11,11 @@
 #endif 
 
 #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
 
 M_CRASH_DATA_RAM_SIZE = 0x100;