Skip to content

Commit a1fb8d2

Browse files
ananglanangl
authored
Merge pull request #4 from pan-/nordic_sdk_integration
Factorization of NRF51 and NRF52 targets.
2 parents e5b7579 + f2c4b77 commit a1fb8d2

Some content is hidden

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

75 files changed

+6863
-6863
lines changed

‎hal/targets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,7 @@
11021102
"OVERRIDE_BOOTLOADER_FILENAME": "nrf51822_bootloader.hex",
11031103
"macros": ["NRF51", "TARGET_NRF51822"],
11041104
"MERGE_BOOTLOADER": false,
1105-
"extra_labels": ["NORDIC", "MCU_NRF51", "MCU_NRF51822"],
1105+
"extra_labels": ["NORDIC", "MCU_NRF51", "MCU_NRF51822", "NRF5"],
11061106
"OUTPUT_EXT": "hex",
11071107
"is_disk_virtual": true,
11081108
"supported_toolchains": ["ARM", "GCC_ARM"],
@@ -1739,7 +1739,7 @@
17391739
"inherits": ["Target"],
17401740
"core": "Cortex-M4F",
17411741
"macros": ["NRF52", "TARGET_NRF52832"],
1742-
"extra_labels": ["NORDIC", "MCU_NRF52", "MCU_NRF52832"],
1742+
"extra_labels": ["NORDIC", "MCU_NRF52", "MCU_NRF52832", "NRF5"],
17431743
"OUTPUT_EXT": "hex",
17441744
"is_disk_virtual": true,
17451745
"supported_toolchains": ["ARM", "GCC_ARM"],

‎hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/nordic_sdk/components/libraries/crc16/crc16.h renamed to ‎hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/Lib/nordic_sdk/components/libraries/crc16/crc16.h

File renamed without changes.

‎hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/nordic_sdk/components/libraries/scheduler/app_scheduler.h renamed to ‎hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/Lib/nordic_sdk/components/libraries/scheduler/app_scheduler.h

File renamed without changes.

‎hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/nordic_sdk/components/libraries/util/app_error.h renamed to ‎hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/Lib/nordic_sdk/components/libraries/util/app_error.h

File renamed without changes.

‎hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/nordic_sdk/components/libraries/util/app_util.h renamed to ‎hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/Lib/nordic_sdk/components/libraries/util/app_util.h

File renamed without changes.

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

File renamed without changes.

‎hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/s110_nrf51822_8_0_0/s110_nrf51822_8.0.0_softdevice.hex renamed to ‎hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/Lib/s110_nrf51822_8_0_0/s110_nrf51822_8.0.0_softdevice.hex

File renamed without changes.

‎hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/s130_nrf51822_1_0_0/s130_nrf51_1.0.0_licence_agreement.txt renamed to ‎hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/Lib/s130_nrf51822_1_0_0/s130_nrf51_1.0.0_licence_agreement.txt

File renamed without changes.

‎hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/s130_nrf51822_1_0_0/s130_nrf51_1.0.0_softdevice.hex renamed to ‎hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/Lib/s130_nrf51822_1_0_0/s130_nrf51_1.0.0_softdevice.hex

Lines changed: 6861 additions & 6861 deletions
Large diffs are not rendered by default.

‎hal/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/PeripheralNames.h renamed to ‎hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/PeripheralNames.h

File renamed without changes.

0 commit comments

Comments
 (0)