hw/bsp/nordic_pca10028: Switch to use common download script

This also changes default downloader to nrfutil Signed-off-by: Jerzy Kasenberg <jerzy.kasenberg@codecoup.pl>
apache · Dec 2, 2024 · d2082b5 · d2082b5
1 parent 8cd6230
commit d2082b5
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 132 deletions.
diff --git a/hw/bsp/nordic_pca10028-16k/bsp.yml b/hw/bsp/nordic_pca10028-16k/bsp.yml
@@ -29,10 +29,8 @@ bsp.linkerscript.BOOT_LOADER.OVERWRITE:
     - "hw/bsp/nordic_pca10028-16k/boot-nrf51xxaa.ld"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx/nrf51.ld"
 bsp.part2linkerscript: "hw/bsp/nordic_pca10028-16k/split-nordic_pca10028-16k.ld"
-bsp.downloadscript: "hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_download.sh"
+bsp.downloadscript: "hw/scripts/download.sh"
 bsp.debugscript: "hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_debug.sh"
-bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_download.cmd"
-bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_debug.cmd"
 
 bsp.flash_map:
     areas:

diff --git a/hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_download.cmd b/hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_download.cmd
diff --git a/hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_download.sh b/hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_download.sh
diff --git a/hw/bsp/nordic_pca10028-16k/pkg.yml b/hw/bsp/nordic_pca10028-16k/pkg.yml
@@ -35,6 +35,7 @@ pkg.cflags:
 pkg.deps:
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
     - "@apache-mynewt-core/libc"
+    - "@apache-mynewt-core/hw/scripts"
 
 pkg.deps.UART_0:
     - "@apache-mynewt-core/hw/drivers/uart/uart_hal"

diff --git a/hw/bsp/nordic_pca10028-16k/syscfg.yml b/hw/bsp/nordic_pca10028-16k/syscfg.yml
@@ -124,6 +124,12 @@ syscfg.vals:
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
 
+    # Flasher parameters
+    MYNEWT_DOWNLOADER: nrfjprog
+    MYNEWT_DOWNLOADER_MFG_IMAGE_FLASH_OFFSET: 0x0
+    PYOCD_TARGET: nrf51
+    JLINK_TARGET: nRF51422_xxAC
+
 syscfg.vals.BLE_CONTROLLER:
     OS_CPUTIME_FREQ: 32768
     OS_CPUTIME_TIMER_NUM: 3

diff --git a/hw/bsp/nordic_pca10028/bsp.yml b/hw/bsp/nordic_pca10028/bsp.yml
@@ -29,10 +29,8 @@ bsp.linkerscript.BOOT_LOADER.OVERWRITE:
     - "hw/bsp/nordic_pca10028/boot-nrf51xxac.ld"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx/nrf51.ld"
 bsp.part2linkerscript: "hw/bsp/nordic_pca10028/split-nordic_pca10028.ld"
-bsp.downloadscript: "hw/bsp/nordic_pca10028/nordic_pca10028_download.sh"
+bsp.downloadscript: "hw/scripts/download.sh"
 bsp.debugscript: "hw/bsp/nordic_pca10028/nordic_pca10028_debug.sh"
-bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10028/nordic_pca10028_download.cmd"
-bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10028/nordic_pca10028_debug.cmd"
 
 bsp.flash_map:
     areas:

diff --git a/hw/bsp/nordic_pca10028/nordic_pca10028_download.cmd b/hw/bsp/nordic_pca10028/nordic_pca10028_download.cmd
diff --git a/hw/bsp/nordic_pca10028/nordic_pca10028_download.sh b/hw/bsp/nordic_pca10028/nordic_pca10028_download.sh
diff --git a/hw/bsp/nordic_pca10028/pkg.yml b/hw/bsp/nordic_pca10028/pkg.yml
@@ -35,6 +35,7 @@ pkg.cflags:
 pkg.deps:
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
     - "@apache-mynewt-core/libc"
+    - "@apache-mynewt-core/hw/scripts"
 
 pkg.deps.UART_0:
     - "@apache-mynewt-core/hw/drivers/uart/uart_hal"

diff --git a/hw/bsp/nordic_pca10028/syscfg.yml b/hw/bsp/nordic_pca10028/syscfg.yml
@@ -124,6 +124,12 @@ syscfg.vals:
     MCU_DCDC_ENABLED: 1
     MCU_LFCLK_SOURCE: LFXO
 
+    # Flasher parameters
+    MYNEWT_DOWNLOADER: nrfjprog
+    MYNEWT_DOWNLOADER_MFG_IMAGE_FLASH_OFFSET: 0x0
+    PYOCD_TARGET: nrf51
+    JLINK_TARGET: nRF51422_xxAC
+
 syscfg.vals.BLE_CONTROLLER:
     OS_CPUTIME_FREQ: 32768
     OS_CPUTIME_TIMER_NUM: 3