ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4 from pan-/nordic_sdk_integration 

Factorization of NRF51 and NRF52 targets.
pull/2234/head
Andrzej Głąbek 2016-06-15 12:49:41 +01:00 committed by GitHub
parent e5b7579bae f2c4b770fd
commit a1fb8d2113
75 changed files with 6863 additions and 6863 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hal/targets.json
View File

@ -1102,7 +1102,7 @@
"OVERRIDE_BOOTLOADER_FILENAME": "nrf51822_bootloader.hex", "OVERRIDE_BOOTLOADER_FILENAME": "nrf51822_bootloader.hex",
"macros": ["NRF51", "TARGET_NRF51822"], "macros": ["NRF51", "TARGET_NRF51822"],
"MERGE_BOOTLOADER": false, "MERGE_BOOTLOADER": false,
"extra_labels": ["NORDIC", "MCU_NRF51", "MCU_NRF51822"], "extra_labels": ["NORDIC", "MCU_NRF51", "MCU_NRF51822", "NRF5"],
"OUTPUT_EXT": "hex", "OUTPUT_EXT": "hex",
"is_disk_virtual": true, "is_disk_virtual": true,
"supported_toolchains": ["ARM", "GCC_ARM"], "supported_toolchains": ["ARM", "GCC_ARM"],
@ -1739,7 +1739,7 @@
"inherits": ["Target"], "inherits": ["Target"],
"core": "Cortex-M4F", "core": "Cortex-M4F",
"macros": ["NRF52", "TARGET_NRF52832"], "macros": ["NRF52", "TARGET_NRF52832"],
"extra_labels": ["NORDIC", "MCU_NRF52", "MCU_NRF52832"], "extra_labels": ["NORDIC", "MCU_NRF52", "MCU_NRF52832", "NRF5"],
"OUTPUT_EXT": "hex", "OUTPUT_EXT": "hex",
"is_disk_virtual": true, "is_disk_virtual": true,
"supported_toolchains": ["ARM", "GCC_ARM"], "supported_toolchains": ["ARM", "GCC_ARM"],

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/nordic_sdk/components/libraries/crc16/crc16.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/Lib/nordic_sdk/components/libraries/crc16/crc16.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/nordic_sdk/components/libraries/scheduler/app_scheduler.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/Lib/nordic_sdk/components/libraries/scheduler/app_scheduler.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/nordic_sdk/components/libraries/util/app_error.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/Lib/nordic_sdk/components/libraries/util/app_error.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/nordic_sdk/components/libraries/util/app_util.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/Lib/nordic_sdk/components/libraries/util/app_util.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/s110_nrf51822_8_0_0/s110_nrf51822_8.0.0_licence_agreement.txt → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/Lib/s110_nrf51822_8_0_0/s110_nrf51822_8.0.0_licence_agreement.txt
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/s110_nrf51822_8_0_0/s110_nrf51822_8.0.0_softdevice.hex → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/Lib/s110_nrf51822_8_0_0/s110_nrf51822_8.0.0_softdevice.hex
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/s130_nrf51822_1_0_0/s130_nrf51_1.0.0_licence_agreement.txt → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/Lib/s130_nrf51822_1_0_0/s130_nrf51_1.0.0_licence_agreement.txt
View File

13722
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/s130_nrf51822_1_0_0/s130_nrf51_1.0.0_softdevice.hex → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/Lib/s130_nrf51822_1_0_0/s130_nrf51_1.0.0_softdevice.hex
View File

File diff suppressed because it is too large Load Diff

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/PeripheralNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/PeripheralNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/PortNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/PortNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_ARCH_BLE/PinNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_ARCH_BLE/PinNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_ARCH_BLE/device.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_ARCH_BLE/device.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/PinNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/PinNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/device.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/device.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/mbed_overrides.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/mbed_overrides.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/rtc_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/rtc_api.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_HRM1017/PinNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_HRM1017/PinNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_HRM1017/device.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_HRM1017/device.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51822_MKIT/PinNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_NRF51822_MKIT/PinNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51822_MKIT/device.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_NRF51822_MKIT/device.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51822_SBKIT/PinNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_NRF51822_SBKIT/PinNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51822_SBKIT/device.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_NRF51822_SBKIT/device.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51822_Y5_MBUG/PinNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_NRF51822_Y5_MBUG/PinNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51822_Y5_MBUG/device.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_NRF51822_Y5_MBUG/device.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_DK/PinNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_NRF51_DK/PinNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_DK/device.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_NRF51_DK/device.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_DONGLE/PinNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_NRF51_DONGLE/PinNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_DONGLE/device.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_NRF51_DONGLE/device.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_MICROBIT/PinNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_NRF51_MICROBIT/PinNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_MICROBIT/device.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_NRF51_MICROBIT/device.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_RBLAB_BLENANO/PinNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_RBLAB_BLENANO/PinNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_RBLAB_BLENANO/device.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_RBLAB_BLENANO/device.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_RBLAB_NRF51822/PinNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_RBLAB_NRF51822/PinNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_RBLAB_NRF51822/device.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_RBLAB_NRF51822/device.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_SEEED_TINY_BLE/PinNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_SEEED_TINY_BLE/PinNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_SEEED_TINY_BLE/device.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_SEEED_TINY_BLE/device.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_TY51822R3/PinNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_TY51822R3/PinNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_TY51822R3/device.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_TY51822R3/device.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_WALLBOT_BLE/PinNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_WALLBOT_BLE/PinNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_WALLBOT_BLE/device.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/TARGET_WALLBOT_BLE/device.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/analogin_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/analogin_api.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/gpio_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/gpio_api.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/gpio_irq_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/gpio_irq_api.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/gpio_object.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/gpio_object.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/i2c_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/i2c_api.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/objects.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/objects.h Executable file → Normal file
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/pinmap.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/pinmap.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/port_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/port_api.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/pwmout_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/pwmout_api.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/serial_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/serial_api.c Executable file → Normal file
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/sleep.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/sleep.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/spi_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/spi_api.c Executable file → Normal file
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/twi_config.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/twi_config.h Executable file → Normal file
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/twi_master.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/twi_master.c Executable file → Normal file
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/twi_master.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/twi_master.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/us_ticker.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/us_ticker.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/Lib/s132_nrf52_2_0_0/s132_nrf52_2.0.0_softdevice.hex → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/Lib/s132_nrf52_2_0_0/s132_nrf52_2.0.0_softdevice.hex
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/PeripheralNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/PeripheralNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/PortNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/PortNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/TARGET_NRF52_DK/PinNames.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_NRF52_DK/PinNames.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/TARGET_NRF52_DK/device.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_NRF52_DK/device.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/analogin_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/analogin_api.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/gpio_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/gpio_api.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/gpio_irq_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/gpio_irq_api.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/gpio_object.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/gpio_object.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/i2c_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/i2c_api.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/objects.h → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/objects.h
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/pinmap.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/pinmap.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/port_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/port_api.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/pwmout_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/pwmout_api.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/serial_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/serial_api.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/sleep.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sleep.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/spi_api.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/spi_api.c
View File

0
hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF52832/us_ticker.c → hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/us_ticker.c
View File