Skip to content

Commit 0d9dc1e

Browse files
pan-pan-
authored
Merge pull request #16 from ARMmbed/nordic_sdk_integration
Nordic sdk integration
2 parents e5b7579 + 6a31d1a commit 0d9dc1e

File tree

361 files changed

+84976
-20071
lines changed

Some content is hidden

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

361 files changed

+84976
-20071
lines changed

‎hal/targets.json

Lines changed: 41 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,47 +1100,34 @@
11001100
"inherits": ["Target"],
11011101
"core": "Cortex-M0",
11021102
"OVERRIDE_BOOTLOADER_FILENAME": "nrf51822_bootloader.hex",
1103-
"macros": ["NRF51", "TARGET_NRF51822"],
1103+
"macros": [
1104+
"NRF51",
1105+
"TARGET_NRF51822",
1106+
"BLE_STACK_SUPPORT_REQD",
1107+
"SOFTDEVICE_PRESENT",
1108+
"S130"
1109+
],
11041110
"MERGE_BOOTLOADER": false,
1105-
"extra_labels": ["NORDIC", "MCU_NRF51", "MCU_NRF51822"],
1111+
"extra_labels": ["NORDIC", "MCU_NRF51", "MCU_NRF51822", "NRF5"],
11061112
"OUTPUT_EXT": "hex",
11071113
"is_disk_virtual": true,
11081114
"supported_toolchains": ["ARM", "GCC_ARM"],
11091115
"public": false,
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"],
@@ -1388,7 +1375,7 @@
13881375
"supported_form_factors": ["ARDUINO"],
13891376
"inherits": ["MCU_NRF51_32K"],
13901377
"progen": {"target": "nrf51-dk"},
1391-
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"]
1378+
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"]
13921379
},
13931380
"NRF51_DK_BOOT": {
13941381
"supported_form_factors": ["ARDUINO"],
@@ -1738,11 +1725,11 @@
17381725
"MCU_NRF52": {
17391726
"inherits": ["Target"],
17401727
"core": "Cortex-M4F",
1741-
"macros": ["NRF52", "TARGET_NRF52832"],
1742-
"extra_labels": ["NORDIC", "MCU_NRF52", "MCU_NRF52832"],
1728+
"macros": ["NRF52", "TARGET_NRF52832", "BLE_STACK_SUPPORT_REQD", "SOFTDEVICE_PRESENT", "S132"],
1729+
"extra_labels": ["NORDIC", "MCU_NRF52", "MCU_NRF52832", "NRF5"],
17431730
"OUTPUT_EXT": "hex",
17441731
"is_disk_virtual": true,
1745-
"supported_toolchains": ["ARM", "GCC_ARM"],
1732+
"supported_toolchains": ["GCC_ARM"],
17461733
"public": false,
17471734
"detect_code": ["1101"],
17481735
"program_cycle_s": 6,
@@ -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"},
1767-
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"]
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+
],
1776+
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"]
17681777
}
17691778
}

‎hal/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/compiler_abstraction.h

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

‎hal/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf.h

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

‎hal/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/nrf_delay.h

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

0 commit comments

Comments
 (0)