Use 0x10000 as base flash for NANO33BLE

facchinm · facchinm · commit ff561083905e · 2019-07-09T12:28:54.000+02:00
diff --git a/mbed-os-to-arduino b/mbed-os-to-arduino
@@ -29,7 +29,7 @@ echo -e "#include \"mbed.h\"\nint main() {Thread thd;}" > main.cpp
 echo -e "{\n\"macros\": [\n\"MBED_HEAP_STATS_ENABLED=1\",\n\"MBED_STACK_STATS_ENABLED=1\",\n\"MBED_MEM_TRACING_ENABLED=1\"\n],\n\"target_overrides\": {\n   \"*\": {\n\"platform.stdio-buffered-serial\": true,\n\"platform.stdio-baud-rate\": 115200,\n\"platform.default-serial-baud-rate\": 115200\n}\n}\n}\n" > mbed_app.json
 
 if [ $BOARDNAME == "ARDUINO_NANO33BLE" ]; then
-echo -e "{\n\"macros\": [\n\"MBED_HEAP_STATS_ENABLED=1\",\n\"MBED_STACK_STATS_ENABLED=1\",\n\"MBED_MEM_TRACING_ENABLED=1\"\n],\n\"target_overrides\": {\n   \"*\": {\n\"platform.stdio-buffered-serial\": true,\n\"platform.stdio-baud-rate\": 115200,\n\"platform.default-serial-baud-rate\": 115200,\n\"target.mbed_app_start\": \"0x10200\"}\n}\n}\n" > mbed_app.json
+echo -e "{\n\"macros\": [\n\"MBED_HEAP_STATS_ENABLED=1\",\n\"MBED_STACK_STATS_ENABLED=1\",\n\"MBED_MEM_TRACING_ENABLED=1\"\n],\n\"target_overrides\": {\n   \"*\": {\n\"platform.stdio-buffered-serial\": true,\n\"platform.stdio-baud-rate\": 115200,\n\"platform.default-serial-baud-rate\": 115200,\n\"target.mbed_app_start\": \"0x10000\"}\n}\n}\n" > mbed_app.json
 fi
 
 rm -rf BUILD
diff --git a/variants/ARDUINO_NANO33BLE/cflags.txt b/variants/ARDUINO_NANO33BLE/cflags.txt
@@ -1,6 +1,6 @@
 -std=gnu11
--DAPPLICATION_ADDR=0x10200
--DAPPLICATION_SIZE=0xefe00
+-DAPPLICATION_ADDR=0x10000
+-DAPPLICATION_SIZE=0xf0000
 -DMBED_TRAP_ERRORS_ENABLED=1
 -Os
 -Wall
diff --git a/variants/ARDUINO_NANO33BLE/cxxflags.txt b/variants/ARDUINO_NANO33BLE/cxxflags.txt
@@ -1,8 +1,8 @@
 -Wvla
 -fno-rtti
 -std=gnu++14
--DAPPLICATION_ADDR=0x10200
--DAPPLICATION_SIZE=0xefe00
+-DAPPLICATION_ADDR=0x10000
+-DAPPLICATION_SIZE=0xf0000
 -DMBED_TRAP_ERRORS_ENABLED=1
 -Os
 -Wall
diff --git a/variants/ARDUINO_NANO33BLE/ldflags.txt b/variants/ARDUINO_NANO33BLE/ldflags.txt
@@ -1,5 +1,5 @@
--DMBED_APP_SIZE=0xefe00
--DMBED_APP_START=0x10200
+-DMBED_APP_SIZE=0xf0000
+-DMBED_APP_START=0x10000
 -DMBED_BOOT_STACK_SIZE=2048
 -Wl,--gc-sections
 -Wl,--wrap,_calloc_r
diff --git a/variants/ARDUINO_NANO33BLE/libs/libmbed.a b/variants/ARDUINO_NANO33BLE/libs/libmbed.a
diff --git a/variants/ARDUINO_NANO33BLE/linker_script.ld b/variants/ARDUINO_NANO33BLE/linker_script.ld
@@ -1,6 +1,6 @@
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 0x10200, LENGTH = 0xefe00
+  FLASH (rx) : ORIGIN = 0x10000, LENGTH = 0xf0000
   RAM_NVIC (rwx) : ORIGIN = 0x20000000, LENGTH = 0x100
   RAM_CRASH_DATA (rwx) : ORIGIN = (0x20000000 + 0x100), LENGTH = 0x100
   RAM (rwx) : ORIGIN = ((0x20000000 + 0x100) + 0x100), LENGTH = (0x40000 - (0x100 + 0x100))

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`MEMORY`
`2`	`2`	`{`
`3`		`- FLASH (rx) : ORIGIN = 0x10200, LENGTH = 0xefe00`
	`3`	`+ FLASH (rx) : ORIGIN = 0x10000, LENGTH = 0xf0000`
`4`	`4`	`RAM_NVIC (rwx) : ORIGIN = 0x20000000, LENGTH = 0x100`
`5`	`5`	`RAM_CRASH_DATA (rwx) : ORIGIN = (0x20000000 + 0x100), LENGTH = 0x100`
`6`	`6`	`RAM (rwx) : ORIGIN = ((0x20000000 + 0x100) + 0x100), LENGTH = (0x40000 - (0x100 + 0x100))`