Add support for Adafruit boards/bootloader.

Former-commit-id: fb4739c

Author: h2zero

boards.txt

@@ -0,0 +1,13 @@
+/* Linker script to configure memory regions. */
+
+SEARCH_DIR(.)
+GROUP(-lgcc -lc -lnosys)
+
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00001000, LENGTH = 0x73000
+  RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 0x1FFF8
+}
+
+
+INCLUDE "nrf_common.ld"

cores/nRF5/nordic/linker/nrf52833_xxaa_adabl.ld

@@ -0,0 +1,13 @@
+/* Linker script to configure memory regions. */
+
+SEARCH_DIR(.)
+GROUP(-lgcc -lc -lnosys)
+
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x1000, LENGTH = 0xf3000
+  RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 0x3FFF8
+}
+
+
+INCLUDE "nrf_common.ld"

cores/nRF5/nordic/linker/nrf52840_xxaa_adabl.ld

@@ -0,0 +1,13 @@
+/* Linker script to configure memory regions. */
+
+SEARCH_DIR(.)
+GROUP(-lgcc -lc -lnosys)
+
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00001000, LENGTH = 0x73000
+  RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 0xFFF8
+}
+
+
+INCLUDE "nrf_common.ld"

cores/nRF5/nordic/linker/nrf52_xxaa_adabl.ld

@@ -4,10 +4,12 @@
 #include "nrf.h"
 #include "nrfx_nvmc.h"
 
-#ifdef USE_TINYUSB
-#define BOOTLOADER_PAGE_SIZE 32
+#if defined(USE_ADA_BL)
+#  define BOOTLOADER_PAGE_SIZE 12
+#elif defined(USE_NORDIC_BL)
+#  define BOOTLOADER_PAGE_SIZE 32
 #else
-#define BOOTLOADER_PAGE_SIZE 0
+#  define BOOTLOADER_PAGE_SIZE 0
 #endif
 
 #define FLASH_WAIT_READY while (NRF_NVMC->READY == NVMC_READY_READY_Busy){}

cores/nRF5/nordic/nrf_nvm_store.c

@@ -51,10 +51,13 @@ compiler.define=-DARDUINO=
 
 # this can be overriden in boards.txt
 build.extra_flags=
-build.dfu_pattern=echo
-
+build.dfu_pattern=echo Not building DFU package
+build.bootloader.file=variants/Generic/none_bootloader.hex
 build.flags.usb= -DUSBCON -DUSE_TINYUSB -DUSB_VID={build.vid} -DUSB_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
+
 nrfutil.dfu_pattern="{tools.nrfutil.cmd}" pkg generate --hw-version 52 --debug-mode --sd-req 0 --application "{build.path}/{build.project_name}.hex" "{build.path}/{build.project_name}.zip"
+adafruit-nrfutil.dfu_pattern="{tools.adafruit-nrfutil.cmd}" dfu genpkg --dev-type 0x0052 --application "{build.path}/{build.project_name}.hex" "{build.path}/{build.project_name}.zip"
+
 nordic.path={build.core.path}/nordic
 
 compiler.nrf.flags=-DNRF5 -DARDUINO_ARCH_NRF5 "-I{build.core.path}/nimble_config" "-I{nordic.path}/nrfx" "-I{nordic.path}/nrfx/hal" "-I{nordic.path}/nrfx/mdk" "-I{nordic.path}/nrfx/soc" "-I{nordic.path}/nrfx/drivers/include" "-I{nordic.path}/nrfx/drivers/src" "-I{build.core.path}/CMSIS/Include" "-I{build.core.path}/FC_Store" "-I{build.core.path}/BLEBond_nvs" "-I{build.core.path}/TinyUSB" "-I{build.core.path}/TinyUSB/Adafruit_TinyUSB_ArduinoCore" "-I{build.core.path}/TinyUSB/Adafruit_TinyUSB_ArduinoCore/tinyusb/src"
@@ -145,7 +148,7 @@ tools.openocd.erase.pattern=
 
 tools.openocd.bootloader.params.verbose=-d2
 tools.openocd.bootloader.params.quiet=-d0
-tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -f interface/{program.protocol}.cfg -c "{program.setup_command}" -f target/{upload.target}.cfg -c "init; halt; nrf5 mass_erase; shutdown;"
+tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -f interface/{program.protocol}.cfg -c "{program.setup_command}" -f target/{upload.target}.cfg -c "init; halt; nrf51 mass_erase; program {runtime.platform.path}/{build.bootloader.file} verify reset; shutdown;"
 
 #
 # blackmagic probe upload
