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

various: Change SOC_FAMILY_NRF to SOC_FAMILY_NORDIC_NRF

Browse Source 
Fixes the name to include the vendor in it

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae
2024-02-21 10:19:08 +00:00
committed by Carles Cufi
parent e25730ba56
commit bf2fb5eca3
16 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/core/cortex_m/timing.c
View File

@@ -28,7 +28,7 @@
*/
static inline uint64_t z_arm_dwt_freq_get(void)
{
#if defined(CONFIG_SOC_FAMILY_NRF) || \
#if defined(CONFIG_SOC_FAMILY_NORDIC_NRF) || \
defined(CONFIG_SOC_SERIES_IMXRT6XX)
/*
* DWT frequency is taken directly from the
@@ -77,7 +77,7 @@ static inline uint64_t z_arm_dwt_freq_get(void)
}
return dwt_frequency;
#endif /* CONFIG_SOC_FAMILY_NRF */
#endif /* CONFIG_SOC_FAMILY_NORDIC_NRF */
}
void arch_timing_init(void)

2
drivers/hwinfo/Kconfig
View File

@@ -66,7 +66,7 @@ config HWINFO_STM32
config HWINFO_NRF
bool "NRF device ID"
default y
depends on SOC_FAMILY_NRF
depends on SOC_FAMILY_NORDIC_NRF
depends on NRF_SOC_SECURE_SUPPORTED
help
Enable Nordic NRF hwinfo driver.

2
drivers/i2c/Kconfig.nrfx
View File

@@ -6,7 +6,7 @@
menuconfig I2C_NRFX
bool "nRF TWI nrfx drivers"
default y
depends on SOC_FAMILY_NRF
depends on SOC_FAMILY_NORDIC_NRF
depends on MULTITHREADING
select PINCTRL
help

2
drivers/spi/Kconfig.nrfx
View File

@@ -4,7 +4,7 @@
menuconfig SPI_NRFX
bool "nRF SPI nrfx drivers"
default y
depends on SOC_FAMILY_NRF
depends on SOC_FAMILY_NORDIC_NRF
depends on MULTITHREADING
select PINCTRL
help

2
modules/trusted-firmware-m/CMakeLists.txt
View File

@@ -358,7 +358,7 @@ if (CONFIG_BUILD_WITH_TFM)
zephyr_library_sources(${TFM_INTERFACE_SOURCE_DIR}/tfm_tz_psa_ns_api.c)
if(CONFIG_SOC_FAMILY_NRF)
if(CONFIG_SOC_FAMILY_NORDIC_NRF)
zephyr_library_sources_ifdef(CONFIG_TFM_PARTITION_PLATFORM ${TFM_INTERFACE_SOURCE_DIR}/tfm_ioctl_core_ns_api.c)
endif()

6
soc/nordic/Kconfig
View File

@@ -6,11 +6,11 @@
# This file is contains Zephyr build system Kconfig references and is not
# re-usable outside the Zephyr tree.
config SOC_FAMILY_NRF
config SOC_FAMILY_NORDIC_NRF
select SOC_COMPATIBLE_NRF
select PLATFORM_SPECIFIC_INIT if ARM
if SOC_FAMILY_NRF
if SOC_FAMILY_NORDIC_NRF
rsource "common/Kconfig.peripherals"
rsource "*/Kconfig"
@@ -171,4 +171,4 @@ config NRF_TRACE_PORT
Unit) for tracing using a hardware probe. If disabled, the trace
pins will be used as GPIO.
endif # SOC_FAMILY_NRF
endif # SOC_FAMILY_NORDIC_NRF

4
soc/nordic/Kconfig.defconfig
View File

@@ -3,7 +3,7 @@
# Copyright (c) 2016-2018 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
if SOC_FAMILY_NRF
if SOC_FAMILY_NORDIC_NRF
rsource "*/Kconfig.defconfig"
@@ -42,4 +42,4 @@ config GPIO
config UART_USE_RUNTIME_CONFIGURE
default n
endif # SOC_FAMILY_NRF
endif # SOC_FAMILY_NORDIC_NRF

14
soc/nordic/Kconfig.soc
View File

@@ -15,11 +15,11 @@ config SOC_SERIES
default "nrf54l" if SOC_SERIES_NRF54LX
default "nrf91" if SOC_SERIES_NRF91X
config SOC_FAMILY_NRF
config SOC_FAMILY_NORDIC_NRF
bool
config SOC_FAMILY
default "nordic_nrf" if SOC_FAMILY_NRF
default "nordic_nrf" if SOC_FAMILY_NORDIC_NRF
config SOC_SERIES_NRF51X
bool
@@ -28,31 +28,31 @@ config SOC_SERIES_NRF51X
config SOC_SERIES_NRF52X
bool
select SOC_FAMILY_NRF
select SOC_FAMILY_NORDIC_NRF
help
Enable support for NRF52 MCU series
config SOC_SERIES_NRF53X
bool
select SOC_FAMILY_NRF
select SOC_FAMILY_NORDIC_NRF
help
Enable support for NRF53 MCU series
config SOC_SERIES_NRF54HX
bool
select SOC_FAMILY_NRF
select SOC_FAMILY_NORDIC_NRF
help
Nordic Semiconductor nRF54H series MCU
config SOC_SERIES_NRF54LX
bool
select SOC_FAMILY_NRF
select SOC_FAMILY_NORDIC_NRF
help
Nordic Semiconductor nRF54L series MCU
config SOC_SERIES_NRF91X
bool
select SOC_FAMILY_NRF
select SOC_FAMILY_NORDIC_NRF
help
Enable support for NRF91 MCU series

