Skip to content

Commit e8dc344

Browse files
committed
remove dual bank bootloader support
1 parent 6ddba93 commit e8dc344

9 files changed

+21
-11104
lines changed

bin/bootloader/feather52840/6.0.0/single/feather52840_bootloader_6.0.0_s140_single.hex

-11,031
This file was deleted.

boards.txt

+19-32
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ menu.softdevice=Bootloader
2020
menu.debug=Debug Mode
2121

2222
#**********************************************
23-
# Feather nrf52 Board
23+
# Feather nrf52832 (nrf52) Board
2424
#**********************************************
2525
feather52.name=Adafruit Bluefruit nRF52 Feather
2626
feather52.bootloader.tool=bootburn
@@ -40,27 +40,15 @@ feather52.build.extra_flags=-DNRF52832_XXAA -DNRF52
4040
# SofDevice Menu
4141
# Ram & ROM size varies depending on SoftDevice (check linker script)
4242

43-
feather52.menu.softdevice.s132single=6.0.0 Single, S132 6.0.0
44-
feather52.menu.softdevice.s132single.build.sd_flags=-DS132 -DSD_VER=600
45-
feather52.menu.softdevice.s132single.build.sd_name=s132
46-
feather52.menu.softdevice.s132single.build.sd_version=6.0.0
47-
feather52.menu.softdevice.s132single.build.sd_fwid=0x00A8
48-
feather52.menu.softdevice.s132single.build.ldscript=nrf52832_s132_6.0.0_single.ld
49-
feather52.menu.softdevice.s132single.build.bootfile=single/feather52_bootloader_6.0.0_s132_single
50-
feather52.menu.softdevice.s132single.build.bank_flag=--singlebank
51-
feather52.menu.softdevice.s132single.upload.maximum_size=290816
52-
feather52.menu.softdevice.s132single.upload.maximum_data_size=51072
53-
54-
#feather52.menu.softdevice.s132dual=6.0.0 Dual, S132 6.0.0
55-
#feather52.menu.softdevice.s132dual.build.sd_flags=-DS132 -DSD_VER=600
56-
#feather52.menu.softdevice.s132dual.build.sd_name=s132
57-
#feather52.menu.softdevice.s132dual.build.sd_version=6.0.0
58-
#feather52.menu.softdevice.s132dual.build.sd_fwid=0x00A8
59-
#feather52.menu.softdevice.s132dual.build.ldscript=nrf52832_s132_6.0.0_dual.ld
60-
#feather52.menu.softdevice.s132dual.build.bootfile=dual/feather52_bootloader_6.0.0_s132_dual
61-
#feather52.menu.softdevice.s132dual.build.bank_flag=
62-
#feather52.menu.softdevice.s132dual.upload.maximum_size=145408
63-
#feather52.menu.softdevice.s132dual.upload.maximum_data_size=51072
43+
feather52.menu.softdevice.s132v6=v6.0.0, S132 6.0.0
44+
feather52.menu.softdevice.s132v6.build.sd_flags=-DS132 -DSD_VER=600
45+
feather52.menu.softdevice.s132v6.build.sd_name=s132
46+
feather52.menu.softdevice.s132v6.build.sd_version=6.0.0
47+
feather52.menu.softdevice.s132v6.build.sd_fwid=0x00A8
48+
feather52.menu.softdevice.s132v6.build.ldscript=nrf52832_s132_6.0.0.ld
49+
feather52.menu.softdevice.s132v6.build.bootfile=feather52_bootloader_6.0.0_s132
50+
feather52.menu.softdevice.s132v6.upload.maximum_size=290816
51+
feather52.menu.softdevice.s132v6.upload.maximum_data_size=51072
6452

6553
# Debug Menu
6654
feather52.menu.debug.l0=Level 0 (Release)
@@ -104,16 +92,15 @@ feather52840.build.extra_flags=-DNRF52840_XXAA
10492
# SofDevice Menu
10593
# Ram & ROM size varies depending on SoftDevice (check linker script)
10694

