Skip to content

Commit 3b811ae

Browse files
committed
Merge pull request #1084 from rgrover/s130
S130 v1.0 from Nordic. This brings in a lot of BLE4.1 functionality
2 parents e1bf6d1 + b8c6aba commit 3b811ae

File tree

7 files changed

+6875
-5659
lines changed

7 files changed

+6875
-5659
lines changed

libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_16K/nRF51822.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
;
1313
;WITH SOFTDEVICE:
1414

15-
LR_IROM1 0x18000 0x0028000 {
16-
ER_IROM1 0x18000 0x0028000 {
15+
LR_IROM1 0x1C000 0x0024000 {
16+
ER_IROM1 0x1C000 0x0024000 {
1717
*.o (RESET, +First)
1818
*(InRoot$$Sections)
1919
.ANY (+RO)
2020
}
21-
RW_IRAM1 0x20002000 0x00002000 {
21+
RW_IRAM1 0x20002800 0x00001800 {
2222
.ANY (+RW +ZI)
2323
}
2424
}

libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_32K/nRF51822.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
;
1313
;WITH SOFTDEVICE:
1414

15-
LR_IROM1 0x18000 0x0028000 {
16-
ER_IROM1 0x18000 0x0028000 {
15+
LR_IROM1 0x1C000 0x0024000 {
16+
ER_IROM1 0x1C000 0x0024000 {
1717
*.o (RESET, +First)
1818
*(InRoot$$Sections)
1919
.ANY (+RO)
2020
}
21-
RW_IRAM1 0x20002000 0x00006000 {
21+
RW_IRAM1 0x20002800 0x00005800 {
2222
.ANY (+RW +ZI)
2323
}
2424
}

libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/TOOLCHAIN_GCC_ARM/TARGET_MCU_NORDIC_16K/NRF51822.ld

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
MEMORY
44
{
5-
FLASH (rx) : ORIGIN = 0x00018000, LENGTH = 0x28000
6-
RAM (rwx) : ORIGIN = 0x20002000, LENGTH = 0x2000
5+
FLASH (rx) : ORIGIN = 0x0001C000, LENGTH = 0x24000
6+
RAM (rwx) : ORIGIN = 0x20002800, LENGTH = 0x1800
77
}
88

99
OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")

libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/TOOLCHAIN_GCC_ARM/TARGET_MCU_NORDIC_32K/NRF51822.ld

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
MEMORY
44
{
5-
FLASH (rx) : ORIGIN = 0x00018000, LENGTH = 0x28000
6-
RAM (rwx) : ORIGIN = 0x20002000, LENGTH = 0x6000
5+
FLASH (rx) : ORIGIN = 0x0001C000, LENGTH = 0x24000
6+
RAM (rwx) : ORIGIN = 0x20002800, LENGTH = 0x5800
77
}
88

99
OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")

0 commit comments

Comments
 (0)