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

samples: Update to use SOC_SERIES_NRF Kconfigs without X suffix

Browse Source 
Updates usage of the old Kconfig to use the new Kconfig

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae
2026-01-15 09:03:26 +00:00
committed by Fabio Baltieri
parent 723476370d
commit cc9287d291
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/boards/nordic/nrfx/Kconfig
View File

@@ -4,11 +4,11 @@
source "Kconfig.zephyr"
config NRFX_GPIOTE0
default y if SOC_SERIES_NRF51X || \
SOC_SERIES_NRF52X || \
(SOC_SERIES_NRF53X && !TRUSTED_EXECUTION_NONSECURE) || \
(SOC_SERIES_NRF91X && !TRUSTED_EXECUTION_NONSECURE)
default y if SOC_SERIES_NRF51 || \
SOC_SERIES_NRF52 || \
(SOC_SERIES_NRF53 && !TRUSTED_EXECUTION_NONSECURE) || \
(SOC_SERIES_NRF91 && !TRUSTED_EXECUTION_NONSECURE)
config NRFX_GPIOTE1
default y if (SOC_SERIES_NRF53X && TRUSTED_EXECUTION_NONSECURE) || \
(SOC_SERIES_NRF91X && TRUSTED_EXECUTION_NONSECURE)
default y if (SOC_SERIES_NRF53 && TRUSTED_EXECUTION_NONSECURE) || \
(SOC_SERIES_NRF91 && TRUSTED_EXECUTION_NONSECURE)

2
samples/subsys/usb/uac2_explicit_feedback/CMakeLists.txt
View File

@@ -7,7 +7,7 @@ project(usb_audio_async_i2s)
include(${ZEPHYR_BASE}/samples/subsys/usb/common/common.cmake)
target_sources(app PRIVATE src/main.c)
if(CONFIG_SOC_COMPATIBLE_NRF5340_CPUAPP OR CONFIG_SOC_SERIES_NRF54HX)
if(CONFIG_SOC_COMPATIBLE_NRF5340_CPUAPP OR CONFIG_SOC_SERIES_NRF54H)
target_sources(app PRIVATE src/feedback_nrf.c)
else()
target_sources(app PRIVATE src/feedback_dummy.c)

2
samples/subsys/usb/uac2_explicit_feedback/src/feedback_nrf.c
View File

@@ -38,7 +38,7 @@ static inline void feedback_target_init(void)
}
}
#elif IS_ENABLED(CONFIG_SOC_SERIES_NRF54HX)
#elif IS_ENABLED(CONFIG_SOC_SERIES_NRF54H)
#include <hal/nrf_tdm.h>

2
samples/subsys/usb/uac2_implicit_feedback/CMakeLists.txt
View File

@@ -7,7 +7,7 @@ project(usb_audio_async_i2s)
include(${ZEPHYR_BASE}/samples/subsys/usb/common/common.cmake)
target_sources(app PRIVATE src/main.c)
if(CONFIG_SOC_COMPATIBLE_NRF5340_CPUAPP OR CONFIG_SOC_SERIES_NRF54HX)
if(CONFIG_SOC_COMPATIBLE_NRF5340_CPUAPP OR CONFIG_SOC_SERIES_NRF54H)
target_sources(app PRIVATE src/feedback_nrf.c)
else()
target_sources(app PRIVATE src/feedback_dummy.c)

2
samples/subsys/usb/uac2_implicit_feedback/src/feedback_nrf.c
View File

@@ -29,7 +29,7 @@ static inline void feedback_target_init(void)
/* No target specific init necessary */
}
#elif IS_ENABLED(CONFIG_SOC_SERIES_NRF54HX)
#elif IS_ENABLED(CONFIG_SOC_SERIES_NRF54H)
#include <hal/nrf_tdm.h>