bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch: arm: nrf: Rename nrf5 SoC Family to nrf

Browse Source 
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 <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2018-03-19 13:51:25 +01:00 committed by Carles Cufí
parent 0cee4ed747
commit f49150cab6
69 changed files with 124 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/core/cortex_m/mpu/Kconfig
View File

@ -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

0
arch/arm/soc/nordic_nrf5/CMakeLists.txt → arch/arm/soc/nordic_nrf/CMakeLists.txt
View File

19
arch/arm/soc/nordic_nrf/Kconfig Normal file
View File

@ -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"

36
arch/arm/soc/nordic_nrf/Kconfig.defconfig Normal file
View File

@ -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

9
arch/arm/soc/nordic_nrf/Kconfig.soc Normal file
View File

@ -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"

0
arch/arm/soc/nordic_nrf5/include/nrf5_common.h → arch/arm/soc/nordic_nrf/include/nrf5_common.h
View File

0
arch/arm/soc/nordic_nrf5/nrf51/CMakeLists.txt → arch/arm/soc/nordic_nrf/nrf51/CMakeLists.txt
View File

0
arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.nrf51822_QFAA → arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAA
View File

0
arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.nrf51822_QFAB → arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAB
View File

0
arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.nrf51822_QFAC → arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAC
View File

5
arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.series → arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.series
View File

@ -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

5
arch/arm/soc/nordic_nrf5/nrf51/Kconfig.series → arch/arm/soc/nordic_nrf/nrf51/Kconfig.series
View File

@ -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

0
arch/arm/soc/nordic_nrf5/nrf51/Kconfig.soc → arch/arm/soc/nordic_nrf/nrf51/Kconfig.soc
View File

0
arch/arm/soc/nordic_nrf5/nrf51/dts.fixup → arch/arm/soc/nordic_nrf/nrf51/dts.fixup
View File

0
arch/arm/soc/nordic_nrf5/nrf51/linker.ld → arch/arm/soc/nordic_nrf/nrf51/linker.ld
View File

0
arch/arm/soc/nordic_nrf5/nrf51/soc.c → arch/arm/soc/nordic_nrf/nrf51/soc.c
View File

0
arch/arm/soc/nordic_nrf5/nrf51/soc.h → arch/arm/soc/nordic_nrf/nrf51/soc.h
View File

0
arch/arm/soc/nordic_nrf5/nrf52/CMakeLists.txt → arch/arm/soc/nordic_nrf/nrf52/CMakeLists.txt
View File

0
arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52832_QFAA → arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.nrf52832_QFAA
View File

0
arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840_QIAA → arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA
View File

6
arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.series → arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.series
View File

@ -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

6
arch/arm/soc/nordic_nrf5/nrf52/Kconfig.series → arch/arm/soc/nordic_nrf/nrf52/Kconfig.series
View File

@ -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

0
arch/arm/soc/nordic_nrf5/nrf52/Kconfig.soc → arch/arm/soc/nordic_nrf/nrf52/Kconfig.soc
View File

0
arch/arm/soc/nordic_nrf5/nrf52/dts.fixup → arch/arm/soc/nordic_nrf/nrf52/dts.fixup
View File

0
arch/arm/soc/nordic_nrf5/nrf52/linker.ld → arch/arm/soc/nordic_nrf/nrf52/linker.ld
View File

0
arch/arm/soc/nordic_nrf5/nrf52/mpu_mem_cfg.h → arch/arm/soc/nordic_nrf/nrf52/mpu_mem_cfg.h
View File

0
arch/arm/soc/nordic_nrf5/nrf52/mpu_regions.c → arch/arm/soc/nordic_nrf/nrf52/mpu_regions.c
View File

0
arch/arm/soc/nordic_nrf5/nrf52/power.c → arch/arm/soc/nordic_nrf/nrf52/power.c
View File

0
arch/arm/soc/nordic_nrf5/nrf52/soc.c → arch/arm/soc/nordic_nrf/nrf52/soc.c
View File

