Skip to content

Commit f880312

Browse files
ananglanangl
committed
Merge branch 'nordic_sdk_integration' of https://github.com/ARMmbed/mbed-nordic into nordic_sdk_integration
# Conflicts: # hal/targets.json # hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/system_nrf51.c # hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/system_nrf52.c
2 parents 601b96d + 089143e commit f880312

File tree

131 files changed

+736
-37999
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+736
-37999
lines changed

‎hal/targets.json

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,7 +1100,13 @@
11001100
"inherits": ["Target"],
11011101
"core": "Cortex-M0",
11021102
"OVERRIDE_BOOTLOADER_FILENAME": "nrf51822_bootloader.hex",
1103-
"macros": ["NRF51", "TARGET_NRF51822", "SOFTDEVICE_PRESENT"],
1103+
"macros": [
1104+
"NRF51",
1105+
"TARGET_NRF51822",
1106+
"BLE_STACK_SUPPORT_REQD",
1107+
"SOFTDEVICE_PRESENT",
1108+
"S130"
1109+
],
11041110
"MERGE_BOOTLOADER": false,
11051111
"extra_labels": ["NORDIC", "MCU_NRF51", "MCU_NRF51822", "NRF5"],
11061112
"OUTPUT_EXT": "hex",
@@ -1110,37 +1116,18 @@
11101116
"MERGE_SOFT_DEVICE": true,
11111117
"EXPECTED_SOFTDEVICES_WITH_OFFSETS": [
11121118
{
1113-
"boot": "s130_nrf51_1.0.0_bootloader.hex",
1114-
"name": "s130_nrf51_1.0.0_softdevice.hex",
1115-
"offset": 114688
1116-
},
1117-
{
1118-
"boot": "s110_nrf51822_8.0.0_bootloader.hex",
1119-
"name": "s110_nrf51822_8.0.0_softdevice.hex",
1120-
"offset": 98304
1121-
},
1122-
{
1123-
"boot": "s110_nrf51822_7.1.0_bootloader.hex",
1124-
"name": "s110_nrf51822_7.1.0_softdevice.hex",
1125-
"offset": 90112
1126-
},
1127-
{
1128-
"boot": "s110_nrf51822_7.0.0_bootloader.hex",
1129-
"name": "s110_nrf51822_7.0.0_softdevice.hex",
1130-
"offset": 90112
1131-
},
1132-
{
1133-
"boot": "s110_nrf51822_6.0.0_bootloader.hex",
1134-
"name": "s110_nrf51822_6.0.0_softdevice.hex",
1135-
"offset": 81920
1119+
"boot": "",
1120+
"name": "s130_nrf51_2.0.0_softdevice.hex",
1121+
"offset": 110592
11361122
}
11371123
],
11381124
"detect_code": ["1070"],
11391125
"post_binary_hook": {
11401126
"function": "MCU_NRF51Code.binary_hook",
11411127
"toolchains": ["ARM_STD", "GCC_ARM"]
11421128
},
1143-
"program_cycle_s": 6
1129+
"program_cycle_s": 6,
1130+
"features": ["BLE"]
11441131
},
11451132
"MCU_NRF51_16K_BASE": {
11461133
"inherits": ["MCU_NRF51"],
@@ -1738,7 +1725,7 @@
17381725
"MCU_NRF52": {
17391726
"inherits": ["Target"],
17401727
"core": "Cortex-M4F",
1741-
"macros": ["NRF52", "TARGET_NRF52832", "SOFTDEVICE_PRESENT"],
1728+
"macros": ["NRF52", "TARGET_NRF52832", "BLE_STACK_SUPPORT_REQD", "SOFTDEVICE_PRESENT", "S132"],
17421729
"extra_labels": ["NORDIC", "MCU_NRF52", "MCU_NRF52832", "NRF5"],
17431730
"OUTPUT_EXT": "hex",
17441731
"is_disk_virtual": true,
@@ -1758,12 +1745,34 @@
17581745
"function": "MCU_NRF51Code.binary_hook",
17591746
"toolchains": ["ARM_STD", "GCC_ARM"]
17601747
},
1761-
"MERGE_BOOTLOADER": false
1748+
"MERGE_BOOTLOADER": false,
1749+
"features": ["BLE"]
17621750
},
17631751
"NRF52_DK": {
17641752
"supported_form_factors": ["ARDUINO"],
17651753
"inherits": ["MCU_NRF52"],
17661754
"progen": {"target": "nrf52-dk"},
1755+
"macros_add": [
1756+
"BOARD_PCA10040",
1757+
"NRF52_PAN_12",
1758+
"NRF52_PAN_15",
1759+
"NRF52_PAN_58",
1760+
"NRF52_PAN_55",
1761+
"NRF52_PAN_54",
1762+
"NRF52_PAN_31",
1763+
"NRF52_PAN_30",
1764+
"NRF52_PAN_51",
1765+
"NRF52_PAN_36",
1766+
"NRF52_PAN_53",
1767+
"S132",
1768+
"CONFIG_GPIO_AS_PINRESET",
1769+
"BLE_STACK_SUPPORT_REQD",
1770+
"SWI_DISABLE0",
1771+
"NRF52_PAN_20",
1772+
"NRF52_PAN_64",
1773+
"NRF52_PAN_62",
1774+
"NRF52_PAN_63"
1775+
],
17671776
"device_has": ["ERROR_PATTERN", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPI_ASYNCH"]
17681777
}
17691778
}

