Skip to content

Commit 80fc766

Browse files
authored
Update bootloader options to allow for adafruit stock bootloaders (#82)
1 parent 07495fb commit 80fc766

22 files changed

Lines changed: 11380 additions & 11099 deletions

.github/workflows/build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ jobs:
7979
nimble_version: master
8080
flags: build_flags = '-DMYNEWT_VAL_BLE_EXT_ADV=1'
8181
- variant: adafruit_feather_nrf52840
82-
bootloader: board_bootloader = adafruit
8382
exclude:
8483
- example: "example/lib/examples/Bluetooth_5/NimBLE_extended_server"
8584
variant: generic_nrf51822_xxaa
@@ -118,11 +117,10 @@ jobs:
118117
run: |
119118
cat > example/platformio.ini << EOF
120119
[env]
121-
platform = https://github.com/h2zero/platform-n-able.git#cpp20
120+
platform = https://github.com/h2zero/platform-n-able.git#1.1.3
122121
platform_packages = framework-n-able-arduino @ file://./framework
123122
framework = arduino
124123
${{ matrix.flags }}
125-
${{ matrix.bootloader }}
126124
127125
[env:${{ matrix.variant }}]
128126
board = ${{ matrix.variant }}

boards.txt

Lines changed: 611 additions & 131 deletions
Large diffs are not rendered by default.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/* Linker script to configure memory regions. */
2+
3+
SEARCH_DIR(.)
4+
GROUP(-lgcc -lc -lnosys)
5+
6+
MEMORY
7+
{
8+
FLASH (rx) : ORIGIN = 0x26000, LENGTH = 0x74000 - 0x26000 - 0x4000
9+
USER_STORE (rw) : ORIGIN = 0x74000 - 0x4000, LENGTH = 0x2000
10+
BOND_STORE (rw) : ORIGIN = 0x74000 - 0x2000, LENGTH = 0x2000
11+
RAM (rwx) : ORIGIN = 0x20003600, LENGTH = 0x10000 - 0x3600
12+
}

cores/nRF5/nordic/linker/nrf52833_xxaa_adabl.ld renamed to cores/nRF5/nordic/linker/nrf52832_serial_adabl.ld

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ GROUP(-lgcc -lc -lnosys)
55

66
MEMORY
77
{
8-
FLASH (rx) : ORIGIN = 0x00001000, LENGTH = 0x6F000
8+
FLASH (rx) : ORIGIN = 0x00001000, LENGTH = 0x74000 - 0x1000 - 0x4000
99
USER_STORE (rw) : ORIGIN = 0x70000, LENGTH = 0x2000
1010
BOND_STORE (rw) : ORIGIN = 0x72000, LENGTH = 0x2000
11-
RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 0x1FFF8
11+
RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 0x10000 - 0x8
1212
}
1313

1414

cores/nRF5/nordic/linker/nrf52832_xxaa.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ GROUP(-lgcc -lc -lnosys)
55

66
MEMORY
77
{
8-
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x7C000
8+
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x80000 - 0x4000
99
USER_STORE (rw) : ORIGIN = 0x7C000, LENGTH = 0x2000
1010
BOND_STORE (rw) : ORIGIN = 0x7E000, LENGTH = 0x2000
1111
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x10000
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/* Linker script to configure memory regions. */
2+
3+
SEARCH_DIR(.)
4+
GROUP(-lgcc -lc -lnosys)
5+
6+
MEMORY
7+
{
8+
FLASH (rx) : ORIGIN = 0x27000, LENGTH = 0x74000 - 0x27000 - 0x4000
9+
USER_STORE (rw) : ORIGIN = 0x74000 - 0x4000, LENGTH = 0x2000
10+
BOND_STORE (rw) : ORIGIN = 0x74000 - 0x2000, LENGTH = 0x2000
11+
RAM (rwx) : ORIGIN = 0x20006000, LENGTH = 0x20000 - 0x6000
12+
}

cores/nRF5/nordic/linker/nrf52_xxaa_adabl.ld renamed to cores/nRF5/nordic/linker/nrf52833_serial_adabl.ld

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ GROUP(-lgcc -lc -lnosys)
55

66
MEMORY
77
{
8-
FLASH (rx) : ORIGIN = 0x00001000, LENGTH = 0x6F000
8+
FLASH (rx) : ORIGIN = 0x00001000, LENGTH = 0x74000 - 0x1000 - 0x4000
99
USER_STORE (rw) : ORIGIN = 0x70000, LENGTH = 0x2000
1010
BOND_STORE (rw) : ORIGIN = 0x72000, LENGTH = 0x2000
11-
RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 0xFFF8
11+
RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 0x20000 - 0x8
1212
}
1313

1414

cores/nRF5/nordic/linker/nrf52833_xxaa.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ GROUP(-lgcc -lc -lnosys)
55

66
MEMORY
77
{
8-
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x7C000
8+
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x80000 - 0x4000
99
USER_STORE (rw) : ORIGIN = 0x7C000, LENGTH = 0x2000
1010
BOND_STORE (rw) : ORIGIN = 0x7E000, LENGTH = 0x2000
1111
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x20000

cores/nRF5/nordic/linker/nrf52840_dongle.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ MEMORY
88
FLASH (rx) : ORIGIN = 0x1000, LENGTH = 0xDB000
99
USER_STORE (rw) : ORIGIN = 0xDC000, LENGTH = 0x2000
1010
BOND_STORE (rw) : ORIGIN = 0xDE000, LENGTH = 0x2000
11-
RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 0x3FFF8
11+
RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 0x40000 - 0x8
1212
}
1313

1414

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/* Linker script to configure memory regions. */
2+
3+
SEARCH_DIR(.)
4+
GROUP(-lgcc -lc -lnosys)
5+
6+
MEMORY
7+
{
8+
FLASH (rx) : ORIGIN = 0x26000, LENGTH = 0xF4000 - 0x26000 - 0x4000
9+
USER_STORE (rw) : ORIGIN = 0xF4000 - 0x4000, LENGTH = 0x2000
10+
BOND_STORE (rw) : ORIGIN = 0xF4000 - 0x2000, LENGTH = 0x2000
11+
RAM (rwx) : ORIGIN = 0x20006000, LENGTH = 0x40000 - 0x6000
12+
}
13+
14+
INCLUDE "nrf52_common.ld"

0 commit comments

Comments
 (0)