Update bootloader options to allow for softdevices/adafruit stock bootloader

h2zero · h2zero · commit d41fd639017e · 2025-09-09T17:07:04.000-06:00
diff --git a/boards.txt b/boards.txt
@@ -77,6 +77,12 @@ Generic_nRF52832.menu.cppDbgLvl.debug.build.cpp_debug=4
 Generic_nRF52832.menu.bootloader.none=No bootloader
 Generic_nRF52832.menu.bootloader.none.bootloader.flags=
 Generic_nRF52832.menu.bootloader.none.build.bootloader.file=tools/none_bootloader.hex
+Generic_nRF52832.menu.bootloader.serial=Serial
+Generic_nRF52832.menu.bootloader.serial.bootloader.flags=-DUSE_ADA_BL
+Generic_nRF52832.menu.bootloader.serial.build.bootloader.file=tools/serial_bootloader.hex
+Generic_nRF52832.menu.bootloader.s132=S132 SoftDevice
+Generic_nRF52832.menu.bootloader.s132.bootloader.flags=-DUSE_ADA_BL
+Generic_nRF52832.menu.bootloader.s132.build.bootloader.file=tools/s132_bootloader.hex
 
 
 nRF52DK.name=Nordic nRF52832DK (PCA10040)
diff --git a/cores/nRF5/nordic/linker/nrf52832_s132_v6_adabl.ld b/cores/nRF5/nordic/linker/nrf52832_s132_v6_adabl.ld
@@ -0,0 +1,12 @@
+/* Linker script to configure memory regions. */
+
+SEARCH_DIR(.)
+GROUP(-lgcc -lc -lnosys)
+
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x26000, LENGTH = 0x74000 - 0x26000 - 0x4000
+  USER_STORE (rw) : ORIGIN = 0x74000 - 0x4000, LENGTH = 0x2000
+  BOND_STORE (rw) : ORIGIN = 0x74000 - 0x2000, LENGTH = 0x2000
+  RAM (rwx) :  ORIGIN = 0x20003600, LENGTH = 0x20010000 - 0x20003600
+}
diff --git a/cores/nRF5/nordic/linker/nrf52832_xxaa.ld b/cores/nRF5/nordic/linker/nrf52832_xxaa.ld
@@ -5,7 +5,7 @@ GROUP(-lgcc -lc -lnosys)
 
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x7C000
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x80000 - 0x4000
   USER_STORE (rw) : ORIGIN = 0x7C000, LENGTH = 0x2000
   BOND_STORE (rw) : ORIGIN = 0x7E000, LENGTH = 0x2000
   RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x10000
diff --git a/cores/nRF5/nordic/linker/nrf52832_xxaa_serial_adabl.ld b/cores/nRF5/nordic/linker/nrf52832_xxaa_serial_adabl.ld
@@ -5,7 +5,7 @@ GROUP(-lgcc -lc -lnosys)
 
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 0x00001000, LENGTH = 0x6F000
+  FLASH (rx) : ORIGIN = 0x00001000, LENGTH = 0x74000 - 0x1000 - 0x4000
   USER_STORE (rw) : ORIGIN = 0x70000, LENGTH = 0x2000
   BOND_STORE (rw) : ORIGIN = 0x72000, LENGTH = 0x2000
   RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 0xFFF8
diff --git a/cores/nRF5/nordic/linker/nrf52833_s140_v7_adabl.ld b/cores/nRF5/nordic/linker/nrf52833_s140_v7_adabl.ld
@@ -0,0 +1,12 @@
+/* Linker script to configure memory regions. */
+
+SEARCH_DIR(.)
+GROUP(-lgcc -lc -lnosys)
+
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x26000, LENGTH = 0x74000 - 0x26000 - 0x4000
+  USER_STORE (rw) : ORIGIN = 0x74000 - 0x4000, LENGTH = 0x2000
+  BOND_STORE (rw) : ORIGIN = 0x74000 - 0x2000, LENGTH = 0x2000
+  RAM (rwx) :  ORIGIN = 0x20006000, LENGTH = 0x20020000 - 0x20006000
+}
diff --git a/cores/nRF5/nordic/linker/nrf52833_xxaa.ld b/cores/nRF5/nordic/linker/nrf52833_xxaa.ld
@@ -5,7 +5,7 @@ GROUP(-lgcc -lc -lnosys)
 
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x7C000
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x80000 - 0x4000
   USER_STORE (rw) : ORIGIN = 0x7C000, LENGTH = 0x2000
   BOND_STORE (rw) : ORIGIN = 0x7E000, LENGTH = 0x2000
   RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x20000
