bsp/pca10121: Switch to nrfjprog

This changes default flasher to nrfjprog for pca10121 and pca10121_net. jlink can still be selected with syscfg value MYNEWT_DOWNLOADER: jlink
apache · Oct 31, 2023 · d666216 · d666216
1 parent 586cc64
commit d666216
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 82 deletions.
diff --git a/hw/bsp/nordic_pca10121/bsp.yml b/hw/bsp/nordic_pca10121/bsp.yml
@@ -28,7 +28,7 @@ bsp.linkerscript:
 bsp.linkerscript.BOOT_LOADER.OVERWRITE:
     - "hw/bsp/nordic_pca10121/boot-nrf5340.ld"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf5340/nrf5340.ld"
-bsp.downloadscript: "hw/bsp/nordic_pca10121/download.sh"
+bsp.downloadscript: "hw/scripts/download.sh"
 bsp.debugscript: "hw/bsp/nordic_pca10121/debug.sh"
 
 bsp.flash_map:

diff --git a/hw/bsp/nordic_pca10121/download.sh b/hw/bsp/nordic_pca10121/download.sh
diff --git a/hw/bsp/nordic_pca10121/net/bsp.yml b/hw/bsp/nordic_pca10121/net/bsp.yml
@@ -28,7 +28,7 @@ bsp.linkerscript:
 bsp.linkerscript.BOOT_LOADER.OVERWRITE:
     - "hw/bsp/nordic_pca10095_net/boot-nrf5340_net.ld"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf5340_net/nrf5340_net.ld"
-bsp.downloadscript: "hw/bsp/nordic_pca10121/net/download.sh"
+bsp.downloadscript: "hw/scripts/download.sh"
 bsp.debugscript: "hw/bsp/nordic_pca10121/net/debug.sh"
 
 bsp.flash_map:

diff --git a/hw/bsp/nordic_pca10121/net/download.sh b/hw/bsp/nordic_pca10121/net/download.sh
diff --git a/hw/bsp/nordic_pca10121/net/pkg.yml b/hw/bsp/nordic_pca10121/net/pkg.yml
@@ -31,6 +31,7 @@ pkg.cflags:
     - '-DNRF5340_XXAA_NETWORK'
 
 pkg.deps:
+    - "@apache-mynewt-core/hw/scripts"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf5340_net"
     - "@apache-mynewt-core/libc"
     - "@apache-mynewt-core/sys/flash_map"

diff --git a/hw/bsp/nordic_pca10121/net/syscfg.yml b/hw/bsp/nordic_pca10121/net/syscfg.yml
@@ -68,6 +68,12 @@ syscfg.vals:
     # nRF5340 Network Core doesn't have floating point unit
     HARDFLOAT: 0
 
+    # Flasher parameters
+    MYNEWT_DOWNLOADER: nrfjprog
+    JLINK_TARGET: NRF5340_XXAA_NET
+    NRFJPROG_COPROCESSOR: CP_NETWORK
+    MYNEWT_DOWNLOADER_MFG_IMAGE_FLASH_OFFSET: 0x0
+
 syscfg.vals.BLE_CONTROLLER:
     TIMER_0: 0
     TIMER_3: 1

diff --git a/hw/bsp/nordic_pca10121/pkg.yml b/hw/bsp/nordic_pca10121/pkg.yml
@@ -34,6 +34,7 @@ pkg.cflags.HARDFLOAT:
     - -mfloat-abi=hard -mfpu=fpv4-sp-d16
 
 pkg.deps:
+    - "@apache-mynewt-core/hw/scripts"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf5340"
     - "@apache-mynewt-core/libc"
     - "@apache-mynewt-core/sys/flash_map"

diff --git a/hw/bsp/nordic_pca10121/syscfg.yml b/hw/bsp/nordic_pca10121/syscfg.yml
@@ -96,6 +96,11 @@ syscfg.vals:
     QSPI_XIP_OFFSET: 0x10000000
     FLASH_MAP_SYSINIT_STAGE: 15
 
+    # Flasher parameters
+    MYNEWT_DOWNLOADER: nrfjprog
+    JLINK_TARGET: NRF5340_XXAA_APP
+    MYNEWT_DOWNLOADER_MFG_IMAGE_FLASH_OFFSET: 0x0
+
 syscfg.vals.!BOOT_LOADER:
     MCU_LFCLK_SOURCE: LFXO
     MCU_LFCLK_XO_INTCAP: c9pf