From 7961103ee65692bb27a8f17e7657da2dd26c2102 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 22 Aug 2018 21:51:30 +0700 Subject: [PATCH 1/3] update SD to v6.1.0 --- .gitignore | 1 - ports/nrf/boards/adafruit_nrf52840_s140_v6.ld | 4 +-- .../nrf/boards/feather52840/mpconfigboard.mk | 2 +- ports/nrf/boards/pca10056/mpconfigboard.mk | 2 +- .../drivers/bluetooth/download_ble_stack.sh | 36 +++++++++++++++++++ 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a6bed32354..60fe8a63fd 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ *.bin *.map *.hex -!ports/nrf/**/bootloader/**/*.hex *.dis *.exe diff --git a/ports/nrf/boards/adafruit_nrf52840_s140_v6.ld b/ports/nrf/boards/adafruit_nrf52840_s140_v6.ld index fbc87801f4..8a700d6109 100644 --- a/ports/nrf/boards/adafruit_nrf52840_s140_v6.ld +++ b/ports/nrf/boards/adafruit_nrf52840_s140_v6.ld @@ -1,5 +1,5 @@ /* - GNU linker script for NRF52840 w/S140 6.0.0 SoftDevice + GNU linker script for NRF52840 w/S140 6.x.x SoftDevice MEMORY MAP ------------------------------------------------------------------------ @@ -17,7 +17,7 @@ 0x00000000..0x00000FFF (4KB) Master Boot Record */ -/* Specify the memory areas (S140 6.0.0) */ +/* Specify the memory areas (S140 6.x.x) */ MEMORY { FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x100000 diff --git a/ports/nrf/boards/feather52840/mpconfigboard.mk b/ports/nrf/boards/feather52840/mpconfigboard.mk index 1edc09a607..5c4fde4838 100644 --- a/ports/nrf/boards/feather52840/mpconfigboard.mk +++ b/ports/nrf/boards/feather52840/mpconfigboard.mk @@ -2,7 +2,7 @@ MCU_SERIES = m4 MCU_VARIANT = nrf52 MCU_SUB_VARIANT = nrf52840 SD ?= s140 -SOFTDEV_VERSION ?= 6.0.0 +SOFTDEV_VERSION ?= 6.1.0 BOOT_SETTING_ADDR = 0xFF000 diff --git a/ports/nrf/boards/pca10056/mpconfigboard.mk b/ports/nrf/boards/pca10056/mpconfigboard.mk index 1edc09a607..5c4fde4838 100644 --- a/ports/nrf/boards/pca10056/mpconfigboard.mk +++ b/ports/nrf/boards/pca10056/mpconfigboard.mk @@ -2,7 +2,7 @@ MCU_SERIES = m4 MCU_VARIANT = nrf52 MCU_SUB_VARIANT = nrf52840 SD ?= s140 -SOFTDEV_VERSION ?= 6.0.0 +SOFTDEV_VERSION ?= 6.1.0 BOOT_SETTING_ADDR = 0xFF000 diff --git a/ports/nrf/drivers/bluetooth/download_ble_stack.sh b/ports/nrf/drivers/bluetooth/download_ble_stack.sh index 52bd4b22dc..e894ee1c0e 100755 --- a/ports/nrf/drivers/bluetooth/download_ble_stack.sh +++ b/ports/nrf/drivers/bluetooth/download_ble_stack.sh @@ -35,6 +35,22 @@ function download_s132_nrf52_5_0_0 cd - } +function download_s132_nrf52_6_1_0 +{ + echo "" + echo "####################################" + echo "### Downloading s132_nrf52_6.1.0 ###" + echo "####################################" + echo "" + mkdir -p "${1}/s132_nrf52_6.1.0" + cd "${1}/s132_nrf52_6.1.0" + wget https://www.nordicsemi.com/eng/nordic/download_resource/67248/5/32206771/141008 + mv 141008 temp.zip + unzip -u temp.zip + rm temp.zip + cd - +} + function download_s140_nrf52_6_0_0 { echo "" @@ -53,6 +69,22 @@ function download_s140_nrf52_6_0_0 cd - } +function download_s140_nrf52_6_1_0 +{ + echo "" + echo "####################################" + echo "### Downloading s140_nrf52_6.1.0 ###" + echo "####################################" + echo "" + mkdir -p "${1}/s140_nrf52_6.1.0" + cd "${1}/s140_nrf52_6.1.0" + wget https://www.nordicsemi.com/eng/nordic/download_resource/60624/25/88218841/116072 + mv 116072 temp.zip + unzip -u temp.zip + rm temp.zip + cd - +} + SCRIPT_DIR="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)" if [ $# -eq 0 ]; then @@ -66,8 +98,12 @@ else download_s132_nrf52_2_0_1 "${SCRIPT_DIR}" ;; "s132_nrf52_5_0_0" ) download_s132_nrf52_5_0_0 "${SCRIPT_DIR}" ;; + "s132_nrf52_6_1_0" ) + download_s132_nrf52_6_1_0 "${SCRIPT_DIR}" ;; "s140_nrf52_6_0_0" ) download_s140_nrf52_6_0_0 "${SCRIPT_DIR}" ;; + "s140_nrf52_6_1_0" ) + download_s140_nrf52_6_1_0 "${SCRIPT_DIR}" ;; esac fi From 0c0ac06fc7da7aa91809b163352199b94a2351f8 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 22 Aug 2018 23:09:09 +0700 Subject: [PATCH 2/3] add SD 6.1.0 to download all --- ports/nrf/drivers/bluetooth/download_ble_stack.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/nrf/drivers/bluetooth/download_ble_stack.sh b/ports/nrf/drivers/bluetooth/download_ble_stack.sh index e894ee1c0e..c3c021a888 100755 --- a/ports/nrf/drivers/bluetooth/download_ble_stack.sh +++ b/ports/nrf/drivers/bluetooth/download_ble_stack.sh @@ -91,7 +91,9 @@ if [ $# -eq 0 ]; then echo "No Bluetooth LE stack defined, downloading all." download_s132_nrf52_2_0_1 "${SCRIPT_DIR}" download_s132_nrf52_5_0_0 "${SCRIPT_DIR}" + download_s132_nrf52_6_1_0 "${SCRIPT_DIR}" download_s140_nrf52_6_0_0 "${SCRIPT_DIR}" + download_s140_nrf52_6_1_0 "${SCRIPT_DIR}" else case $1 in "s132_nrf52_2_0_1" ) From fed1960424969ddd1565520f9258d57e28447870 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 23 Aug 2018 00:27:39 +0700 Subject: [PATCH 3/3] remove s140 6.0.0 and s132 6.1.0 (not supported yet) --- .../drivers/bluetooth/download_ble_stack.sh | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/ports/nrf/drivers/bluetooth/download_ble_stack.sh b/ports/nrf/drivers/bluetooth/download_ble_stack.sh index c3c021a888..385dbb451b 100755 --- a/ports/nrf/drivers/bluetooth/download_ble_stack.sh +++ b/ports/nrf/drivers/bluetooth/download_ble_stack.sh @@ -35,40 +35,6 @@ function download_s132_nrf52_5_0_0 cd - } -function download_s132_nrf52_6_1_0 -{ - echo "" - echo "####################################" - echo "### Downloading s132_nrf52_6.1.0 ###" - echo "####################################" - echo "" - mkdir -p "${1}/s132_nrf52_6.1.0" - cd "${1}/s132_nrf52_6.1.0" - wget https://www.nordicsemi.com/eng/nordic/download_resource/67248/5/32206771/141008 - mv 141008 temp.zip - unzip -u temp.zip - rm temp.zip - cd - -} - -function download_s140_nrf52_6_0_0 -{ - echo "" - echo "####################################" - echo "### Downloading s140_nrf52_6.0.0 ###" - echo "####################################" - echo "" - - mkdir -p "${1}/s140_nrf52_6.0.0" - cd "${1}/s140_nrf52_6.0.0" - - wget https://www.nordicsemi.com/eng/nordic/download_resource/60624/20/49271410/116072 - mv 116072 temp.zip - unzip -u temp.zip - rm temp.zip - cd - -} - function download_s140_nrf52_6_1_0 { echo "" @@ -91,8 +57,6 @@ if [ $# -eq 0 ]; then echo "No Bluetooth LE stack defined, downloading all." download_s132_nrf52_2_0_1 "${SCRIPT_DIR}" download_s132_nrf52_5_0_0 "${SCRIPT_DIR}" - download_s132_nrf52_6_1_0 "${SCRIPT_DIR}" - download_s140_nrf52_6_0_0 "${SCRIPT_DIR}" download_s140_nrf52_6_1_0 "${SCRIPT_DIR}" else case $1 in @@ -100,10 +64,6 @@ else download_s132_nrf52_2_0_1 "${SCRIPT_DIR}" ;; "s132_nrf52_5_0_0" ) download_s132_nrf52_5_0_0 "${SCRIPT_DIR}" ;; - "s132_nrf52_6_1_0" ) - download_s132_nrf52_6_1_0 "${SCRIPT_DIR}" ;; - "s140_nrf52_6_0_0" ) - download_s140_nrf52_6_0_0 "${SCRIPT_DIR}" ;; "s140_nrf52_6_1_0" ) download_s140_nrf52_6_1_0 "${SCRIPT_DIR}" ;; esac