[RAK] Use linker script preprocess

Signed-off-by: Frederic.Pillon <[email protected]>

Author: fpistm

boards.txt

@@ -9,8 +9,6 @@ menu.xusb=USB speed (if available)
 menu.opt=Optimize
 menu.rtlib=C Runtime Library
 menu.upload_method=Upload method
-menu.flash=Flash Memory Size
-menu.ram=RAM Size
 
 ################################################################################
 # Nucleo 144 boards
@@ -729,26 +727,25 @@ RAK.name=RAKWireless
 RAK.build.vid=0x0483
 RAK.build.core=arduino
 RAK.build.board=RAK
+RAK.build.mcu=cortex-m3
+RAK.build.series=STM32L1xx
+RAK.build.cmsis_lib_gcc=arm_cortexM3l_math
 RAK.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
 
 # RAK811_TRACKER board
-RAK.menu.pnum.RAK811_TRACKER=RAK811 LoRa Tracker
+RAK.menu.pnum.RAK811_TRACKER=RAK811 LoRa Tracker (16kb RAM)
+RAK.menu.pnum.RAK811_TRACKER.upload.maximum_data_size=16384
 RAK.menu.pnum.RAK811_TRACKER.upload.maximum_size=131072
-RAK.menu.pnum.RAK811_TRACKER.build.mcu=cortex-m3
 RAK.menu.pnum.RAK811_TRACKER.build.board=RAK811_TRACKER
-RAK.menu.pnum.RAK811_TRACKER.build.series=STM32L1xx
 RAK.menu.pnum.RAK811_TRACKER.build.product_line=STM32L151xB
 RAK.menu.pnum.RAK811_TRACKER.build.variant=RAK811_TRACKER
-RAK.menu.pnum.RAK811_TRACKER.build.cmsis_lib_gcc=arm_cortexM3l_math
-
-RAK.menu.ram.xB=16Kb (default)
-RAK.menu.ram.xB.upload.maximum_data_size=16384
-RAK.menu.ram.xB.build.ldscript=ldscript.ld
-RAK.menu.ram.xB.build.product_line=STM32L151xB
-RAK.menu.ram.xBA=32Kb
-RAK.menu.ram.xBA.upload.maximum_data_size=32768
-RAK.menu.ram.xBA.build.ldscript=ldscript_xba.ld
-RAK.menu.ram.xBA.build.product_line=STM32L151xBA
+
+RAK.menu.pnum.RAK811_TRACKERA=RAK811 LoRa Tracker (32kb RAM)
+RAK.menu.pnum.RAK811_TRACKERA.upload.maximum_data_size=32768
+RAK.menu.pnum.RAK811_TRACKERA.upload.maximum_size=131072
+RAK.menu.pnum.RAK811_TRACKERA.build.board=RAK811_TRACKERA
+RAK.menu.pnum.RAK811_TRACKERA.build.product_line=STM32L151xBA
+RAK.menu.pnum.RAK811_TRACKERA.build.variant=RAK811_TRACKER
 
 # Upload menu
 RAK.menu.upload_method.serialMethod=Serial

variants/RAK811_TRACKER/ldscript.ld

@@ -4,8 +4,8 @@
 
 **  File        : LinkerScript.ld
 **
-**  Abstract    : Linker script for STM32L151CBTx Device with
-**                128KByte FLASH, 16KByte RAM
+**  Abstract    : Linker script for STM32L151CBTx(A) Device with
+**                128KByte FLASH, 16/32KByte RAM
 **
 **                Set heap size, stack size and stack location according
 **                to application requirements.
@@ -52,16 +52,16 @@
 ENTRY(Reset_Handler)
 
 /* Highest address of the user mode stack */
-_estack = 0x20004000;    /* end of RAM */
+_estack = 0x20000000 + LD_MAX_DATA_SIZE;    /* end of RAM */
 /* Generate a link error if heap and stack don't fit into RAM */
 _Min_Heap_Size = 0x200;      /* required amount of heap  */
 _Min_Stack_Size = 0x400; /* required amount of stack */
 
 /* Specify the memory areas */
 MEMORY
 {
-RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 16K
-FLASH (rx)      : ORIGIN = 0x8000000, LENGTH = 128K
+RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE
+FLASH (rx)      : ORIGIN = 0x8000000, LENGTH = LD_MAX_SIZE
 }
 
 /* Define output sections */