Add softdevice board menu items, include path, switch upload to .hex

boards.txt

@@ -14,6 +14,8 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+menu.softdevice=Softdevice
+
 nRF52DK.name=nRF52 DK
 
 nRF52DK.vid.0=0x1366
@@ -22,8 +24,7 @@ nRF52DK.pid.0=0x1015
 nRF52DK.upload.tool=sandeepmistry:openocd
 nRF52DK.upload.protocol=
 nRF52DK.upload.interface=jlink
-nRF52DK.upload.target=nrf51
-nRF52DK.upload.address=0x0
+nRF52DK.upload.target=nrf52
 nRF52DK.upload.maximum_size=524288
 nRF52DK.upload.setup_command=transport select swd;
 nRF52DK.upload.use_1200bps_touch=false
@@ -40,18 +41,21 @@ nRF52DK.build.extra_flags=-DNRF52
 nRF52DK.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
 nRF52DK.build.ldscript=nrf52_xxaa.ld
 
+nRF52DK.menu.softdevice.none=None
+nRF52DK.menu.softdevice.none.softdevice=none
+
+nRF52DK.menu.softdevice.s132=S132
+nRF52DK.menu.softdevice.s132.softdevice=s132
+nRF52DK.menu.softdevice.s132.upload.maximum_size=409600
+nRF52DK.menu.softdevice.s132.build.extra_flags=-DNRF52 -DS132 -DNRF51_S132
+nRF52DK.menu.softdevice.s132.build.ldscript=armgcc_s132_nrf52832_xxaa.ld
 
 
 BluzDK.name=Bluz DK
 
 BluzDK.upload.tool=sandeepmistry:openocd
 BluzDK.upload.target=nrf51
-BluzDK.upload.address=0x0
 BluzDK.upload.maximum_size=262144
-BluzDK.upload.setup_command=transport select swd; set WORKAREASIZE 0;
-BluzDK.upload.use_1200bps_touch=false
-BluzDK.upload.wait_for_upload_port=false
-BluzDK.upload.native_usb=false
 
 BluzDK.build.mcu=cortex-m0
 BluzDK.build.f_cpu=16000000
@@ -62,3 +66,12 @@ BluzDK.build.variant_system_lib=
 BluzDK.build.extra_flags=-DNRF51
 BluzDK.build.float_flags=
 BluzDK.build.ldscript=nrf51_xxac.ld
+
+BluzDK.menu.softdevice.none=None
+BluzDK.menu.softdevice.none.softdevice=none
+
+BluzDK.menu.softdevice.s130=S130
+BluzDK.menu.softdevice.s130.softdevice=s130
+BluzDK.menu.softdevice.s130.upload.maximum_size=151552
+BluzDK.menu.softdevice.s130.build.extra_flags=-DNRF51 -DS130 -DNRF51_S130
+BluzDK.menu.softdevice.s130.build.ldscript=armgcc_s130_nrf51822_xxaa.ld

platform.txt

@@ -39,7 +39,9 @@ compiler.ar.cmd=arm-none-eabi-ar
 compiler.ar.flags=rcs
 compiler.objcopy.cmd=arm-none-eabi-objcopy
 compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
+compiler.elf2bin.flags=-O binary
+compiler.elf2bin.cmd=arm-none-eabi-objcopy
+compiler.elf2hex.flags=-O ihex
 compiler.elf2hex.cmd=arm-none-eabi-objcopy
 compiler.ldflags=-mcpu={build.mcu} -mthumb {build.float_flags} -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
 compiler.size.cmd=arm-none-eabi-size
@@ -50,7 +52,7 @@ build.extra_flags=
 
 nrf.sdk.path={runtime.platform.path}/cores/nRF5/nRF5_SDK_11
 
-compiler.nrf.flags="-I{nrf.sdk.path}/components/toolchain/" "-I{nrf.sdk.path}/components/toolchain/CMSIS/Include" "-I{nrf.sdk.path}/components/toolchain/gcc/" "-I{nrf.sdk.path}/components/drivers_nrf/hal/" "-I{nrf.sdk.path}/components/device/"
+compiler.nrf.flags=-DNRF5 "-I{nrf.sdk.path}/components/toolchain/" "-I{nrf.sdk.path}/components/toolchain/CMSIS/Include" "-I{nrf.sdk.path}/components/toolchain/gcc/" "-I{nrf.sdk.path}/components/drivers_nrf/hal/" "-I{nrf.sdk.path}/components/device/" "-I{nrf.sdk.path}/components/softdevice/{softdevice}/headers/"
 
 # These can be overridden in platform.local.txt
 compiler.c.extra_flags={compiler.nrf.flags}
@@ -58,6 +60,7 @@ compiler.c.elf.extra_flags=
 compiler.cpp.extra_flags={compiler.nrf.flags}
 compiler.S.extra_flags=
 compiler.ar.extra_flags=
+compiler.elf2bin.extra_flags=
 compiler.elf2hex.extra_flags=
 
 
@@ -77,14 +80,21 @@ recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DF_CPU=
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
 
 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} "-L{nrf.sdk.path}/components/toolchain/gcc/" "-T{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=nano.specs --specs=nosys.specs {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} -Wl,--start-group -lm "{build.path}/{archive_file}" -Wl,--end-group
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} "-L{nrf.sdk.path}/components/toolchain/gcc/" "-L{nrf.sdk.path}/components/softdevice/{softdevice}/toolchain/armgcc/" "-T{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=nano.specs --specs=nosys.specs {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} -Wl,--start-group -lm "{build.path}/{archive_file}" -Wl,--end-group
 
 ## Create output (bin file)
-recipe.objcopy.bin.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.bin"
+recipe.objcopy.bin.pattern="{compiler.path}{compiler.elf2bin.cmd}" {compiler.elf2bin.flags} {compiler.elf2bin.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.bin"
+
+## Create output (hex file)
+recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex"
+
+## Save bin
+recipe.output.tmp_file_bin={build.project_name}.bin
+recipe.output.save_file_bin={build.project_name}.save.bin
 
 ## Save hex
-recipe.output.tmp_file={build.project_name}.bin
-recipe.output.save_file={build.project_name}.save.bin
+recipe.output.tmp_file_hex={build.project_name}.hex
+recipe.output.save_file_hex={build.project_name}.save.hex
 
 ## Compute size
 recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
@@ -100,8 +110,8 @@ tools.openocd.cmd.windows=bin/openocd.exe
 
 tools.openocd.upload.params.verbose=-d2
 tools.openocd.upload.params.quiet=-d0
-tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -f interface/{upload.interface}.cfg -c "{upload.setup_command}" -f target/{upload.target}.cfg -c "program {{{build.path}/{build.project_name}.bin}} verify reset {upload.address}; shutdown;"
+tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -f interface/{upload.interface}.cfg -c "{upload.setup_command}" -f target/{upload.target}.cfg -c "program {{{build.path}/{build.project_name}.hex}} verify reset; shutdown;"
 
 tools.openocd.program.params.verbose=-d2
 tools.openocd.program.params.quiet=-d0
-tools.openocd.program.pattern="{path}/{cmd}" {program.verbose} -f interface/{program.interface}.cfg -c "{program.setup_command}" -f target/{program.target}.cfg -c "program {{{build.path}/{build.project_name}.bin}} verify reset {upload.address}; shutdown;"
+tools.openocd.program.pattern="{path}/{cmd}" {program.verbose} -f interface/{program.interface}.cfg -c "{program.setup_command}" -f target/{program.target}.cfg -c "program {{{build.path}/{build.project_name}.hex}} verify reset; shutdown;"