Skip to content

Commit 18cc769

Browse files
committed
hw/bsp/nordic_pca10028: Switch to use common download script
This also changes default downloader to nrfutil Signed-off-by: Jerzy Kasenberg <[email protected]>
1 parent 7fac1f2 commit 18cc769

File tree

10 files changed

+16
-132
lines changed

10 files changed

+16
-132
lines changed

hw/bsp/nordic_pca10028-16k/bsp.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@ bsp.linkerscript.BOOT_LOADER.OVERWRITE:
2929
- "hw/bsp/nordic_pca10028-16k/boot-nrf51xxaa.ld"
3030
- "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx/nrf51.ld"
3131
bsp.part2linkerscript: "hw/bsp/nordic_pca10028-16k/split-nordic_pca10028-16k.ld"
32-
bsp.downloadscript: "hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_download.sh"
32+
bsp.downloadscript: "hw/scripts/download.sh"
3333
bsp.debugscript: "hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_debug.sh"
34-
bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_download.cmd"
35-
bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_debug.cmd"
3634

3735
bsp.flash_map:
3836
areas:

hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_download.cmd

Lines changed: 0 additions & 22 deletions
This file was deleted.

hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_download.sh

Lines changed: 0 additions & 41 deletions
This file was deleted.

hw/bsp/nordic_pca10028-16k/pkg.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ pkg.cflags:
3535
pkg.deps:
3636
- "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
3737
- "@apache-mynewt-core/libc"
38+
- "@apache-mynewt-core/hw/scripts"
3839

3940
pkg.deps.UART_0:
4041
- "@apache-mynewt-core/hw/drivers/uart/uart_hal"

hw/bsp/nordic_pca10028-16k/syscfg.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@ syscfg.vals:
124124
MCU_DCDC_ENABLED: 1
125125
MCU_LFCLK_SOURCE: LFXO
126126

127+
# Flasher parameters
128+
MYNEWT_DOWNLOADER: nrfjprog
129+
MYNEWT_DOWNLOADER_MFG_IMAGE_FLASH_OFFSET: 0x0
130+
PYOCD_TARGET: nrf51
131+
JLINK_TARGET: nRF51422_xxAC
132+
127133
syscfg.vals.BLE_CONTROLLER:
128134
OS_CPUTIME_FREQ: 32768
129135
OS_CPUTIME_TIMER_NUM: 3

hw/bsp/nordic_pca10028/bsp.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@ bsp.linkerscript.BOOT_LOADER.OVERWRITE:
2929
- "hw/bsp/nordic_pca10028/boot-nrf51xxac.ld"
3030
- "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx/nrf51.ld"
3131
bsp.part2linkerscript: "hw/bsp/nordic_pca10028/split-nordic_pca10028.ld"
32-
bsp.downloadscript: "hw/bsp/nordic_pca10028/nordic_pca10028_download.sh"
32+
bsp.downloadscript: "hw/scripts/download.sh"
3333
bsp.debugscript: "hw/bsp/nordic_pca10028/nordic_pca10028_debug.sh"
34-
bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10028/nordic_pca10028_download.cmd"
35-
bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10028/nordic_pca10028_debug.cmd"
3634

3735
bsp.flash_map:
3836
areas:

hw/bsp/nordic_pca10028/nordic_pca10028_download.cmd

Lines changed: 0 additions & 22 deletions
This file was deleted.

hw/bsp/nordic_pca10028/nordic_pca10028_download.sh

Lines changed: 0 additions & 41 deletions
This file was deleted.

hw/bsp/nordic_pca10028/pkg.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ pkg.cflags:
3535
pkg.deps:
3636
- "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
3737
- "@apache-mynewt-core/libc"
38+
- "@apache-mynewt-core/hw/scripts"
3839

3940
pkg.deps.UART_0:
4041
- "@apache-mynewt-core/hw/drivers/uart/uart_hal"

hw/bsp/nordic_pca10028/syscfg.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@ syscfg.vals:
124124
MCU_DCDC_ENABLED: 1
125125
MCU_LFCLK_SOURCE: LFXO
126126

127+
# Flasher parameters
128+
MYNEWT_DOWNLOADER: nrfjprog
129+
MYNEWT_DOWNLOADER_MFG_IMAGE_FLASH_OFFSET: 0x0
130+
PYOCD_TARGET: nrf51
131+
JLINK_TARGET: nRF51422_xxAC
132+
127133
syscfg.vals.BLE_CONTROLLER:
128134
OS_CPUTIME_FREQ: 32768
129135
OS_CPUTIME_TIMER_NUM: 3

0 commit comments

Comments
 (0)