Skip to content

Commit 7961103

Browse files
committed
update SD to v6.1.0
1 parent 6bfff29 commit 7961103

5 files changed

Lines changed: 40 additions & 5 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
*.bin
88
*.map
99
*.hex
10-
!ports/nrf/**/bootloader/**/*.hex
1110
*.dis
1211
*.exe
1312

ports/nrf/boards/adafruit_nrf52840_s140_v6.ld

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
GNU linker script for NRF52840 w/S140 6.0.0 SoftDevice
2+
GNU linker script for NRF52840 w/S140 6.x.x SoftDevice
33
44
MEMORY MAP
55
------------------------------------------------------------------------
@@ -17,7 +17,7 @@
1717
0x00000000..0x00000FFF (4KB) Master Boot Record
1818
*/
1919

20-
/* Specify the memory areas (S140 6.0.0) */
20+
/* Specify the memory areas (S140 6.x.x) */
2121
MEMORY
2222
{
2323
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x100000

ports/nrf/boards/feather52840/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ MCU_SERIES = m4
22
MCU_VARIANT = nrf52
33
MCU_SUB_VARIANT = nrf52840
44
SD ?= s140
5-
SOFTDEV_VERSION ?= 6.0.0
5+
SOFTDEV_VERSION ?= 6.1.0
66

77
BOOT_SETTING_ADDR = 0xFF000
88

ports/nrf/boards/pca10056/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ MCU_SERIES = m4
22
MCU_VARIANT = nrf52
33
MCU_SUB_VARIANT = nrf52840
44
SD ?= s140
5-
SOFTDEV_VERSION ?= 6.0.0
5+
SOFTDEV_VERSION ?= 6.1.0
66

77
BOOT_SETTING_ADDR = 0xFF000
88

ports/nrf/drivers/bluetooth/download_ble_stack.sh

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,22 @@ function download_s132_nrf52_5_0_0
3535
cd -
3636
}
3737

38+
function download_s132_nrf52_6_1_0
39+
{
40+
echo ""
41+
echo "####################################"
42+
echo "### Downloading s132_nrf52_6.1.0 ###"
43+
echo "####################################"
44+
echo ""
45+
mkdir -p "${1}/s132_nrf52_6.1.0"
46+
cd "${1}/s132_nrf52_6.1.0"
47+
wget https://www.nordicsemi.com/eng/nordic/download_resource/67248/5/32206771/141008
48+
mv 141008 temp.zip
49+
unzip -u temp.zip
50+
rm temp.zip
51+
cd -
52+
}
53+
3854
function download_s140_nrf52_6_0_0
3955
{
4056
echo ""
@@ -53,6 +69,22 @@ function download_s140_nrf52_6_0_0
5369
cd -
5470
}
5571

72+
function download_s140_nrf52_6_1_0
73+
{
74+
echo ""
75+
echo "####################################"
76+
echo "### Downloading s140_nrf52_6.1.0 ###"
77+
echo "####################################"
78+
echo ""
79+
mkdir -p "${1}/s140_nrf52_6.1.0"
80+
cd "${1}/s140_nrf52_6.1.0"
81+
wget https://www.nordicsemi.com/eng/nordic/download_resource/60624/25/88218841/116072
82+
mv 116072 temp.zip
83+
unzip -u temp.zip
84+
rm temp.zip
85+
cd -
86+
}
87+
5688
SCRIPT_DIR="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
5789

5890
if [ $# -eq 0 ]; then
@@ -66,8 +98,12 @@ else
6698
download_s132_nrf52_2_0_1 "${SCRIPT_DIR}" ;;
6799
"s132_nrf52_5_0_0" )
68100
download_s132_nrf52_5_0_0 "${SCRIPT_DIR}" ;;
101+
"s132_nrf52_6_1_0" )
102+
download_s132_nrf52_6_1_0 "${SCRIPT_DIR}" ;;
69103
"s140_nrf52_6_0_0" )
70104
download_s140_nrf52_6_0_0 "${SCRIPT_DIR}" ;;
105+
"s140_nrf52_6_1_0" )
106+
download_s140_nrf52_6_1_0 "${SCRIPT_DIR}" ;;
71107
esac
72108
fi
73109

0 commit comments

Comments
 (0)