hw/bsp: nordic_pca10040 add syscfg selectable download script

apache · May 29, 2023 · 8433104 · 8433104
1 parent 5eb1a1b
commit 8433104
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 88 deletions.
diff --git a/hw/bsp/nordic_pca10040/bsp.yml b/hw/bsp/nordic_pca10040/bsp.yml
@@ -32,10 +32,8 @@ bsp.linkerscript.RAM_RESIDENT.OVERWRITE:
     - "hw/bsp/nordic_pca10040/boot-nrf52xxaa.ld"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx/nrf52_ram_resident.ld"
 bsp.part2linkerscript: "hw/bsp/nordic_pca10040/split-nordic_pca10040.ld"
-bsp.downloadscript: "hw/bsp/nordic_pca10040/nordic_pca10040_download.sh"
+bsp.downloadscript: "hw/scripts/download.sh"
 bsp.debugscript: "hw/bsp/nordic_pca10040/nordic_pca10040_debug.sh"
-bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10040/nordic_pca10040_download.cmd"
-bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10040/nordic_pca10040_debug.cmd"
 
 bsp.flash_map:
     areas:

diff --git a/hw/bsp/nordic_pca10040/nordic_pca10040_debug.cmd b/hw/bsp/nordic_pca10040/nordic_pca10040_debug.cmd
diff --git a/hw/bsp/nordic_pca10040/nordic_pca10040_download.cmd b/hw/bsp/nordic_pca10040/nordic_pca10040_download.cmd
diff --git a/hw/bsp/nordic_pca10040/nordic_pca10040_download.sh b/hw/bsp/nordic_pca10040/nordic_pca10040_download.sh
diff --git a/hw/bsp/nordic_pca10040/pkg.yml b/hw/bsp/nordic_pca10040/pkg.yml
@@ -37,6 +37,7 @@ pkg.cflags.HARDFLOAT:
 pkg.deps:
     - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx"
     - "@apache-mynewt-core/libc/baselibc"
+    - "@apache-mynewt-core/hw/scripts"
 
 pkg.deps.ENC_FLASH_DEV:
     - "@apache-mynewt-core/hw/drivers/flash/enc_flash/ef_nrf5x"
@@ -46,4 +47,3 @@ pkg.deps.SOFT_PWM:
 
 pkg.deps.UARTBB_0:
     - "@apache-mynewt-core/hw/drivers/uart/uart_bitbang"
-
diff --git a/hw/bsp/nordic_pca10040/syscfg.yml b/hw/bsp/nordic_pca10040/syscfg.yml
@@ -61,6 +61,12 @@ syscfg.vals:
     MCU_LFCLK_SOURCE: LFXO
     BOOT_SERIAL_DETECT_PIN: 13  # Button 1
 
+    # Flasher parameters
+    MYNEWT_DOWNLOADER: jlink
+    MYNEWT_DOWNLOADER_MFG_IMAGE_FLASH_OFFSET: 0x0
+    PYOCD_TARGET: nrf52
+    JLINK_TARGET: nRF52832_xxAA
+
 syscfg.vals.BLE_CONTROLLER:
     TIMER_0: 0
     TIMER_5: 1