Skip to content

Commit 3e78459

Browse files
theotherjimmyadbridge
authored andcommitted
Move duplicated NRF52 + MCU_NRF51822 files into NRF52
1 parent d62312b commit 3e78459

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

targets/targets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2664,7 +2664,7 @@
26642664
"inherits": ["Target"],
26652665
"core": "Cortex-M4F",
26662666
"macros": ["NRF52", "TARGET_NRF52832", "BLE_STACK_SUPPORT_REQD", "SOFTDEVICE_PRESENT", "S132"],
2667-
"extra_labels": ["NORDIC", "MCU_NRF52", "MCU_NRF52832", "NRF5", "SDK11"],
2667+
"extra_labels": ["NORDIC", "MCU_NRF52", "MCU_NRF52832", "NRF5", "SDK11", "NRF52_COMMON"],
26682668
"OUTPUT_EXT": "hex",
26692669
"is_disk_virtual": true,
26702670
"supported_toolchains": ["GCC_ARM", "ARM", "IAR"],
@@ -2744,7 +2744,7 @@
27442744
"inherits": ["Target"],
27452745
"core": "Cortex-M4F",
27462746
"macros": ["TARGET_NRF52840", "BLE_STACK_SUPPORT_REQD", "SOFTDEVICE_PRESENT", "S140", "NRF_SD_BLE_API_VERSION=5", "NRF52840_XXAA", "NRF_DFU_SETTINGS_VERSION=1", "NRF_SD_BLE_API_VERSION=5"],
2747-
"extra_labels": ["NORDIC", "MCU_NRF52840", "NRF5", "SDK13"],
2747+
"extra_labels": ["NORDIC", "MCU_NRF52840", "NRF5", "SDK13", "NRF52_COMMON"],
27482748
"OUTPUT_EXT": "hex",
27492749
"is_disk_virtual": true,
27502750
"supported_toolchains": ["GCC_ARM", "ARM", "IAR"],

0 commit comments

Comments
 (0)