diff options
| author | hathach <thach@tinyusb.org> | 2018-08-22 21:51:30 +0700 |
|---|---|---|
| committer | hathach <thach@tinyusb.org> | 2018-08-22 21:51:30 +0700 |
| commit | 7961103ee65692bb27a8f17e7657da2dd26c2102 (patch) | |
| tree | 8b90c6c0e0ce5e38f3c2a94119c1f1d3b5122186 /ports | |
| parent | 6bfff29d22445429231e39676dc3086085acaa54 (diff) | |
update SD to v6.1.0
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/nrf/boards/adafruit_nrf52840_s140_v6.ld | 4 | ||||
| -rw-r--r-- | ports/nrf/boards/feather52840/mpconfigboard.mk | 2 | ||||
| -rw-r--r-- | ports/nrf/boards/pca10056/mpconfigboard.mk | 2 | ||||
| -rwxr-xr-x | ports/nrf/drivers/bluetooth/download_ble_stack.sh | 36 |
4 files changed, 40 insertions, 4 deletions
diff --git a/ports/nrf/boards/adafruit_nrf52840_s140_v6.ld b/ports/nrf/boards/adafruit_nrf52840_s140_v6.ld index fbc87801f..8a700d610 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 1edc09a60..5c4fde483 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 1edc09a60..5c4fde483 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 52bd4b22d..e894ee1c0 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 |