Common download scripts for NRF5x

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:

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"

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

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:

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"

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

hw/bsp/nordic_pca10056/bsp.yml

@@ -24,7 +24,7 @@ bsp.arch: cortex_m4
 bsp.compiler: compiler/arm-none-eabi-m4
 bsp.linkerscript: autogenerated
 bsp.part2linkerscript: "hw/bsp/nordic_pca10056/split-nordic_pca10056.ld"
-bsp.downloadscript: "hw/bsp/nordic_pca10056/nordic_pca10056_download.sh"
+bsp.downloadscript: "hw/scripts/download.sh"
 bsp.debugscript: "hw/bsp/nordic_pca10056/nordic_pca10056_debug.sh"
 
 bsp.flash_map:

hw/bsp/nordic_pca10056/pkg.yml

@@ -37,6 +37,7 @@ pkg.cflags.HARDFLOAT:
 pkg.deps:
     - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx"
     - "@apache-mynewt-core/libc"
+    - "@apache-mynewt-core/hw/scripts"
     - "@apache-mynewt-core/sys/flash_map"
     - "@apache-mynewt-core/boot/startup"
 

hw/bsp/nordic_pca10056/syscfg.yml

@@ -66,6 +66,11 @@ syscfg.vals:
     QSPI_PIN_DIO3: 23
     GPIO_AS_PIN_RESET: 1
 
+    MYNEWT_DOWNLOADER: nrfutil
+    JLINK_TARGET: NRF52
+    PYOCD_TARGET: nrf52840
+    MYNEWT_DOWNLOADER_MFG_IMAGE_FLASH_OFFSET: 0x0
+
 syscfg.vals.BLE_CONTROLLER:
     TIMER_0: 0
     TIMER_5: 1

hw/bsp/nordic_pca10059/bsp.yml

@@ -24,7 +24,7 @@ bsp.arch: cortex_m4
 bsp.compiler: compiler/arm-none-eabi-m4
 bsp.linkerscript: autogenerated
 bsp.part2linkerscript: "hw/bsp/nordic_pca10059/split-nordic_pca10059.ld"
-bsp.downloadscript: "hw/bsp/nordic_pca10059/nordic_pca10059_download.sh"
+bsp.downloadscript: "hw/scripts/download.sh"
 bsp.debugscript: "hw/bsp/nordic_pca10059/nordic_pca10059_debug.sh"
 
 bsp.flash_map:
@@ -58,3 +58,35 @@ bsp.flash_map:
             device: 0
             offset: 0x000fc000
             size: 16kB
+
+bsp.flash_map.BSP_NRF_SDK_FLASH_LAYOUT:
+    areas:
+        # NRF52 MBR area.
+        FLASH_AREA_MBR:
+            user_id: 20
+            device: 0
+            offset: 0x00000000
+            size: 4kB
+        # NRF52 bootloader ara.
+        FLASH_AREA_NRF52_BOOTLOADER:
+            user_id: 21
+            device: 0
+            offset: 0x000E0000
+            size: 128kB
+        # mynewt image
+        FLASH_AREA_IMAGE_0:
+            device: 0
+            offset: 0x00001000
+            size: 396kB
+
+        # User areas.
+        FLASH_AREA_REBOOT_LOG:
+            user_id: 0
+            device: 0
+            offset: 0x000C8000
+            size: 16kB
+        FLASH_AREA_NFFS:
+            user_id: 1
+            device: 0
+            offset: 0x000CC000
+            size: 16kB

hw/bsp/nordic_pca10059/pkg.yml

@@ -38,6 +38,7 @@ pkg.deps:
     - "@apache-mynewt-core/libc"
     - "@apache-mynewt-core/sys/flash_map"
     - "@apache-mynewt-core/boot/startup"
+    - "@apache-mynewt-core/hw/scripts"
 
 pkg.deps.SOFT_PWM:
     - "@apache-mynewt-core/hw/drivers/pwm/soft_pwm"

hw/bsp/nordic_pca10059/syscfg.yml

@@ -23,9 +23,25 @@ syscfg.defs:
     SOFT_PWM:
         description: 'Enable soft PWM'
         value: 0
+    BSP_NRF_SDK_FLASH_LAYOUT:
+        description: >
+            Set this to 1 when device has Nordic SDK bootloader.
+            When this is used device can be flashed with nrfutil
+            tool without debugger.
+        value: 0
+
+syscfg.BSP_NRF_SDK_FLASH_LAYOUT:
+    # Change to use Nordic DFU bootloader which is likely to be used
+    # when device still has original bootloader
+    NRFUTIL_TRAITS: nordicDfu
 
 syscfg.vals:
-    # Enable nRF52840 MCU and common startup code
+    MYNEWT_DOWNLOADER: nrfutil
+    JLINK_TARGET: nRF52840_xxAA
+    PYOCD_TARGET: nrf52840
+    NRFUTIL_TRAITS: jlink
+
+# Enable nRF52840 MCU and common startup code
     MCU_TARGET: nRF52840
     MCU_COMMON_STARTUP: 1
 

hw/scripts/download.sh

@@ -73,6 +73,12 @@ case "${MYNEWT_VAL_MYNEWT_DOWNLOADER}" in
     common_file_to_load
     nrfjprog_load
     ;;
+  "nrfutil")
+    check_downloader nrfutil
+    . $CORE_PATH/hw/scripts/nrfutil.sh
+    common_file_to_load
+    nrfutil_load
+    ;;
   "openocd")
     check_downloader openocd
     . $CORE_PATH/hw/scripts/openocd.sh