djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update SD to v6.1.0

This commit is contained in:
hathach 2018-08-22 21:51:30 +07:00
parent 6bfff29d22
commit 7961103ee6
5 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,7 +7,6 @@
*.bin *.bin
*.map *.map
*.hex *.hex
!ports/nrf/**/bootloader/**/*.hex
*.dis *.dis
*.exe *.exe

4
ports/nrf/boards/adafruit_nrf52840_s140_v6.ld
View File

@ -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 MEMORY MAP
------------------------------------------------------------------------ ------------------------------------------------------------------------
@ -17,7 +17,7 @@
0x00000000..0x00000FFF (4KB) Master Boot Record 0x00000000..0x00000FFF (4KB) Master Boot Record
*/ */
/* Specify the memory areas (S140 6.0.0) */ /* Specify the memory areas (S140 6.x.x) */
MEMORY MEMORY
{ {
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x100000 FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x100000

2
ports/nrf/boards/feather52840/mpconfigboard.mk
View File

@ -2,7 +2,7 @@ MCU_SERIES = m4
MCU_VARIANT = nrf52 MCU_VARIANT = nrf52
MCU_SUB_VARIANT = nrf52840 MCU_SUB_VARIANT = nrf52840
SD ?= s140 SD ?= s140
SOFTDEV_VERSION ?= 6.0.0 SOFTDEV_VERSION ?= 6.1.0
BOOT_SETTING_ADDR = 0xFF000 BOOT_SETTING_ADDR = 0xFF000

2
ports/nrf/boards/pca10056/mpconfigboard.mk
View File

@ -2,7 +2,7 @@ MCU_SERIES = m4
MCU_VARIANT = nrf52 MCU_VARIANT = nrf52
MCU_SUB_VARIANT = nrf52840 MCU_SUB_VARIANT = nrf52840
SD ?= s140 SD ?= s140
SOFTDEV_VERSION ?= 6.0.0 SOFTDEV_VERSION ?= 6.1.0
BOOT_SETTING_ADDR = 0xFF000 BOOT_SETTING_ADDR = 0xFF000

36
ports/nrf/drivers/bluetooth/download_ble_stack.sh
View File

@ -35,6 +35,22 @@ function download_s132_nrf52_5_0_0
cd - 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 function download_s140_nrf52_6_0_0
{ {
echo "" echo ""
@ -53,6 +69,22 @@ function download_s140_nrf52_6_0_0
cd - 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)" SCRIPT_DIR="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
@ -66,8 +98,12 @@ else
download_s132_nrf52_2_0_1 "${SCRIPT_DIR}" ;; download_s132_nrf52_2_0_1 "${SCRIPT_DIR}" ;;
"s132_nrf52_5_0_0" ) "s132_nrf52_5_0_0" )
download_s132_nrf52_5_0_0 "${SCRIPT_DIR}" ;; 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" ) "s140_nrf52_6_0_0" )
download_s140_nrf52_6_0_0 "${SCRIPT_DIR}" ;; download_s140_nrf52_6_0_0 "${SCRIPT_DIR}" ;;
"s140_nrf52_6_1_0" )
download_s140_nrf52_6_1_0 "${SCRIPT_DIR}" ;;
esac esac
fi fi