2
soc/nordic/common/CMakeLists.txt
View File

@@ -3,7 +3,7 @@
add_subdirectory_ifdef(CONFIG_RISCV_CORE_NORDIC_VPR vpr)
if(CONFIG_ARM AND CONFIG_SOC_FAMILY_NRF)
if(CONFIG_ARM AND CONFIG_SOC_FAMILY_NORDIC_NRF)
zephyr_library_sources(soc_nrf_common.S)
endif()

2
soc/nordic/nrf51/Kconfig.soc
View File

@@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
config SOC_SERIES_NRF51X
select SOC_FAMILY_NRF
select SOC_FAMILY_NORDIC_NRF
help
Enable support for NRF51 MCU series

2
soc/nordic/nrf52/Kconfig.soc
View File

@@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
config SOC_SERIES_NRF52X
select SOC_FAMILY_NRF
select SOC_FAMILY_NORDIC_NRF
help
Enable support for NRF52 MCU series

2
soc/nordic/nrf53/Kconfig.soc
View File

@@ -5,7 +5,7 @@
config SOC_SERIES_NRF53X
bool
select SOC_FAMILY_NRF
select SOC_FAMILY_NORDIC_NRF
help
Enable support for NRF53 MCU series

2
soc/nordic/nrf91/Kconfig.soc
View File

@@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
config SOC_SERIES_NRF91X
select SOC_FAMILY_NRF
select SOC_FAMILY_NORDIC_NRF
help
Enable support for NRF91 MCU series

4
subsys/bluetooth/controller/hci/hci_driver.c
View File

@@ -35,9 +35,9 @@
#include "hal/ccm.h"
#if defined(CONFIG_SOC_FAMILY_NRF)
#if defined(CONFIG_SOC_FAMILY_NORDIC_NRF)
#include "hal/radio.h"
#endif /* CONFIG_SOC_FAMILY_NRF */
#endif /* CONFIG_SOC_FAMILY_NORDIC_NRF */
#include "ll_sw/pdu_df.h"
#include "lll/pdu_vendor.h"

8
tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c
View File

@@ -16,7 +16,7 @@
*/
#define _ISR_OFFSET 0
#if defined(CONFIG_SOC_FAMILY_NRF)
#if defined(CONFIG_SOC_FAMILY_NORDIC_NRF)
#undef _ISR_OFFSET
#if defined(CONFIG_BOARD_QEMU_CORTEX_M0)
/* For the nRF51-based QEMU Cortex-M0 platform, the first set of consecutive
@@ -34,7 +34,7 @@
/* For other nRF targets, use TIMER0-2 interrupt lines. */
#define _ISR_OFFSET TIMER0_IRQn
#endif
#endif /* CONFIG_SOC_FAMILY_NRF */
#endif /* CONFIG_SOC_FAMILY_NORDIC_NRF */
struct k_sem sem[3];
@@ -130,7 +130,7 @@ ZTEST(vector_table, test_arm_irq_vector_table)
typedef void (*vth)(void); /* Vector Table Handler */
#if defined(CONFIG_SOC_FAMILY_NRF)
#if defined(CONFIG_SOC_FAMILY_NORDIC_NRF)
/* nRF5X- and nRF91X-based platforms employ a Hardware RTC peripheral
* to implement the Kernel system timer, instead of the ARM Cortex-M
* SysTick. Therefore, a pointer to the timer ISR needs to be added in
@@ -237,7 +237,7 @@ vth __irq_vector_table _irq_vector_table[] = {
vth __irq_vector_table _irq_vector_table[] = {
isr0, isr1, isr2
};
#endif /* CONFIG_SOC_FAMILY_NRF */
#endif /* CONFIG_SOC_FAMILY_NORDIC_NRF */
/**
* @}

2
tests/arch/arm/arm_irq_zero_latency_levels/testcase.yaml
View File

@@ -1,6 +1,6 @@
common:
filter: (CONFIG_ARMV6_M_ARMV8_M_BASELINE or CONFIG_ARMV7_M_ARMV8_M_MAINLINE) and
not CONFIG_SOC_FAMILY_NRF
not CONFIG_SOC_FAMILY_NORDIC_NRF
tags:
- arm
- interrupt