0
arch/arm/soc/nordic_nrf5/nrf52/soc.h → arch/arm/soc/nordic_nrf/nrf52/soc.h
View File

0
arch/arm/soc/nordic_nrf5/nrf52/soc_power.h → arch/arm/soc/nordic_nrf/nrf52/soc_power.h
View File

19
arch/arm/soc/nordic_nrf5/Kconfig
View File

@ -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"

36
arch/arm/soc/nordic_nrf5/Kconfig.defconfig
View File

@ -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

9
arch/arm/soc/nordic_nrf5/Kconfig.soc
View File

@ -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"

2
boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig
View File

@ -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

2
boards/arm/96b_nitrogen/96b_nitrogen_defconfig
View File

@ -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

2
boards/arm/arduino_101_ble/arduino_101_ble_defconfig
View File

@ -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

2
boards/arm/bbc_microbit/bbc_microbit_defconfig
View File

@ -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

2
boards/arm/curie_ble/curie_ble_defconfig
View File

@ -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

2
boards/arm/nrf51_ble400/nrf51_ble400_defconfig
View File

@ -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

2
boards/arm/nrf51_blenano/nrf51_blenano_defconfig
View File

@ -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

2
boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig
View File

@ -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

2
boards/arm/nrf51_vbluno51/nrf51_vbluno51_defconfig
View File

@ -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

2
boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig
View File

@ -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

2
boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig
View File

@ -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

2
boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig
View File

@ -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

2
boards/arm/nrf52_sparkfun/nrf52_sparkfun_defconfig
View File

@ -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

2
boards/arm/nrf52_vbluno52/nrf52_vbluno52_defconfig
View File

@ -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

2
boards/arm/quark_se_c1000_ble/quark_se_c1000_ble_defconfig
View File

@ -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

2
drivers/clock_control/Kconfig.nrf5
View File

@ -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

2
drivers/flash/Kconfig
View File

@ -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

2
drivers/gpio/Kconfig.nrf5
View File

@ -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.

2
drivers/i2c/Kconfig.nrf5
View File

@ -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

2
drivers/led_strip/Kconfig.ws2812b_sw
View File

@ -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.

2
drivers/pwm/Kconfig.nrf5_sw
View File

@ -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.

2
drivers/sensor/nrf5/Kconfig
View File

@ -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.

2
drivers/serial/Kconfig.nrf5
View File

@ -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

2
drivers/spi/Kconfig.nrf5_legacy
View File

@ -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

2
drivers/timer/Kconfig
View File

@ -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"

2
samples/basic/fade_led/src/main.c
View File

@ -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 <board.h>
#define PWM_DRIVER CONFIG_PWM_NRF5_SW_0_DEV_NAME
#define PWM_CHANNEL LED0_GPIO_PIN

2
subsys/bluetooth/controller/CMakeLists.txt
View File

@ -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

8
subsys/bluetooth/controller/Kconfig
View File

@ -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

8
subsys/bluetooth/controller/hci/hci.c
View File

@ -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 */

4
subsys/bluetooth/controller/hci/hci_internal.h
View File

@ -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);

4
subsys/bluetooth/controller/ll_sw/ctrl.c
View File

@ -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 <drivers/entropy/nrf5_entropy.h>
#endif /* CONFIG_SOC_FAMILY_NRF5 */
#endif /* CONFIG_SOC_FAMILY_NRF */
#include "hal/cpu.h"
#include "hal/ecb.h"

4
subsys/bluetooth/controller/ll_sw/ll.c
View File

@ -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"

4
subsys/bluetooth/controller/ticker/ticker.c
View File

@ -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"

4
subsys/bluetooth/shell/ticker.c
View File

@ -13,9 +13,9 @@
#include <shell/shell.h>
#include <misc/printk.h>
#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"

4
tests/benchmarks/timing_info/src/timing_info.h
View File

@ -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 */