Skip to content

Commit

Permalink
hw/bsp/nordic_pca10090: Use selectable downloader
Browse files Browse the repository at this point in the history
Download was not working due to missing device specifier
for jlink. Now it is corrected and nrfjprog can also
be used for flashing.

Signed-off-by: Jerzy Kasenberg <jerzy.kasenberg@codecoup.pl>
  • Loading branch information
kasjer committed Mar 6, 2024
1 parent 2640b48 commit 2abe8e0
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 87 deletions.
4 changes: 1 addition & 3 deletions hw/bsp/nordic_pca10090/bsp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,8 @@ bsp.linkerscript.RAM_RESIDENT.OVERWRITE:
- "hw/bsp/nordic_pca10090/boot-nrf9160.ld"
- "@apache-mynewt-core/hw/mcu/nordic/nrf9160/nrf9160_ram_resident.ld"
bsp.part2linkerscript: "hw/bsp/nordic_pca10090/split-nordic_pca10090.ld"
bsp.downloadscript: "hw/bsp/nordic_pca10090/nordic_pca10090_download.sh"
bsp.downloadscript: "hw/scripts/download.sh"
bsp.debugscript: "hw/bsp/nordic_pca10090/nordic_pca10090_debug.sh"
bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10090/nordic_pca10090_download.cmd"
bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10090/nordic_pca10090_debug.cmd"

bsp.flash_map:
areas:
Expand Down
22 changes: 0 additions & 22 deletions hw/bsp/nordic_pca10090/nordic_pca10090_debug.cmd

This file was deleted.

22 changes: 0 additions & 22 deletions hw/bsp/nordic_pca10090/nordic_pca10090_download.cmd

This file was deleted.

40 changes: 0 additions & 40 deletions hw/bsp/nordic_pca10090/nordic_pca10090_download.sh

This file was deleted.

1 change: 1 addition & 0 deletions hw/bsp/nordic_pca10090/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ pkg.cflags.HARDFLOAT:
pkg.deps:
- "@apache-mynewt-core/hw/mcu/nordic/nrf91xx"
- "@apache-mynewt-core/libc"
- "@apache-mynewt-core/hw/scripts"

pkg.deps.UARTBB_0:
- "@apache-mynewt-core/hw/drivers/uart/uart_bitbang"
Expand Down
4 changes: 4 additions & 0 deletions hw/bsp/nordic_pca10090/syscfg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ syscfg.defs:
value: 0

syscfg.vals:
MYNEWT_DOWNLOADER: nrfjprog
JLINK_TARGET: NRF9160_XXAA
MYNEWT_DOWNLOADER_MFG_IMAGE_FLASH_OFFSET: 0x0

# Enable nRF9160 MCU and common startup code
MCU_TARGET: nRF9160
MCU_COMMON_STARTUP: 1
Expand Down

0 comments on commit 2abe8e0

Please sign in to comment.