diff --git a/cores/nRF5/nordic/linker/nrf52833_xxaa_serial_adabl.ld b/cores/nRF5/nordic/linker/nrf52833_xxaa_serial_adabl.ld
@@ -5,7 +5,7 @@ GROUP(-lgcc -lc -lnosys)
 
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 0x00001000, LENGTH = 0x6F000
+  FLASH (rx) : ORIGIN = 0x00001000, LENGTH = 0x74000 - 0x1000 - 0x4000
   USER_STORE (rw) : ORIGIN = 0x70000, LENGTH = 0x2000
   BOND_STORE (rw) : ORIGIN = 0x72000, LENGTH = 0x2000
   RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 0x1FFF8
diff --git a/cores/nRF5/nordic/linker/nrf52840_s140_v6_adabl.ld b/cores/nRF5/nordic/linker/nrf52840_s140_v6_adabl.ld
@@ -0,0 +1,14 @@
+/* Linker script to configure memory regions. */
+
+SEARCH_DIR(.)
+GROUP(-lgcc -lc -lnosys)
+
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x26000, LENGTH = 0xF4000 - 0x26000 - 0x4000
+  USER_STORE (rw) : ORIGIN = 0xF4000 - 0x4000, LENGTH = 0x2000
+  BOND_STORE (rw) : ORIGIN = 0xF4000 - 0x2000, LENGTH = 0x2000
+  RAM (rwx)  : ORIGIN = 0x20006000, LENGTH = 0x20040000 - 0x20006000
+}
+
+INCLUDE "nrf52_common.ld"
diff --git a/cores/nRF5/nordic/linker/nrf52840_s140_v7_adabl.ld b/cores/nRF5/nordic/linker/nrf52840_s140_v7_adabl.ld
diff --git a/cores/nRF5/nordic/linker/nrf52840_xxaa.ld b/cores/nRF5/nordic/linker/nrf52840_xxaa.ld
@@ -5,7 +5,7 @@ GROUP(-lgcc -lc -lnosys)
 
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0xFC0000
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x100000 - 0x4000
   USER_STORE (rw) : ORIGIN = 0xFC000, LENGTH = 0x2000
   BOND_STORE (rw) : ORIGIN = 0xFE000, LENGTH = 0x2000
   EXTFLASH (rx) : ORIGIN = 0x12000000, LENGTH = 0x8000000
diff --git a/cores/nRF5/nordic/linker/nrf52840_xxaa_serial_adabl.ld b/cores/nRF5/nordic/linker/nrf52840_xxaa_serial_adabl.ld
@@ -5,7 +5,7 @@ GROUP(-lgcc -lc -lnosys)
 
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 0x1000, LENGTH = 0xEF000
+  FLASH (rx) : ORIGIN = 0x1000, LENGTH = 0xF4000 - 0x1000 - 0x4000
   USER_STORE (rw) : ORIGIN = 0xF0000, LENGTH = 0x2000
   BOND_STORE (rw) : ORIGIN = 0xF2000, LENGTH = 0x2000
   RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 0x3FFF8

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ GROUP(-lgcc -lc -lnosys)`
`5`	`5`
`6`	`6`	`MEMORY`
`7`	`7`	`{`
`8`		`- FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x7C000`
	`8`	`+ FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x80000 - 0x4000`
`9`	`9`	`USER_STORE (rw) : ORIGIN = 0x7C000, LENGTH = 0x2000`
`10`	`10`	`BOND_STORE (rw) : ORIGIN = 0x7E000, LENGTH = 0x2000`
`11`	`11`	`RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x10000`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ GROUP(-lgcc -lc -lnosys)`
`5`	`5`
`6`	`6`	`MEMORY`
`7`	`7`	`{`
`8`		`- FLASH (rx) : ORIGIN = 0x00001000, LENGTH = 0x6F000`
	`8`	`+ FLASH (rx) : ORIGIN = 0x00001000, LENGTH = 0x74000 - 0x1000 - 0x4000`
`9`	`9`	`USER_STORE (rw) : ORIGIN = 0x70000, LENGTH = 0x2000`
`10`	`10`	`BOND_STORE (rw) : ORIGIN = 0x72000, LENGTH = 0x2000`
`11`	`11`	`RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 0xFFF8`