@@ -172,19 +175,33 @@ tools.blackmagicprobe.program.pattern.windows="{path}{cmd}" -quiet -cd "{build.p
 
 tools.blackmagicprobe.bootloader.params.verbose=
 tools.blackmagicprobe.bootloader.params.quiet=-q --batch-silent
-tools.blackmagicprobe.bootloader.pattern="{path}{cmd}" -quiet -ex "target extended-remote {serial.port}" -ex "monitor swdp_scan" -ex "attach 1" -ex "monitor erase mass" -ex "detach" -ex "quit"
-tools.blackmagicprobe.bootloader.pattern.windows="{path}{cmd}" -quiet -ex "target extended-remote \\.\{serial.port}" -ex "monitor swdp_scan" -ex "attach 1" -ex "monitor erase mass" -ex "detach" -ex "quit"
+tools.blackmagicprobe.bootloader.pattern="{path}{cmd}" -quiet -ex "target extended-remote {serial.port}" -ex "monitor swdp_scan" -ex "attach 1" -ex "monitor erase mass" -ex "load {runtime.platform.path}/{build.bootloader.file}" -ex "echo \nBootloader flash complete!\n" -ex "detach" -ex "quit"
+tools.blackmagicprobe.bootloader.pattern.windows="{path}{cmd}" -quiet -ex "target extended-remote \\.\{serial.port}" -ex "monitor swdp_scan" -ex "attach 1" -ex "monitor erase mass" -ex load {runtime.platform.path}\{build.bootloader.file} -ex "echo \nBootloader flash complete!\n" -ex "detach" -ex "quit"
 
 #
 # nrfutil upload
 #
-tools.nrfutil.cmd={runtime.tools.nrfutil-6.1.4.path}/nrfutil
-tools.nrfutil.cmd.windows={runtime.tools.nrfutil-6.1.4.path}/nrfutil.exe
+tools.nrfutil.cmd=nrfutil
 
 tools.nrfutil.upload.params.verbose=
 tools.nrfutil.upload.params.quiet=
 tools.nrfutil.upload.pattern="{cmd}" dfu serial -pkg "{build.path}/{build.project_name}.zip" -p {serial.port} -b 115200
 
 tools.nrfutil.program.params.verbose=
 tools.nrfutil.program.params.quiet=
-tools.nrfutil.program.pattern="{cmd}" dfu serial -pkg "{build.path}/{build.project_name}.zip" -p {serial.port} -b 115200
+tools.nrfutil.program.pattern="{cmd}" dfu serial -pkg "{build.path}/{build.project_name}.zip" -p {serial.port} -b 115200
+
+#***************************************************
+# adafruit-nrfutil for uploading
+# https://github.com/adafruit/Adafruit_nRF52_nrfutil
+# pre-built binaries are provided for macos and windows
+#***************************************************
+tools.adafruit-nrfutil.cmd=adafruit-nrfutil
+
+tools.adafruit-nrfutil.upload.params.verbose=--verbose
+tools.adafruit-nrfutil.upload.params.quiet=
+tools.adafruit-nrfutil.upload.pattern="{cmd}" {upload.verbose} dfu serial -pkg "{build.path}/{build.project_name}.zip" -p {serial.port} -b 115200 --singlebank
+
+tools.adafruit-nrfutil.program.params.verbose=--verbose
+tools.adafruit-nrfutil.program.params.quiet=
+tools.adafruit-nrfutil.program.pattern="{cmd}" {program.verbose} dfu serial -pkg "{build.path}/{build.project_name}.zip" -p {serial.port} -b 115200 --singlebank

platform.txt

@@ -30,6 +30,13 @@ blackmagicprobe.program.tool=blackmagicprobe
 blackmagicprobe.bootloader.tool=blackmagicprobe
 blackmagicprobe.program.extra_params=;
 
+adafruit-nrfutil.name=adafruit-nrfutil
+adafruit-nrfutil.communication=USB
+adafruit-nrfutil.protocol=
+adafruit-nrfutil.program.protocol=
+adafruit-nrfutil.program.tool=adafruit-nrfutil
+adafruit-nrfutil.program.extra_params=;
+
 nrfutil.name=nrfutil
 nrfutil.communication=USB
 nrfutil.protocol=