From f49150cab686ae327043d5a8e3e904284aa4f341 Mon Sep 17 00:00:00 2001 From: Carles Cufi Date: Mon, 19 Mar 2018 13:51:25 +0100 Subject: [PATCH] arch: arm: nrf: Rename nrf5 SoC Family to nrf Upcoming Nordic ICs that share many of the peripherals and architecture with the currently supported nRF5x ones are no longer part of the nRF5 family. In order to accomodate that, rename the SoC family from nrf5 to nrf, so that it can contain all of the members of the wider Nordic family. Signed-off-by: Carles Cufi --- arch/arm/core/cortex_m/mpu/Kconfig | 2 +- .../CMakeLists.txt | 0 arch/arm/soc/nordic_nrf/Kconfig | 19 ++++++++++ arch/arm/soc/nordic_nrf/Kconfig.defconfig | 36 +++++++++++++++++++ arch/arm/soc/nordic_nrf/Kconfig.soc | 9 +++++ .../include/nrf5_common.h | 0 .../nrf51/CMakeLists.txt | 0 .../nrf51/Kconfig.defconfig.nrf51822_QFAA | 0 .../nrf51/Kconfig.defconfig.nrf51822_QFAB | 0 .../nrf51/Kconfig.defconfig.nrf51822_QFAC | 0 .../nrf51/Kconfig.defconfig.series | 5 +-- .../nrf51/Kconfig.series | 5 +-- .../nrf51/Kconfig.soc | 0 .../nrf51/dts.fixup | 0 .../nrf51/linker.ld | 0 .../{nordic_nrf5 => nordic_nrf}/nrf51/soc.c | 0 .../{nordic_nrf5 => nordic_nrf}/nrf51/soc.h | 0 .../nrf52/CMakeLists.txt | 0 .../nrf52/Kconfig.defconfig.nrf52832_QFAA | 0 .../nrf52/Kconfig.defconfig.nrf52840_QIAA | 0 .../nrf52/Kconfig.defconfig.series | 6 ++-- .../nrf52/Kconfig.series | 6 ++-- .../nrf52/Kconfig.soc | 0 .../nrf52/dts.fixup | 0 .../nrf52/linker.ld | 0 .../nrf52/mpu_mem_cfg.h | 0 .../nrf52/mpu_regions.c | 0 .../{nordic_nrf5 => nordic_nrf}/nrf52/power.c | 0 .../{nordic_nrf5 => nordic_nrf}/nrf52/soc.c | 0 .../{nordic_nrf5 => nordic_nrf}/nrf52/soc.h | 0 .../nrf52/soc_power.h | 0 arch/arm/soc/nordic_nrf5/Kconfig | 19 ---------- arch/arm/soc/nordic_nrf5/Kconfig.defconfig | 36 ------------------- arch/arm/soc/nordic_nrf5/Kconfig.soc | 9 ----- .../96b_carbon_nrf51_defconfig | 2 +- .../arm/96b_nitrogen/96b_nitrogen_defconfig | 2 +- .../arduino_101_ble/arduino_101_ble_defconfig | 2 +- .../arm/bbc_microbit/bbc_microbit_defconfig | 2 +- boards/arm/curie_ble/curie_ble_defconfig | 2 +- .../arm/nrf51_ble400/nrf51_ble400_defconfig | 2 +- .../arm/nrf51_blenano/nrf51_blenano_defconfig | 2 +- .../nrf51_pca10028/nrf51_pca10028_defconfig | 2 +- .../nrf51_vbluno51/nrf51_vbluno51_defconfig | 2 +- .../nrf52840_pca10056_defconfig | 2 +- .../nrf52_blenano2/nrf52_blenano2_defconfig | 2 +- .../nrf52_pca10040/nrf52_pca10040_defconfig | 2 +- .../nrf52_sparkfun/nrf52_sparkfun_defconfig | 2 +- .../nrf52_vbluno52/nrf52_vbluno52_defconfig | 2 +- .../quark_se_c1000_ble_defconfig | 2 +- drivers/clock_control/Kconfig.nrf5 | 2 +- drivers/flash/Kconfig | 2 +- drivers/gpio/Kconfig.nrf5 | 2 +- drivers/i2c/Kconfig.nrf5 | 2 +- drivers/led_strip/Kconfig.ws2812b_sw | 2 +- drivers/pwm/Kconfig.nrf5_sw | 2 +- drivers/sensor/nrf5/Kconfig | 2 +- drivers/serial/Kconfig.nrf5 | 2 +- drivers/spi/Kconfig.nrf5_legacy | 2 +- drivers/timer/Kconfig | 2 +- samples/basic/fade_led/src/main.c | 2 +- subsys/bluetooth/controller/CMakeLists.txt | 2 +- subsys/bluetooth/controller/Kconfig | 8 ++--- subsys/bluetooth/controller/hci/hci.c | 8 ++--- .../bluetooth/controller/hci/hci_internal.h | 4 +-- subsys/bluetooth/controller/ll_sw/ctrl.c | 4 +-- subsys/bluetooth/controller/ll_sw/ll.c | 4 +-- subsys/bluetooth/controller/ticker/ticker.c | 4 +-- subsys/bluetooth/shell/ticker.c | 4 +-- .../benchmarks/timing_info/src/timing_info.h | 4 +-- 69 files changed, 124 insertions(+), 122 deletions(-) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/CMakeLists.txt (100%) create mode 100644 arch/arm/soc/nordic_nrf/Kconfig create mode 100644 arch/arm/soc/nordic_nrf/Kconfig.defconfig create mode 100644 arch/arm/soc/nordic_nrf/Kconfig.soc rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/include/nrf5_common.h (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf51/CMakeLists.txt (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf51/Kconfig.defconfig.nrf51822_QFAA (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf51/Kconfig.defconfig.nrf51822_QFAB (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf51/Kconfig.defconfig.nrf51822_QFAC (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf51/Kconfig.defconfig.series (66%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf51/Kconfig.series (75%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf51/Kconfig.soc (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf51/dts.fixup (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf51/linker.ld (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf51/soc.c (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf51/soc.h (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf52/CMakeLists.txt (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf52/Kconfig.defconfig.nrf52832_QFAA (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf52/Kconfig.defconfig.nrf52840_QIAA (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf52/Kconfig.defconfig.series (56%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf52/Kconfig.series (77%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf52/Kconfig.soc (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf52/dts.fixup (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf52/linker.ld (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf52/mpu_mem_cfg.h (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf52/mpu_regions.c (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf52/power.c (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf52/soc.c (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf52/soc.h (100%) rename arch/arm/soc/{nordic_nrf5 => nordic_nrf}/nrf52/soc_power.h (100%) delete mode 100644 arch/arm/soc/nordic_nrf5/Kconfig delete mode 100644 arch/arm/soc/nordic_nrf5/Kconfig.defconfig delete mode 100644 arch/arm/soc/nordic_nrf5/Kconfig.soc diff --git a/arch/arm/core/cortex_m/mpu/Kconfig b/arch/arm/core/cortex_m/mpu/Kconfig index ddc98a4eb81..3938f03c8a0 100644 --- a/arch/arm/core/cortex_m/mpu/Kconfig +++ b/arch/arm/core/cortex_m/mpu/Kconfig @@ -24,7 +24,7 @@ config MPU_STACK_GUARD config ARM_MPU bool "ARM MPU Support" depends on CPU_HAS_MPU - depends on SOC_FAMILY_ARM || SOC_FAMILY_STM32 || SOC_FAMILY_NRF5 || SOC_FAMILY_IMX + depends on SOC_FAMILY_ARM || SOC_FAMILY_STM32 || SOC_FAMILY_NRF || SOC_FAMILY_IMX select ARM_CORE_MPU select ARCH_HAS_EXECUTABLE_PAGE_BIT select MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT diff --git a/arch/arm/soc/nordic_nrf5/CMakeLists.txt b/arch/arm/soc/nordic_nrf/CMakeLists.txt similarity index 100% rename from arch/arm/soc/nordic_nrf5/CMakeLists.txt rename to arch/arm/soc/nordic_nrf/CMakeLists.txt diff --git a/arch/arm/soc/nordic_nrf/Kconfig b/arch/arm/soc/nordic_nrf/Kconfig new file mode 100644 index 00000000000..b7df03fcbfe --- /dev/null +++ b/arch/arm/soc/nordic_nrf/Kconfig @@ -0,0 +1,19 @@ +# Kconfig - Nordic Semiconductor nRFx MCU line +# +# Copyright (c) 2018 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: Apache-2.0 +# + +config SOC_FAMILY_NRF + bool + # omit prompt to signify a "hidden" option + default n + +if SOC_FAMILY_NRF +config SOC_FAMILY + string + default nordic_nrf +endif + +source "arch/arm/soc/nordic_nrf/*/Kconfig.soc" diff --git a/arch/arm/soc/nordic_nrf/Kconfig.defconfig b/arch/arm/soc/nordic_nrf/Kconfig.defconfig new file mode 100644 index 00000000000..483a3fc4b58 --- /dev/null +++ b/arch/arm/soc/nordic_nrf/Kconfig.defconfig @@ -0,0 +1,36 @@ +# Kconfig.defconfig - Nordic Semiconductor nRFx MCU line +# +# Copyright (c) 2018 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: Apache-2.0 +# + +if SOC_FAMILY_NRF + +config BUILD_OUTPUT_HEX + default y + +if SERIAL + +config GPIO + default y + +endif # SERIAL + +if GPIO + +config GPIO_NRF5 + default y + +endif # GPIO + +if FLASH + +config SOC_FLASH_NRF + def_bool y + +endif # FLASH + +source "arch/arm/soc/nordic_nrf/*/Kconfig.defconfig.series" + +endif # SOC_FAMILY_NRF diff --git a/arch/arm/soc/nordic_nrf/Kconfig.soc b/arch/arm/soc/nordic_nrf/Kconfig.soc new file mode 100644 index 00000000000..644bbac8a50 --- /dev/null +++ b/arch/arm/soc/nordic_nrf/Kconfig.soc @@ -0,0 +1,9 @@ +# Kconfig.soc - Nordic Semiconductor nRFx MCU line +# +# Copyright (c) 2018 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: Apache-2.0 +# + +source "arch/arm/soc/nordic_nrf/*/Kconfig.series" + diff --git a/arch/arm/soc/nordic_nrf5/include/nrf5_common.h b/arch/arm/soc/nordic_nrf/include/nrf5_common.h similarity index 100% rename from arch/arm/soc/nordic_nrf5/include/nrf5_common.h rename to arch/arm/soc/nordic_nrf/include/nrf5_common.h diff --git a/arch/arm/soc/nordic_nrf5/nrf51/CMakeLists.txt b/arch/arm/soc/nordic_nrf/nrf51/CMakeLists.txt similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf51/CMakeLists.txt rename to arch/arm/soc/nordic_nrf/nrf51/CMakeLists.txt diff --git a/arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.nrf51822_QFAA b/arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAA similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.nrf51822_QFAA rename to arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAA diff --git a/arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.nrf51822_QFAB b/arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAB similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.nrf51822_QFAB rename to arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAB diff --git a/arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.nrf51822_QFAC b/arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAC similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.nrf51822_QFAC rename to arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAC diff --git a/arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.series b/arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.series similarity index 66% rename from arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.series rename to arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.series index 632bc9d7f6f..afb76537b74 100644 --- a/arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.series +++ b/arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.series @@ -1,13 +1,14 @@ -# Kconfig.defconfig.series - Nordic Semiconductor nRF5 MCU line +# Kconfig.defconfig.series - Nordic Semiconductor nRF51 MCU line # # Copyright (c) 2016 Linaro Limited +# Copyright (c) 2018 Nordic Semiconductor ASA # # SPDX-License-Identifier: Apache-2.0 # if SOC_SERIES_NRF51X -source "arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.nrf51*" +source "arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.nrf51*" config SOC_SERIES default nrf51 diff --git a/arch/arm/soc/nordic_nrf5/nrf51/Kconfig.series b/arch/arm/soc/nordic_nrf/nrf51/Kconfig.series similarity index 75% rename from arch/arm/soc/nordic_nrf5/nrf51/Kconfig.series rename to arch/arm/soc/nordic_nrf/nrf51/Kconfig.series index 3af55db14b2..d5cfa162478 100644 --- a/arch/arm/soc/nordic_nrf5/nrf51/Kconfig.series +++ b/arch/arm/soc/nordic_nrf/nrf51/Kconfig.series @@ -1,6 +1,7 @@ -# Kconfig.series - Nordic Semiconductor nRF5 MCU line +# Kconfig.series - Nordic Semiconductor nRF51 MCU line # # Copyright (c) 2016 Linaro Limited +# Copyright (c) 2018 Nordic Semiconductor ASA # # SPDX-License-Identifier: Apache-2.0 # @@ -8,7 +9,7 @@ config SOC_SERIES_NRF51X bool "Nordic Semiconductor nRF51 series MCU" select CPU_CORTEX_M0 - select SOC_FAMILY_NRF5 + select SOC_FAMILY_NRF select NRF_RTC_TIMER select CLOCK_CONTROL select CLOCK_CONTROL_NRF5 diff --git a/arch/arm/soc/nordic_nrf5/nrf51/Kconfig.soc b/arch/arm/soc/nordic_nrf/nrf51/Kconfig.soc similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf51/Kconfig.soc rename to arch/arm/soc/nordic_nrf/nrf51/Kconfig.soc diff --git a/arch/arm/soc/nordic_nrf5/nrf51/dts.fixup b/arch/arm/soc/nordic_nrf/nrf51/dts.fixup similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf51/dts.fixup rename to arch/arm/soc/nordic_nrf/nrf51/dts.fixup diff --git a/arch/arm/soc/nordic_nrf5/nrf51/linker.ld b/arch/arm/soc/nordic_nrf/nrf51/linker.ld similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf51/linker.ld rename to arch/arm/soc/nordic_nrf/nrf51/linker.ld diff --git a/arch/arm/soc/nordic_nrf5/nrf51/soc.c b/arch/arm/soc/nordic_nrf/nrf51/soc.c similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf51/soc.c rename to arch/arm/soc/nordic_nrf/nrf51/soc.c diff --git a/arch/arm/soc/nordic_nrf5/nrf51/soc.h b/arch/arm/soc/nordic_nrf/nrf51/soc.h similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf51/soc.h rename to arch/arm/soc/nordic_nrf/nrf51/soc.h diff --git a/arch/arm/soc/nordic_nrf5/nrf52/CMakeLists.txt b/arch/arm/soc/nordic_nrf/nrf52/CMakeLists.txt similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf52/CMakeLists.txt rename to arch/arm/soc/nordic_nrf/nrf52/CMakeLists.txt diff --git a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52832_QFAA b/arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.nrf52832_QFAA similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52832_QFAA rename to arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.nrf52832_QFAA diff --git a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840_QIAA b/arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840_QIAA rename to arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA diff --git a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.series b/arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.series similarity index 56% rename from arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.series rename to arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.series index e46e932a929..f6f4fb07cb5 100644 --- a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.series +++ b/arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.series @@ -1,13 +1,13 @@ -# Kconfig.defconfig.series - Nordic Semiconductor nRF5 MCU line +# Kconfig.defconfig.series - Nordic Semiconductor nRF52 MCU line # -# Copyright (c) 2016 Nordic Semiconductor ASA +# Copyright (c) 2018 Nordic Semiconductor ASA # # SPDX-License-Identifier: Apache-2.0 # if SOC_SERIES_NRF52X -source "arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52*" +source "arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.nrf52*" config SOC_SERIES default nrf52 diff --git a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.series b/arch/arm/soc/nordic_nrf/nrf52/Kconfig.series similarity index 77% rename from arch/arm/soc/nordic_nrf5/nrf52/Kconfig.series rename to arch/arm/soc/nordic_nrf/nrf52/Kconfig.series index d18d91300ef..e48cbfef541 100644 --- a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.series +++ b/arch/arm/soc/nordic_nrf/nrf52/Kconfig.series @@ -1,6 +1,6 @@ -# Kconfig.series - Nordic Semiconductor nRF5 MCU line +# Kconfig.series - Nordic Semiconductor nRF52 MCU line # -# Copyright (c) 2016 Nordic Semiconductor ASA +# Copyright (c) 2018 Nordic Semiconductor ASA # # SPDX-License-Identifier: Apache-2.0 # @@ -10,7 +10,7 @@ config SOC_SERIES_NRF52X select CPU_CORTEX_M4 select CPU_HAS_FPU select CPU_HAS_MPU - select SOC_FAMILY_NRF5 + select SOC_FAMILY_NRF select NRF_RTC_TIMER select CLOCK_CONTROL select CLOCK_CONTROL_NRF5 diff --git a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.soc b/arch/arm/soc/nordic_nrf/nrf52/Kconfig.soc similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf52/Kconfig.soc rename to arch/arm/soc/nordic_nrf/nrf52/Kconfig.soc diff --git a/arch/arm/soc/nordic_nrf5/nrf52/dts.fixup b/arch/arm/soc/nordic_nrf/nrf52/dts.fixup similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf52/dts.fixup rename to arch/arm/soc/nordic_nrf/nrf52/dts.fixup diff --git a/arch/arm/soc/nordic_nrf5/nrf52/linker.ld b/arch/arm/soc/nordic_nrf/nrf52/linker.ld similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf52/linker.ld rename to arch/arm/soc/nordic_nrf/nrf52/linker.ld diff --git a/arch/arm/soc/nordic_nrf5/nrf52/mpu_mem_cfg.h b/arch/arm/soc/nordic_nrf/nrf52/mpu_mem_cfg.h similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf52/mpu_mem_cfg.h rename to arch/arm/soc/nordic_nrf/nrf52/mpu_mem_cfg.h diff --git a/arch/arm/soc/nordic_nrf5/nrf52/mpu_regions.c b/arch/arm/soc/nordic_nrf/nrf52/mpu_regions.c similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf52/mpu_regions.c rename to arch/arm/soc/nordic_nrf/nrf52/mpu_regions.c diff --git a/arch/arm/soc/nordic_nrf5/nrf52/power.c b/arch/arm/soc/nordic_nrf/nrf52/power.c similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf52/power.c rename to arch/arm/soc/nordic_nrf/nrf52/power.c diff --git a/arch/arm/soc/nordic_nrf5/nrf52/soc.c b/arch/arm/soc/nordic_nrf/nrf52/soc.c similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf52/soc.c rename to arch/arm/soc/nordic_nrf/nrf52/soc.c diff --git a/arch/arm/soc/nordic_nrf5/nrf52/soc.h b/arch/arm/soc/nordic_nrf/nrf52/soc.h similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf52/soc.h rename to arch/arm/soc/nordic_nrf/nrf52/soc.h diff --git a/arch/arm/soc/nordic_nrf5/nrf52/soc_power.h b/arch/arm/soc/nordic_nrf/nrf52/soc_power.h similarity index 100% rename from arch/arm/soc/nordic_nrf5/nrf52/soc_power.h rename to arch/arm/soc/nordic_nrf/nrf52/soc_power.h diff --git a/arch/arm/soc/nordic_nrf5/Kconfig b/arch/arm/soc/nordic_nrf5/Kconfig deleted file mode 100644 index 170e7eb1161..00000000000 --- a/arch/arm/soc/nordic_nrf5/Kconfig +++ /dev/null @@ -1,19 +0,0 @@ -# Kconfig - Nordic Semiconductor nRF5 MCU line -# -# Copyright (c) 2016 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: Apache-2.0 -# - -config SOC_FAMILY_NRF5 - bool - # omit prompt to signify a "hidden" option - default n - -if SOC_FAMILY_NRF5 -config SOC_FAMILY - string - default nordic_nrf5 -endif - -source "arch/arm/soc/nordic_nrf5/*/Kconfig.soc" diff --git a/arch/arm/soc/nordic_nrf5/Kconfig.defconfig b/arch/arm/soc/nordic_nrf5/Kconfig.defconfig deleted file mode 100644 index c18cca781d4..00000000000 --- a/arch/arm/soc/nordic_nrf5/Kconfig.defconfig +++ /dev/null @@ -1,36 +0,0 @@ -# Kconfig.defconfig - Nordic Semiconductor nRF5 MCU line -# -# Copyright (c) 2016 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: Apache-2.0 -# - -if SOC_FAMILY_NRF5 - -config BUILD_OUTPUT_HEX - default y - -if SERIAL - -config GPIO - default y - -endif # SERIAL - -if GPIO - -config GPIO_NRF5 - default y - -endif # GPIO - -if FLASH - -config SOC_FLASH_NRF5 - def_bool y - -endif # FLASH - -source "arch/arm/soc/nordic_nrf5/*/Kconfig.defconfig.series" - -endif # SOC_FAMILY_NRF5 diff --git a/arch/arm/soc/nordic_nrf5/Kconfig.soc b/arch/arm/soc/nordic_nrf5/Kconfig.soc deleted file mode 100644 index e3dee746059..00000000000 --- a/arch/arm/soc/nordic_nrf5/Kconfig.soc +++ /dev/null @@ -1,9 +0,0 @@ -# Kconfig.soc - Nordic Semiconductor nRF5 MCU line -# -# Copyright (c) 2016 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: Apache-2.0 -# - -source "arch/arm/soc/nordic_nrf5/*/Kconfig.series" - diff --git a/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig b/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig index e476ea356cd..6f991c9ba2d 100644 --- a/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig +++ b/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SOC_FAMILY_NRF5=y +CONFIG_SOC_FAMILY_NRF=y CONFIG_SOC_SERIES_NRF51X=y CONFIG_SOC_NRF51822_QFAC=y CONFIG_BOARD_96B_CARBON_NRF51=y diff --git a/boards/arm/96b_nitrogen/96b_nitrogen_defconfig b/boards/arm/96b_nitrogen/96b_nitrogen_defconfig index 00d66e89c66..59864ccb596 100644 --- a/boards/arm/96b_nitrogen/96b_nitrogen_defconfig +++ b/boards/arm/96b_nitrogen/96b_nitrogen_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SOC_FAMILY_NRF5=y +CONFIG_SOC_FAMILY_NRF=y CONFIG_SOC_SERIES_NRF52X=y CONFIG_BOARD_96B_NITROGEN=y diff --git a/boards/arm/arduino_101_ble/arduino_101_ble_defconfig b/boards/arm/arduino_101_ble/arduino_101_ble_defconfig index 688a1659e39..4f52c153439 100644 --- a/boards/arm/arduino_101_ble/arduino_101_ble_defconfig +++ b/boards/arm/arduino_101_ble/arduino_101_ble_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SOC_FAMILY_NRF5=y +CONFIG_SOC_FAMILY_NRF=y CONFIG_SOC_SERIES_NRF51X=y CONFIG_SOC_NRF51822_QFAA=y CONFIG_BOARD_ARDUINO_101_BLE=y diff --git a/boards/arm/bbc_microbit/bbc_microbit_defconfig b/boards/arm/bbc_microbit/bbc_microbit_defconfig index 2db169aaf66..4c041bfc67d 100644 --- a/boards/arm/bbc_microbit/bbc_microbit_defconfig +++ b/boards/arm/bbc_microbit/bbc_microbit_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SOC_FAMILY_NRF5=y +CONFIG_SOC_FAMILY_NRF=y CONFIG_SOC_SERIES_NRF51X=y CONFIG_SOC_NRF51822_QFAA=y CONFIG_BOARD_BBC_MICROBIT=y diff --git a/boards/arm/curie_ble/curie_ble_defconfig b/boards/arm/curie_ble/curie_ble_defconfig index 2a237790fee..9aa829a0476 100644 --- a/boards/arm/curie_ble/curie_ble_defconfig +++ b/boards/arm/curie_ble/curie_ble_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SOC_FAMILY_NRF5=y +CONFIG_SOC_FAMILY_NRF=y CONFIG_SOC_SERIES_NRF51X=y CONFIG_SOC_NRF51822_QFAA=y CONFIG_BOARD_CURIE_BLE=y diff --git a/boards/arm/nrf51_ble400/nrf51_ble400_defconfig b/boards/arm/nrf51_ble400/nrf51_ble400_defconfig index 41df28ab675..04a0f401baf 100644 --- a/boards/arm/nrf51_ble400/nrf51_ble400_defconfig +++ b/boards/arm/nrf51_ble400/nrf51_ble400_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SOC_FAMILY_NRF5=y +CONFIG_SOC_FAMILY_NRF=y CONFIG_SOC_SERIES_NRF51X=y CONFIG_SOC_NRF51822_QFAA=y CONFIG_BOARD_NRF51_BLE400=y diff --git a/boards/arm/nrf51_blenano/nrf51_blenano_defconfig b/boards/arm/nrf51_blenano/nrf51_blenano_defconfig index 1f7563631cc..96bcd178460 100644 --- a/boards/arm/nrf51_blenano/nrf51_blenano_defconfig +++ b/boards/arm/nrf51_blenano/nrf51_blenano_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SOC_FAMILY_NRF5=y +CONFIG_SOC_FAMILY_NRF=y CONFIG_SOC_SERIES_NRF51X=y CONFIG_SOC_NRF51822_QFAA=y CONFIG_BOARD_NRF51_BLENANO=y diff --git a/boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig b/boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig index 8bfad76a7a4..41ab72285ec 100644 --- a/boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig +++ b/boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SOC_FAMILY_NRF5=y +CONFIG_SOC_FAMILY_NRF=y CONFIG_SOC_SERIES_NRF51X=y CONFIG_SOC_NRF51822_QFAC=y CONFIG_BOARD_NRF51_PCA10028=y diff --git a/boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig b/boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig index eb95d9406b9..bf66d1d6cd3 100644 --- a/boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig +++ b/boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SOC_FAMILY_NRF5=y +CONFIG_SOC_FAMILY_NRF=y CONFIG_SOC_SERIES_NRF51X=y CONFIG_SOC_NRF51822_QFAC=y CONFIG_BOARD_NRF51_VBLUNO51=y diff --git a/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig b/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig index d1b2f5c88dd..f2dd31042e8 100644 --- a/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig +++ b/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SOC_FAMILY_NRF5=y +CONFIG_SOC_FAMILY_NRF=y CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_NRF52840_QIAA=y CONFIG_BOARD_NRF52840_PCA10056=y diff --git a/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig b/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig index 1c5f54e2699..6519dec3a7e 100644 --- a/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig +++ b/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SOC_FAMILY_NRF5=y +CONFIG_SOC_FAMILY_NRF=y CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_NRF52832_QFAA=y CONFIG_BOARD_NRF52_BLENANO2=y diff --git a/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig b/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig index dfd111d08c8..2f8e46ec71c 100644 --- a/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig +++ b/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SOC_FAMILY_NRF5=y +CONFIG_SOC_FAMILY_NRF=y CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_NRF52832_QFAA=y CONFIG_BOARD_NRF52_PCA10040=y diff --git a/boards/arm/nrf52_sparkfun/nrf52_sparkfun_defconfig b/boards/arm/nrf52_sparkfun/nrf52_sparkfun_defconfig index 1759a96cdbc..e6cf73512f2 100644 --- a/boards/arm/nrf52_sparkfun/nrf52_sparkfun_defconfig +++ b/boards/arm/nrf52_sparkfun/nrf52_sparkfun_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SOC_FAMILY_NRF5=y +CONFIG_SOC_FAMILY_NRF=y CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_NRF52832_QFAA=y CONFIG_BOARD_NRF52_SPARKFUN=y diff --git a/boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig b/boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig index ac1733dfe00..be84245577f 100644 --- a/boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig +++ b/boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SOC_FAMILY_NRF5=y +CONFIG_SOC_FAMILY_NRF=y CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_NRF52832_QFAA=y CONFIG_BOARD_NRF52_VBLUNO52=y diff --git a/boards/arm/quark_se_c1000_ble/quark_se_c1000_ble_defconfig b/boards/arm/quark_se_c1000_ble/quark_se_c1000_ble_defconfig index cd3458fb2d1..729f08518df 100644 --- a/boards/arm/quark_se_c1000_ble/quark_se_c1000_ble_defconfig +++ b/boards/arm/quark_se_c1000_ble/quark_se_c1000_ble_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SOC_FAMILY_NRF5=y +CONFIG_SOC_FAMILY_NRF=y CONFIG_SOC_SERIES_NRF51X=y CONFIG_SOC_NRF51822_QFAA=y CONFIG_BOARD_QUARK_SE_C1000_BLE=y diff --git a/drivers/clock_control/Kconfig.nrf5 b/drivers/clock_control/Kconfig.nrf5 index fc94ae3a2a6..c7390e1328b 100644 --- a/drivers/clock_control/Kconfig.nrf5 +++ b/drivers/clock_control/Kconfig.nrf5 @@ -7,7 +7,7 @@ menuconfig CLOCK_CONTROL_NRF5 bool prompt "NRF5 Clock controller support" - depends on SOC_FAMILY_NRF5 + depends on SOC_FAMILY_NRF default n help Enable support for the Nordic Semiconductor nRF5x series SoC clock diff --git a/drivers/flash/Kconfig b/drivers/flash/Kconfig index 5242ba3f76f..ead453f74f3 100644 --- a/drivers/flash/Kconfig +++ b/drivers/flash/Kconfig @@ -140,7 +140,7 @@ config SOC_FLASH_QMSI_API_REENTRANCY config SOC_FLASH_NRF5 bool "Nordic Semiconductor nRF5X flash driver" - depends on FLASH && SOC_FAMILY_NRF5 + depends on FLASH && SOC_FAMILY_NRF default n select FLASH_HAS_PAGE_LAYOUT select FLASH_HAS_DRIVER_ENABLED diff --git a/drivers/gpio/Kconfig.nrf5 b/drivers/gpio/Kconfig.nrf5 index 27f21e0d712..6803e25c72d 100644 --- a/drivers/gpio/Kconfig.nrf5 +++ b/drivers/gpio/Kconfig.nrf5 @@ -7,7 +7,7 @@ menuconfig GPIO_NRF5 bool "Nordic Semiconductor nRF5X-based GPIO driver" - depends on GPIO && SOC_FAMILY_NRF5 + depends on GPIO && SOC_FAMILY_NRF default n help Enable GPIO driver for nRF5 line of MCUs. diff --git a/drivers/i2c/Kconfig.nrf5 b/drivers/i2c/Kconfig.nrf5 index d7bb04c74ea..9c855e54fa4 100644 --- a/drivers/i2c/Kconfig.nrf5 +++ b/drivers/i2c/Kconfig.nrf5 @@ -9,7 +9,7 @@ config I2C_NRF5 bool "NRF5 I2C driver" - depends on SOC_FAMILY_NRF5 + depends on SOC_FAMILY_NRF select GPIO select HAS_DTS_I2C default n diff --git a/drivers/led_strip/Kconfig.ws2812b_sw b/drivers/led_strip/Kconfig.ws2812b_sw index 8c03ab6ab24..d2a0d9aee4f 100644 --- a/drivers/led_strip/Kconfig.ws2812b_sw +++ b/drivers/led_strip/Kconfig.ws2812b_sw @@ -26,7 +26,7 @@ config WS2812B_SW_NAME config WS2812B_SW_GPIO_NAME string "GPIO port that the LED strip is connected to" - default GPIO_NRF5_P0_DEV_NAME if SOC_FAMILY_NRF5 + default GPIO_NRF5_P0_DEV_NAME if SOC_FAMILY_NRF help GPIO port name. diff --git a/drivers/pwm/Kconfig.nrf5_sw b/drivers/pwm/Kconfig.nrf5_sw index 0d20a614d2d..e6021574398 100644 --- a/drivers/pwm/Kconfig.nrf5_sw +++ b/drivers/pwm/Kconfig.nrf5_sw @@ -8,7 +8,7 @@ menuconfig PWM_NRF5_SW bool "Nordic Semiconductor nRF5x series S/W PWM" - depends on PWM && SOC_FAMILY_NRF5 + depends on PWM && SOC_FAMILY_NRF default y help Enable driver to utilize PWM on the Nordic Semiconductor nRF5x series. diff --git a/drivers/sensor/nrf5/Kconfig b/drivers/sensor/nrf5/Kconfig index 2ce64b0efe4..6cb43eed44c 100644 --- a/drivers/sensor/nrf5/Kconfig +++ b/drivers/sensor/nrf5/Kconfig @@ -9,7 +9,7 @@ menuconfig TEMP_NRF5 bool prompt "nRF5 Temperature Sensor" - depends on SOC_FAMILY_NRF5 + depends on SOC_FAMILY_NRF default n help Enable driver for nRF5 temperature sensor. diff --git a/drivers/serial/Kconfig.nrf5 b/drivers/serial/Kconfig.nrf5 index 39a926c1db0..1e8c06fa3b7 100644 --- a/drivers/serial/Kconfig.nrf5 +++ b/drivers/serial/Kconfig.nrf5 @@ -10,7 +10,7 @@ menuconfig UART_NRF5 default n select SERIAL_HAS_DRIVER select SERIAL_SUPPORT_INTERRUPT - depends on SOC_FAMILY_NRF5 + depends on SOC_FAMILY_NRF select GPIO_NRF5 help This option enables the UART driver for Nordic Semiconductor nRF5 diff --git a/drivers/spi/Kconfig.nrf5_legacy b/drivers/spi/Kconfig.nrf5_legacy index af106ecaebe..6d72ad3d8c5 100644 --- a/drivers/spi/Kconfig.nrf5_legacy +++ b/drivers/spi/Kconfig.nrf5_legacy @@ -10,7 +10,7 @@ menuconfig SPI_NRF5 bool "nRF5 SPI drivers" - depends on SPI && SOC_FAMILY_NRF5 && GPIO_NRF5_P0 + depends on SPI && SOC_FAMILY_NRF && GPIO_NRF5_P0 default n help Enable support for nRF5 MCU series SPI drivers. Peripherals diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig index 190c1e98342..bc251038818 100644 --- a/drivers/timer/Kconfig +++ b/drivers/timer/Kconfig @@ -154,7 +154,7 @@ config ALTERA_AVALON_TIMER config NRF_RTC_TIMER bool "nRF Real Time Counter (NRF_RTC1) Timer" default y - depends on SOC_FAMILY_NRF5 && CLOCK_CONTROL_NRF5 + depends on SOC_FAMILY_NRF && CLOCK_CONTROL_NRF5 help This module implements a kernel device driver for the nRF Real Time Counter NRF_RTC1 and provides the standard "system clock driver" diff --git a/samples/basic/fade_led/src/main.c b/samples/basic/fade_led/src/main.c index eb57b23591c..ab3ccdc674f 100644 --- a/samples/basic/fade_led/src/main.c +++ b/samples/basic/fade_led/src/main.c @@ -25,7 +25,7 @@ #elif defined(CONFIG_SOC_QUARK_SE_C1000) || defined(CONFIG_SOC_QUARK_D2000) #define PWM_DRIVER CONFIG_PWM_QMSI_DEV_NAME #define PWM_CHANNEL 0 -#elif defined(CONFIG_SOC_FAMILY_NRF5) +#elif defined(CONFIG_SOC_FAMILY_NRF) #include #define PWM_DRIVER CONFIG_PWM_NRF5_SW_0_DEV_NAME #define PWM_CHANNEL LED0_GPIO_PIN diff --git a/subsys/bluetooth/controller/CMakeLists.txt b/subsys/bluetooth/controller/CMakeLists.txt index c078b48bc60..5c011d1b81b 100644 --- a/subsys/bluetooth/controller/CMakeLists.txt +++ b/subsys/bluetooth/controller/CMakeLists.txt @@ -41,7 +41,7 @@ zephyr_library_sources_ifdef( ) zephyr_library_sources_ifdef( - CONFIG_SOC_FAMILY_NRF5 + CONFIG_SOC_FAMILY_NRF hal/nrf5/cntr.c hal/nrf5/ecb.c hal/nrf5/radio/radio.c diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig index 52966609c9d..2b6d21248c7 100644 --- a/subsys/bluetooth/controller/Kconfig +++ b/subsys/bluetooth/controller/Kconfig @@ -24,8 +24,8 @@ choice config BT_LL_SW bool "Software-based BLE Link Layer" select ENTROPY_GENERATOR - select ENTROPY_NRF5_RNG if SOC_FAMILY_NRF5 - select ENTROPY_NRF5_BIAS_CORRECTION if SOC_FAMILY_NRF5 + select ENTROPY_NRF5_RNG if SOC_FAMILY_NRF + select ENTROPY_NRF5_BIAS_CORRECTION if SOC_FAMILY_NRF select ENTROPY_DEVICE_RANDOM_GENERATOR help Use Zephyr software BLE Link Layer implementation. @@ -168,7 +168,7 @@ config BT_CTLR_RL_SIZE depends on BT_CTLR_PRIVACY int default 8 - range 1 8 if SOC_FAMILY_NRF5 + range 1 8 if SOC_FAMILY_NRF help Set the size of the Resolving List for LE Controller-based Privacy. On nRF5x-based controllers, the hardware imposes a limit of 8 devices. @@ -486,7 +486,7 @@ endif # BT_CTLR_GPIO_LNA config BT_CTLR_PA_LNA_GPIOTE_CHAN # Hidden "nRF5 GPIO PA/LNA GPIOTE Channel" - depends on SOC_FAMILY_NRF5 && (BT_CTLR_GPIO_PA || BT_CTLR_GPIO_LNA) + depends on SOC_FAMILY_NRF && (BT_CTLR_GPIO_PA || BT_CTLR_GPIO_LNA) int default 3 help diff --git a/subsys/bluetooth/controller/hci/hci.c b/subsys/bluetooth/controller/hci/hci.c index ca08a74f8b4..0eec03dbbcd 100644 --- a/subsys/bluetooth/controller/hci/hci.c +++ b/subsys/bluetooth/controller/hci/hci.c @@ -1833,7 +1833,7 @@ static void vs_read_static_addrs(struct net_buf *buf, struct net_buf **evt) { struct bt_hci_rp_vs_read_static_addrs *rp; -#if defined(CONFIG_SOC_FAMILY_NRF5) +#if defined(CONFIG_SOC_FAMILY_NRF) /* Read address from nRF5-specific storage * Non-initialized FICR values default to 0xFF, skip if no address * present. Also if a public address lives in FICR, do not use in this @@ -1862,7 +1862,7 @@ static void vs_read_static_addrs(struct net_buf *buf, struct net_buf **evt) return; } -#endif /* CONFIG_SOC_FAMILY_NRF5 */ +#endif /* CONFIG_SOC_FAMILY_NRF */ rp = cmd_complete(evt, sizeof(*rp)); rp->status = 0x00; @@ -1877,7 +1877,7 @@ static void vs_read_key_hierarchy_roots(struct net_buf *buf, rp = cmd_complete(evt, sizeof(*rp)); rp->status = 0x00; -#if defined(CONFIG_SOC_FAMILY_NRF5) +#if defined(CONFIG_SOC_FAMILY_NRF) /* Fill in IR if present */ if ((NRF_FICR->IR[0] != UINT32_MAX) && (NRF_FICR->IR[1] != UINT32_MAX) && @@ -1912,7 +1912,7 @@ static void vs_read_key_hierarchy_roots(struct net_buf *buf, memset(rp->ir, 0x00, sizeof(rp->ir)); /* Mark ER as invalid */ memset(rp->er, 0x00, sizeof(rp->er)); -#endif /* CONFIG_SOC_FAMILY_NRF5 */ +#endif /* CONFIG_SOC_FAMILY_NRF */ } #endif /* CONFIG_BT_HCI_VS_EXT */ diff --git a/subsys/bluetooth/controller/hci/hci_internal.h b/subsys/bluetooth/controller/hci/hci_internal.h index b569f29c002..4fd55b81d48 100644 --- a/subsys/bluetooth/controller/hci/hci_internal.h +++ b/subsys/bluetooth/controller/hci/hci_internal.h @@ -22,7 +22,7 @@ extern atomic_t hci_state_mask; #define HCI_CLASS_EVT_CONNECTION 2 #define HCI_CLASS_ACL_DATA 3 -#if defined(CONFIG_SOC_FAMILY_NRF5) +#if defined(CONFIG_SOC_FAMILY_NRF) #define BT_HCI_VS_HW_PLAT BT_HCI_VS_HW_PLAT_NORDIC #if defined(CONFIG_SOC_SERIES_NRF51X) #define BT_HCI_VS_HW_VAR BT_HCI_VS_HW_VAR_NORDIC_NRF51X; @@ -32,7 +32,7 @@ extern atomic_t hci_state_mask; #else #define BT_HCI_VS_HW_PLAT 0 #define BT_HCI_VS_HW_VAR 0 -#endif /* CONFIG_SOC_FAMILY_NRF5 */ +#endif /* CONFIG_SOC_FAMILY_NRF */ void hci_init(struct k_poll_signal *signal_host_buf); struct net_buf *hci_cmd_handle(struct net_buf *cmd); diff --git a/subsys/bluetooth/controller/ll_sw/ctrl.c b/subsys/bluetooth/controller/ll_sw/ctrl.c index 077e9ce32d2..4f5c06fbb73 100644 --- a/subsys/bluetooth/controller/ll_sw/ctrl.c +++ b/subsys/bluetooth/controller/ll_sw/ctrl.c @@ -17,10 +17,10 @@ #include "ll.h" -#if defined(CONFIG_SOC_FAMILY_NRF5) +#if defined(CONFIG_SOC_FAMILY_NRF) #include "hal/nrf5/ticker.h" #include -#endif /* CONFIG_SOC_FAMILY_NRF5 */ +#endif /* CONFIG_SOC_FAMILY_NRF */ #include "hal/cpu.h" #include "hal/ecb.h" diff --git a/subsys/bluetooth/controller/ll_sw/ll.c b/subsys/bluetooth/controller/ll_sw/ll.c index 0ab87c18a22..9949757f590 100644 --- a/subsys/bluetooth/controller/ll_sw/ll.c +++ b/subsys/bluetooth/controller/ll_sw/ll.c @@ -25,9 +25,9 @@ #include "hal/radio.h" #include "hal/debug.h" -#if defined(CONFIG_SOC_FAMILY_NRF5) +#if defined(CONFIG_SOC_FAMILY_NRF) #include "hal/nrf5/ticker.h" -#endif /* CONFIG_SOC_FAMILY_NRF5 */ +#endif /* CONFIG_SOC_FAMILY_NRF */ #include "util/util.h" #include "util/mem.h" diff --git a/subsys/bluetooth/controller/ticker/ticker.c b/subsys/bluetooth/controller/ticker/ticker.c index da593ca806e..3ee0ce877cc 100644 --- a/subsys/bluetooth/controller/ticker/ticker.c +++ b/subsys/bluetooth/controller/ticker/ticker.c @@ -10,9 +10,9 @@ #include "hal/cntr.h" -#if defined(CONFIG_SOC_FAMILY_NRF5) +#if defined(CONFIG_SOC_FAMILY_NRF) #include "hal/nrf5/ticker.h" -#endif /* CONFIG_SOC_FAMILY_NRF5 */ +#endif /* CONFIG_SOC_FAMILY_NRF */ #include "ticker.h" diff --git a/subsys/bluetooth/shell/ticker.c b/subsys/bluetooth/shell/ticker.c index f8157df1619..8d8d49613af 100644 --- a/subsys/bluetooth/shell/ticker.c +++ b/subsys/bluetooth/shell/ticker.c @@ -13,9 +13,9 @@ #include #include -#if defined(CONFIG_SOC_FAMILY_NRF5) +#if defined(CONFIG_SOC_FAMILY_NRF) #include "../controller/hal/nrf5/ticker.h" -#endif /* CONFIG_SOC_FAMILY_NRF5 */ +#endif /* CONFIG_SOC_FAMILY_NRF */ #include "../controller/util/memq.h" #include "../controller/util/mayfly.h" diff --git a/tests/benchmarks/timing_info/src/timing_info.h b/tests/benchmarks/timing_info/src/timing_info.h index 5e2f2b25935..65a987c1b0d 100644 --- a/tests/benchmarks/timing_info/src/timing_info.h +++ b/tests/benchmarks/timing_info/src/timing_info.h @@ -161,11 +161,11 @@ extern u64_t __end_tick_time; * NOTE: Needed only when reading value from end of swap operation */ #if CONFIG_ARM -#if defined(CONFIG_SOC_FAMILY_NRF5) +#if defined(CONFIG_SOC_FAMILY_NRF) #define SUBTRACT_CLOCK_CYCLES(val) (val) #else #define SUBTRACT_CLOCK_CYCLES(val) (SysTick->LOAD - (u32_t) val) -#endif /* CONFIG_SOC_FAMILY_NRF5 */ +#endif /* CONFIG_SOC_FAMILY_NRF */ #else #define SUBTRACT_CLOCK_CYCLES(val) (val) #endif /* CONFIG_ARM */