107-
feather52840.menu.softdevice.s140single=6.0.0 Single, S140 6.0.0
108-
feather52840.menu.softdevice.s140single.build.sd_flags=-DS140 -DSD_VER=600
109-
feather52840.menu.softdevice.s140single.build.sd_name=s140
110-
feather52840.menu.softdevice.s140single.build.sd_version=6.0.0
111-
feather52840.menu.softdevice.s140single.build.sd_fwid=0x00A9
112-
feather52840.menu.softdevice.s140single.build.ldscript=nrf52840_s140_6.0.0_single.ld
113-
feather52840.menu.softdevice.s140single.build.bootfile=single/feather52840_bootloader_6.0.0_s140_single
114-
feather52840.menu.softdevice.s140single.build.bank_flag=--singlebank
115-
feather52840.menu.softdevice.s140single.upload.maximum_size=303104
116-
feather52840.menu.softdevice.s140single.upload.maximum_data_size=51072
95+
feather52840.menu.softdevice.s140v6=v6.0.0, S140 6.0.0
96+
feather52840.menu.softdevice.s140v6.build.sd_flags=-DS140 -DSD_VER=600
97+
feather52840.menu.softdevice.s140v6.build.sd_name=s140
98+
feather52840.menu.softdevice.s140v6.build.sd_version=6.0.0
99+
feather52840.menu.softdevice.s140v6.build.sd_fwid=0x00A9
100+
feather52840.menu.softdevice.s140v6.build.ldscript=nrf52840_s140_6.0.0.ld
101+
feather52840.menu.softdevice.s140v6.build.bootfile=feather52840_bootloader_6.0.0_s140
102+
feather52840.menu.softdevice.s140v6.upload.maximum_size=303104
103+
feather52840.menu.softdevice.s140v6.upload.maximum_data_size=51072
117104

118105
# Debug Menu
119106
feather52840.menu.debug.l0=Level 0 (Release)

cores/nRF5/linker/nrf52832_s132_6.0.0_dual.ld

-39
This file was deleted.

platform.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf
103103
recipe.objcopy.zip.pattern="{tools.nrfutil.cmd}" dfu genpkg --dev-type 0x0052 --sd-req {build.sd_fwid} --application "{build.path}/{build.project_name}.hex" "{build.path}/{build.project_name}.zip"
104104

105105
## Create uf2 file
106-
recipe.objcopy.uf2.pattern=python "{runtime.platform.path}/tools/uf2conv/uf2conv.py" -o "{build.path}/{build.project_name}.uf2" "{build.path}/{build.project_name}.hex"
106+
recipe.objcopy.uf2.pattern=python "{runtime.platform.path}/tools/uf2conv/uf2conv.py" -c -o "{build.path}/{build.project_name}.uf2" "{build.path}/{build.project_name}.hex"
107107

108108
## Save bin
109109
recipe.output.tmp_file_bin={build.project_name}.bin
@@ -133,7 +133,7 @@ tools.nrfutil.cmd.macosx=/usr/local/bin/nrfutil
133133

134134
tools.nrfutil.upload.params.verbose=--verbose
135135
tools.nrfutil.upload.params.quiet=
136-
tools.nrfutil.upload.pattern={cmd} {upload.verbose} dfu serial -pkg "{build.path}/{build.project_name}.zip" -p {serial.port} -b 115200 {build.bank_flag}
136+
tools.nrfutil.upload.pattern={cmd} {upload.verbose} dfu serial -pkg "{build.path}/{build.project_name}.zip" -p {serial.port} -b 115200 --singlebank
137137

138138
#tools.nrfutil.upload.pattern=nrfjprog --reset --program "{build.path}/{build.project_name}.hex" --sectorerase -f nrf52
139139

0 commit comments

Comments
 (0)