‎hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TOOLCHAIN_GCC_ARM/TARGET_MCU_NORDIC_32K/NRF51822.ld

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

33
MEMORY
44
{
5-
FLASH (rx) : ORIGIN = 0x0001C000, LENGTH = 0x24000
6-
RAM (rwx) : ORIGIN = 0x20002800, LENGTH = 0x5800
5+
FLASH (rx) : ORIGIN = 0x0001B000, LENGTH = 0x25000
6+
RAM (rwx) : ORIGIN = 0x20002ef8, LENGTH = 0x5108
77
}
88

99
OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
@@ -114,6 +114,15 @@ SECTIONS
114114

115115
} > RAM
116116

117+
__edata = .;
118+
119+
.fs_data :
120+
{
121+
PROVIDE(__start_fs_data = .);
122+
KEEP(*(.fs_data))
123+
PROVIDE(__stop_fs_data = .);
124+
} > RAM
125+
117126
.bss :
118127
{
119128
. = ALIGN(4);

‎hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TOOLCHAIN_GCC_ARM/startup_NRF51822.S

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,9 @@ __Vectors:
117117

118118
/* Reset Handler */
119119

120-
.equ NRF_POWER_RAMON_ADDRESS, 0x40000524
121-
.equ NRF_POWER_RAMON_RAMxON_ONMODE_Msk, 0x3
120+
.equ NRF_POWER_RAMON_ADDRESS, 0x40000524
121+
.equ NRF_POWER_RAMONB_ADDRESS, 0x40000554
122+
.equ NRF_POWER_RAMONx_RAMxON_ONMODE_Msk, 0x3
122123

123124
.text
124125
.thumb
@@ -129,10 +130,14 @@ __Vectors:
129130
Reset_Handler:
130131
.fnstart
131132

132-
/* Make sure ALL RAM banks are powered on */
133+
MOVS R1, #NRF_POWER_RAMONx_RAMxON_ONMODE_Msk
133134
LDR R0, =NRF_POWER_RAMON_ADDRESS
134135
LDR R2, [R0]
135-
MOVS R1, #NRF_POWER_RAMON_RAMxON_ONMODE_Msk
136+
ORRS R2, R1
137+
STR R2, [R0]
138+
139+
LDR R0, =NRF_POWER_RAMONB_ADDRESS
140+
LDR R2, [R0]
136141
ORRS R2, R1
137142
STR R2, [R0]
138143

‎hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TOOLCHAIN_GCC_ARM/NRF52832.ld

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ SECTIONS
8383
KEEP(*(.eh_frame*))
8484
} > FLASH
8585

86-
8786
.ARM.extab :
8887
{
8988
*(.ARM.extab* .gnu.linkonce.armextab.*)

‎hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/Lib/s110_nrf51822_8_0_0/s110_nrf51822_8.0.0_licence_agreement.txt

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)