diff --git a/boards/posix/nrf52_bsim/Kconfig.board b/boards/posix/nrf52_bsim/Kconfig.board index 10074c709fe..4a97c8d4cd2 100644 --- a/boards/posix/nrf52_bsim/Kconfig.board +++ b/boards/posix/nrf52_bsim/Kconfig.board @@ -10,19 +10,6 @@ config BOARD_NRF52_BSIM select CONSOLE_HAS_DRIVER select NRF_RTC_TIMER select CLOCK_CONTROL - # Indicate that the nRF RNG peripheral is present (actually a model - # of it), so that the corresponding driver becomes available (see - # dependencies of the ENTROPY_NRF5_RNG option). - select HAS_HW_NRF_RNG - # Indicate that CCM supports 8 bit length field, to support full - # length LL PDUs. - select HAS_HW_NRF_CCM_LFLEN_8BIT - # Indicate 2M support so that Phy procedure can be enabled. - select HAS_HW_NRF_RADIO_BLE_2M - # Do the same for the CLOCK and POWER peripherals, so that the nrfx - # drivers for them can be used. - select HAS_HW_NRF_CLOCK - select HAS_HW_NRF_POWER select HAS_NRFX help Will produce a console Linux process which can be executed natively. diff --git a/drivers/adc/Kconfig.nrfx b/drivers/adc/Kconfig.nrfx index 86a343b9a30..f27c1bb3180 100644 --- a/drivers/adc/Kconfig.nrfx +++ b/drivers/adc/Kconfig.nrfx @@ -3,14 +3,10 @@ # Copyright (c) 2018, Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -# Workaround for not being able to have commas in macro arguments -DT_COMPAT_NORDIC_NRF_ADC := nordic,nrf-adc -DT_COMPAT_NORDIC_NRF_SAADC := nordic,nrf-saadc - config ADC_NRFX_ADC bool "nRF ADC nrfx driver" + depends on HAS_HW_NRF_ADC default y - depends on HAS_HW_NRF_ADC && $(dt_nodelabel_has_compat,adc,$(DT_COMPAT_NORDIC_NRF_ADC)) select NRFX_ADC select ADC_CONFIGURABLE_INPUTS help @@ -28,8 +24,8 @@ config ADC_NRFX_ADC_CHANNEL_COUNT config ADC_NRFX_SAADC bool "nRF SAADC nrfx driver" + depends on HAS_HW_NRF_SAADC default y - depends on HAS_HW_NRF_SAADC && $(dt_nodelabel_has_compat,adc,$(DT_COMPAT_NORDIC_NRF_SAADC)) select ADC_CONFIGURABLE_INPUTS help Enable support for nrfx SAADC driver. diff --git a/drivers/audio/Kconfig.dmic_pdm_nrfx b/drivers/audio/Kconfig.dmic_pdm_nrfx index c91fc69f545..25d6920379e 100644 --- a/drivers/audio/Kconfig.dmic_pdm_nrfx +++ b/drivers/audio/Kconfig.dmic_pdm_nrfx @@ -1,12 +1,9 @@ # Copyright (c) 2021 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -# Workaround for not being able to have commas in macro arguments -DT_COMPAT_NORDIC_NRF_PDM := nordic,nrf-pdm - config AUDIO_DMIC_NRFX_PDM bool "nRF PDM nrfx driver" - depends on $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_PDM)) + depends on HAS_HW_NRF_PDM default y select NRFX_PDM help diff --git a/drivers/crypto/Kconfig.nrf_ecb b/drivers/crypto/Kconfig.nrf_ecb index 5181cdc3d1b..a654ce09c29 100644 --- a/drivers/crypto/Kconfig.nrf_ecb +++ b/drivers/crypto/Kconfig.nrf_ecb @@ -3,12 +3,9 @@ # Copyright (c) 2020 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -# Workaround for not being able to have commas in macro arguments -DT_COMPAT_NORDIC_NRF_ECB := nordic,nrf-ecb - config CRYPTO_NRF_ECB bool "nRF AES electronic codebook mode encryption" - depends on $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_ECB)) + depends on HAS_HW_NRF_ECB # Bluetooth controller uses the ECB peripheral directly # (see subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ecb.c), # hence this driver cannot be enabled together with it. diff --git a/drivers/i2c/Kconfig.nrfx b/drivers/i2c/Kconfig.nrfx index 987389c9992..e401da42b3f 100644 --- a/drivers/i2c/Kconfig.nrfx +++ b/drivers/i2c/Kconfig.nrfx @@ -12,18 +12,14 @@ menuconfig I2C_NRFX if I2C_NRFX -# Workaround for not being able to have commas in macro arguments -DT_COMPAT_NORDIC_NRF_TWI := nordic,nrf-twi -DT_COMPAT_NORDIC_NRF_TWIM := nordic,nrf-twim - config I2C_0_NRF_TWI - def_bool $(dt_nodelabel_has_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWI)) + def_bool HAS_HW_NRF_TWI0 select NRFX_TWI0 help Enable nRF TWI Master without EasyDMA on port 0. config I2C_0_NRF_TWIM - def_bool $(dt_nodelabel_has_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWIM)) + def_bool HAS_HW_NRF_TWIM0 select NRFX_TWIM0 help Enable nRF TWI Master with EasyDMA on port 0. @@ -31,13 +27,13 @@ config I2C_0_NRF_TWIM if provided buffer is placed in flash, transfer will fail. config I2C_1_NRF_TWI - def_bool $(dt_nodelabel_has_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWI)) + def_bool HAS_HW_NRF_TWI1 select NRFX_TWI1 help Enable nRF TWI Master without EasyDMA on port 1. config I2C_1_NRF_TWIM - def_bool $(dt_nodelabel_has_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWIM)) + def_bool HAS_HW_NRF_TWIM1 select NRFX_TWIM1 help Enable nRF TWI Master with EasyDMA on port 1. @@ -45,7 +41,7 @@ config I2C_1_NRF_TWIM if provided buffer is placed in flash, transfer will fail. config I2C_2_NRF_TWIM - def_bool $(dt_nodelabel_has_compat,i2c2,$(DT_COMPAT_NORDIC_NRF_TWIM)) + def_bool HAS_HW_NRF_TWIM2 select NRFX_TWIM2 help Enable nRF TWI Master with EasyDMA on port 2. @@ -53,7 +49,7 @@ config I2C_2_NRF_TWIM if provided buffer is placed in flash, transfer will fail. config I2C_3_NRF_TWIM - def_bool $(dt_nodelabel_has_compat,i2c3,$(DT_COMPAT_NORDIC_NRF_TWIM)) + def_bool HAS_HW_NRF_TWIM3 select NRFX_TWIM3 help Enable nRF TWI Master with EasyDMA on port 3. diff --git a/drivers/i2s/Kconfig.nrfx b/drivers/i2s/Kconfig.nrfx index bfd98f74d8c..84272a03d9e 100644 --- a/drivers/i2s/Kconfig.nrfx +++ b/drivers/i2s/Kconfig.nrfx @@ -1,12 +1,9 @@ # Copyright (c) 2021 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -# Workaround for not being able to have commas in macro arguments -DT_COMPAT_NORDIC_NRF_I2S := nordic,nrf-i2s - menuconfig I2S_NRFX bool "nRF I2S nrfx driver" - depends on $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_I2S)) + depends on HAS_HW_NRF_I2S default y select NRFX_I2S help diff --git a/drivers/pwm/Kconfig.nrfx b/drivers/pwm/Kconfig.nrfx index f925a3fc692..22d3b2691d9 100644 --- a/drivers/pwm/Kconfig.nrfx +++ b/drivers/pwm/Kconfig.nrfx @@ -4,11 +4,13 @@ config PWM_NRFX bool "nRF PWM nrfx driver" default y - depends on HAS_HW_NRF_PWM0 || HAS_HW_NRF_PWM1 || \ - HAS_HW_NRF_PWM2 || HAS_HW_NRF_PWM3 - select NRFX_PWM0 if "$(dt_nodelabel_enabled,pwm0)" - select NRFX_PWM1 if "$(dt_nodelabel_enabled,pwm1)" - select NRFX_PWM2 if "$(dt_nodelabel_enabled,pwm2)" - select NRFX_PWM3 if "$(dt_nodelabel_enabled,pwm3)" + depends on HAS_HW_NRF_PWM0 \ + || HAS_HW_NRF_PWM1 \ + || HAS_HW_NRF_PWM2 \ + || HAS_HW_NRF_PWM3 + select NRFX_PWM0 if HAS_HW_NRF_PWM0 + select NRFX_PWM1 if HAS_HW_NRF_PWM1 + select NRFX_PWM2 if HAS_HW_NRF_PWM2 + select NRFX_PWM3 if HAS_HW_NRF_PWM3 help Enable support for nrfx Hardware PWM driver for nRF52 MCU series. diff --git a/drivers/sensor/qdec_nrfx/Kconfig b/drivers/sensor/qdec_nrfx/Kconfig index 753b2158d7f..7ead738e301 100644 --- a/drivers/sensor/qdec_nrfx/Kconfig +++ b/drivers/sensor/qdec_nrfx/Kconfig @@ -3,7 +3,7 @@ config QDEC_NRFX bool "Nordic QDEC nrfx driver" - depends on HAS_HW_NRF_QDEC || HAS_HW_NRF_QDEC0 + depends on HAS_HW_NRF_QDEC0 select NRFX_QDEC help Enable support for nrfx QDEC driver for nRF MCU series. diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx index c7e129bfb15..db89bc34655 100644 --- a/drivers/serial/Kconfig.nrfx +++ b/drivers/serial/Kconfig.nrfx @@ -27,19 +27,15 @@ config UART_ASYNC_TX_CACHE_SIZE in RAM, because EasyDMA in UARTE peripherals can only transfer data from RAM. -# Workaround for not being able to have commas in macro arguments -DT_COMPAT_NORDIC_NRF_UART := nordic,nrf-uart -DT_COMPAT_NORDIC_NRF_UARTE := nordic,nrf-uarte - # ----------------- port 0 ----------------- config UART_0_NRF_UART - def_bool $(dt_nodelabel_has_compat,uart0,$(DT_COMPAT_NORDIC_NRF_UART)) + def_bool HAS_HW_NRF_UART0 select NRF_UART_PERIPHERAL help Enable nRF UART without EasyDMA on port 0. config UART_0_NRF_UARTE - def_bool $(dt_nodelabel_has_compat,uart0,$(DT_COMPAT_NORDIC_NRF_UARTE)) + def_bool HAS_HW_NRF_UARTE0 select NRF_UARTE_PERIPHERAL help Enable nRF UART with EasyDMA on port 0. @@ -119,7 +115,7 @@ endif # UART_0_NRF_UART || UART_0_NRF_UARTE # ----------------- port 1 ----------------- config UART_1_NRF_UARTE - def_bool $(dt_nodelabel_has_compat,uart1,$(DT_COMPAT_NORDIC_NRF_UARTE)) + def_bool HAS_HW_NRF_UARTE1 select NRF_UARTE_PERIPHERAL help Enable nRF UART with EasyDMA on port 1. @@ -196,7 +192,7 @@ endif # UART_1_NRF_UARTE # ----------------- port 2 ----------------- config UART_2_NRF_UARTE - def_bool $(dt_nodelabel_has_compat,uart2,$(DT_COMPAT_NORDIC_NRF_UARTE)) + def_bool HAS_HW_NRF_UARTE2 select NRF_UARTE_PERIPHERAL help Enable nRF UART with EasyDMA on port 2. @@ -272,7 +268,7 @@ endif # UART_2_NRF_UARTE # ----------------- port 3 ----------------- config UART_3_NRF_UARTE - def_bool $(dt_nodelabel_has_compat,uart3,$(DT_COMPAT_NORDIC_NRF_UARTE)) + def_bool HAS_HW_NRF_UARTE3 select NRF_UARTE_PERIPHERAL help Enable nRF UART with EasyDMA on port 3. @@ -349,59 +345,57 @@ endif # UART_3_NRF_UARTE config NRFX_TIMER0 default y - depends on UART_0_NRF_HW_ASYNC_TIMER = 0 || UART_1_NRF_HW_ASYNC_TIMER = 0 || \ - UART_3_NRF_HW_ASYNC_TIMER = 0 || UART_2_NRF_HW_ASYNC_TIMER = 0 + depends on UART_0_NRF_HW_ASYNC_TIMER = 0 \ + || UART_1_NRF_HW_ASYNC_TIMER = 0 \ + || UART_2_NRF_HW_ASYNC_TIMER = 0 \ + || UART_3_NRF_HW_ASYNC_TIMER = 0 config NRFX_TIMER1 default y - depends on UART_0_NRF_HW_ASYNC_TIMER = 1 || UART_1_NRF_HW_ASYNC_TIMER = 1 || \ - UART_3_NRF_HW_ASYNC_TIMER = 1 || UART_2_NRF_HW_ASYNC_TIMER = 1 + depends on UART_0_NRF_HW_ASYNC_TIMER = 1 \ + || UART_1_NRF_HW_ASYNC_TIMER = 1 \ + || UART_2_NRF_HW_ASYNC_TIMER = 1 \ + || UART_3_NRF_HW_ASYNC_TIMER = 1 config NRFX_TIMER2 default y - depends on UART_0_NRF_HW_ASYNC_TIMER = 2 || UART_1_NRF_HW_ASYNC_TIMER = 2 || \ - UART_3_NRF_HW_ASYNC_TIMER = 2 || UART_2_NRF_HW_ASYNC_TIMER = 2 + depends on UART_0_NRF_HW_ASYNC_TIMER = 2 \ + || UART_1_NRF_HW_ASYNC_TIMER = 2 \ + || UART_2_NRF_HW_ASYNC_TIMER = 2 \ + || UART_3_NRF_HW_ASYNC_TIMER = 2 config NRFX_TIMER3 default y - depends on UART_0_NRF_HW_ASYNC_TIMER = 3 || UART_1_NRF_HW_ASYNC_TIMER = 3 || \ - UART_3_NRF_HW_ASYNC_TIMER = 3 || UART_2_NRF_HW_ASYNC_TIMER = 3 + depends on UART_0_NRF_HW_ASYNC_TIMER = 3 \ + || UART_1_NRF_HW_ASYNC_TIMER = 3 \ + || UART_2_NRF_HW_ASYNC_TIMER = 3 \ + || UART_3_NRF_HW_ASYNC_TIMER = 3 config NRFX_TIMER4 default y - depends on UART_0_NRF_HW_ASYNC_TIMER = 4 || UART_1_NRF_HW_ASYNC_TIMER = 4 || \ - UART_3_NRF_HW_ASYNC_TIMER = 4 || UART_2_NRF_HW_ASYNC_TIMER = 4 + depends on UART_0_NRF_HW_ASYNC_TIMER = 4 \ + || UART_1_NRF_HW_ASYNC_TIMER = 4 \ + || UART_2_NRF_HW_ASYNC_TIMER = 4 \ + || UART_3_NRF_HW_ASYNC_TIMER = 4 -if UART_0_NRF_HW_ASYNC || UART_1_NRF_HW_ASYNC || UART_2_NRF_HW_ASYNC || UART_3_NRF_HW_ASYNC - -config NRFX_TIMER - default y - -config NRFX_PPI - depends on HAS_HW_NRF_PPI - default y - -config NRFX_DPPI - depends on HAS_HW_NRF_DPPIC - default y - config UARTE_NRF_HW_ASYNC - bool - default y - -endif - -if UART_0_ENHANCED_POLL_OUT || UART_1_ENHANCED_POLL_OUT || \ - UART_2_ENHANCED_POLL_OUT || UART_3_ENHANCED_POLL_OUT - -config UART_ENHANCED_POLL_OUT - bool - default y + def_bool y + depends on UART_0_NRF_HW_ASYNC \ + || UART_1_NRF_HW_ASYNC \ + || UART_2_NRF_HW_ASYNC \ + || UART_3_NRF_HW_ASYNC select NRFX_PPI if HAS_HW_NRF_PPI select NRFX_DPPI if HAS_HW_NRF_DPPIC -endif +config UART_ENHANCED_POLL_OUT + def_bool y + depends on UART_0_ENHANCED_POLL_OUT \ + || UART_1_ENHANCED_POLL_OUT \ + || UART_2_ENHANCED_POLL_OUT \ + || UART_3_ENHANCED_POLL_OUT + select NRFX_PPI if HAS_HW_NRF_PPI + select NRFX_DPPI if HAS_HW_NRF_DPPIC config NRF_UART_PERIPHERAL bool diff --git a/drivers/spi/Kconfig.nrfx b/drivers/spi/Kconfig.nrfx index 5d52e9b3d99..eacdfcc89d7 100644 --- a/drivers/spi/Kconfig.nrfx +++ b/drivers/spi/Kconfig.nrfx @@ -27,19 +27,14 @@ config SOC_NRF52832_ALLOW_SPIM_DESPITE_PAN_58 then nRF52832 PPI and GPIOTE resources can be saved by not enabling 'anomaly-58-workaround' via the Devicetree. -# Workaround for not being able to have commas in macro arguments -DT_COMPAT_NORDIC_NRF_SPI := nordic,nrf-spi -DT_COMPAT_NORDIC_NRF_SPIM := nordic,nrf-spim -DT_COMPAT_NORDIC_NRF_SPIS := nordic,nrf-spis - config SPI_0_NRF_SPI - def_bool $(dt_nodelabel_has_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPI)) + def_bool HAS_HW_NRF_SPI0 select NRFX_SPI0 help Enable nRF SPI Master without EasyDMA on port 0. config SPI_0_NRF_SPIM - def_bool $(dt_nodelabel_has_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPIM)) + def_bool HAS_HW_NRF_SPIM0 # This driver is not available for nRF52832 because of Product Anomaly 58 # (SPIM: An additional byte is clocked out when RXD.MAXCNT == 1 and TXD.MAXCNT <= 1) # Allow the 'EasyDMA' driver only if this automatic safety-disable is overridden @@ -49,7 +44,7 @@ config SPI_0_NRF_SPIM Enable nRF SPI Master with EasyDMA on port 0. config SPI_0_NRF_SPIS - def_bool $(dt_nodelabel_has_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPIS)) + def_bool HAS_HW_NRF_SPIS0 depends on SPI_SLAVE select NRFX_SPIS0 help @@ -67,13 +62,13 @@ config SPI_0_NRF_ORC of the transmit buffer. config SPI_1_NRF_SPI - def_bool $(dt_nodelabel_has_compat,spi1,$(DT_COMPAT_NORDIC_NRF_SPI)) + def_bool HAS_HW_NRF_SPI1 select NRFX_SPI1 help Enable nRF SPI Master without EasyDMA on port 1. config SPI_1_NRF_SPIM - def_bool $(dt_nodelabel_has_compat,spi1,$(DT_COMPAT_NORDIC_NRF_SPIM)) + def_bool HAS_HW_NRF_SPIM1 # This driver is not available for nRF52832 because of Product Anomaly 58 # (SPIM: An additional byte is clocked out when RXD.MAXCNT == 1 and TXD.MAXCNT <= 1) # Allow the 'EasyDMA' driver only if this automatic safety-disable is overridden @@ -83,7 +78,7 @@ config SPI_1_NRF_SPIM Enable nRF SPI Master with EasyDMA on port 1. config SPI_1_NRF_SPIS - def_bool $(dt_nodelabel_has_compat,spi1,$(DT_COMPAT_NORDIC_NRF_SPIS)) + def_bool HAS_HW_NRF_SPIS1 depends on SPI_SLAVE select NRFX_SPIS1 help @@ -101,13 +96,13 @@ config SPI_1_NRF_ORC of the transmit buffer. config SPI_2_NRF_SPI - def_bool $(dt_nodelabel_has_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPI)) + def_bool HAS_HW_NRF_SPI2 select NRFX_SPI2 help Enable nRF SPI Master without EasyDMA on port 2. config SPI_2_NRF_SPIM - def_bool $(dt_nodelabel_has_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPIM)) + def_bool HAS_HW_NRF_SPIM2 # This driver is not available for nRF52832 because of Product Anomaly 58 # (SPIM: An additional byte is clocked out when RXD.MAXCNT == 1 and TXD.MAXCNT <= 1) # Allow the 'EasyDMA' driver only if this automatic safety-disable is overridden @@ -117,7 +112,7 @@ config SPI_2_NRF_SPIM Enable nRF SPI Master with EasyDMA on port 2. config SPI_2_NRF_SPIS - def_bool $(dt_nodelabel_has_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPIS)) + def_bool HAS_HW_NRF_SPIS2 depends on SPI_SLAVE select NRFX_SPIS2 help @@ -135,13 +130,13 @@ config SPI_2_NRF_ORC of the transmit buffer. config SPI_3_NRF_SPIM - def_bool $(dt_nodelabel_has_compat,spi3,$(DT_COMPAT_NORDIC_NRF_SPIM)) + def_bool HAS_HW_NRF_SPIM3 select NRFX_SPIM3 help Enable nRF SPI Master with EasyDMA on port 3. config SPI_3_NRF_SPIS - def_bool $(dt_nodelabel_has_compat,spi3,$(DT_COMPAT_NORDIC_NRF_SPIS)) + def_bool HAS_HW_NRF_SPIS3 depends on SPI_SLAVE select NRFX_SPIS3 help @@ -169,7 +164,7 @@ config SPI_3_NRF_RX_DELAY until the input serial data on MISO is actually sampled. config SPI_4_NRF_SPIM - def_bool $(dt_nodelabel_has_compat,spi4,$(DT_COMPAT_NORDIC_NRF_SPIM)) + def_bool HAS_HW_NRF_SPIM4 select NRFX_SPIM4 help Enable nRF SPI Master with EasyDMA on port 4. diff --git a/drivers/watchdog/Kconfig.nrfx b/drivers/watchdog/Kconfig.nrfx index fc14f450002..b036df5f738 100644 --- a/drivers/watchdog/Kconfig.nrfx +++ b/drivers/watchdog/Kconfig.nrfx @@ -7,19 +7,7 @@ config WDT_NRFX bool "nRF WDT nrfx driver" default y depends on SOC_FAMILY_NRF - select NRFX_WDT + select NRFX_WDT0 if HAS_HW_NRF_WDT0 + select NRFX_WDT1 if HAS_HW_NRF_WDT1 help Enable support for nrfx WDT driver for nRF MCU series. - -config NRFX_WDT0 - bool "WDT0 instance" - depends on HAS_HW_NRF_WDT || HAS_HW_NRF_WDT0 - default y - help - Enable support for nrfx WDT instance 0. - -config NRFX_WDT1 - bool "WDT1 instance" - depends on HAS_HW_NRF_WDT1 - help - Enable support for nrfx WDT instance 1. diff --git a/soc/arm/nordic_nrf/Kconfig b/soc/arm/nordic_nrf/Kconfig index 0bba9988ed1..2030c98f12f 100644 --- a/soc/arm/nordic_nrf/Kconfig +++ b/soc/arm/nordic_nrf/Kconfig @@ -40,7 +40,7 @@ config NRF_ACL_FLASH_REGION_SIZE config NFCT_PINS_AS_GPIOS bool "NFCT pins as GPIOs" - depends on HAS_HW_NRF_NFCT + depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_NFCT)) help Two pins are usually reserved for NFC in SoCs that implement the NFCT peripheral. This option switches them to normal GPIO mode. diff --git a/soc/arm/nordic_nrf/Kconfig.peripherals b/soc/arm/nordic_nrf/Kconfig.peripherals index 604e9494a16..f5ae9041b6e 100644 --- a/soc/arm/nordic_nrf/Kconfig.peripherals +++ b/soc/arm/nordic_nrf/Kconfig.peripherals @@ -4,305 +4,301 @@ # SPDX-License-Identifier: Apache-2.0 config HAS_HW_NRF_ACL - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_ACL)) config HAS_HW_NRF_ADC - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_ADC)) config HAS_HW_NRF_BPROT - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_BPROT)) config HAS_HW_NRF_CC310 - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_CC310)) config HAS_HW_NRF_CC312 - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_CC312)) config HAS_HW_NRF_CCM - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_CCM)) config HAS_HW_NRF_CCM_LFLEN_8BIT - bool + def_bool $(dt_nodelabel_bool_prop,ccm,length-field-length-8-bits) config HAS_HW_NRF_CLOCK - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_CLOCK)) config HAS_HW_NRF_COMP - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_COMP)) config HAS_HW_NRF_CTRLAP - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_CTRLAPPERI)) config HAS_HW_NRF_DCNF - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_DCNF)) config HAS_HW_NRF_DPPIC - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_DPPIC)) config HAS_HW_NRF_ECB - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_ECB)) config HAS_HW_NRF_EGU0 - bool + def_bool $(dt_nodelabel_enabled_with_compat,egu0,$(DT_COMPAT_NORDIC_NRF_EGU)) config HAS_HW_NRF_EGU1 - bool + def_bool $(dt_nodelabel_enabled_with_compat,egu1,$(DT_COMPAT_NORDIC_NRF_EGU)) config HAS_HW_NRF_EGU2 - bool + def_bool $(dt_nodelabel_enabled_with_compat,egu2,$(DT_COMPAT_NORDIC_NRF_EGU)) config HAS_HW_NRF_EGU3 - bool + def_bool $(dt_nodelabel_enabled_with_compat,egu3,$(DT_COMPAT_NORDIC_NRF_EGU)) config HAS_HW_NRF_EGU4 - bool + def_bool $(dt_nodelabel_enabled_with_compat,egu4,$(DT_COMPAT_NORDIC_NRF_EGU)) config HAS_HW_NRF_EGU5 - bool + def_bool $(dt_nodelabel_enabled_with_compat,egu5,$(DT_COMPAT_NORDIC_NRF_EGU)) config HAS_HW_NRF_GPIO0 - bool + def_bool $(dt_nodelabel_enabled_with_compat,gpio0,$(DT_COMPAT_NORDIC_NRF_GPIO)) config HAS_HW_NRF_GPIO1 - bool + def_bool $(dt_nodelabel_enabled_with_compat,gpio1,$(DT_COMPAT_NORDIC_NRF_GPIO)) config HAS_HW_NRF_GPIOTE - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_GPIOTE)) config HAS_HW_NRF_I2S - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_I2S)) config HAS_HW_NRF_IPC - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_IPC)) config HAS_HW_NRF_KMU - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_KMU)) config HAS_HW_NRF_LPCOMP - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_LPCOMP)) config HAS_HW_NRF_MPU - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_MPU)) config HAS_HW_NRF_MUTEX - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_MUTEX)) config HAS_HW_NRF_MWU - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_MWU)) config HAS_HW_NRF_NFCT - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_NFCT)) -# NVMC supports partial erase config HAS_HW_NRF_NVMC_PE - bool + def_bool $(dt_nodelabel_bool_prop,flash_controller,partial-erase) config HAS_HW_NRF_OSCILLATORS - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_OSCILLATORS)) config HAS_HW_NRF_PDM - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_PDM)) config HAS_HW_NRF_POWER - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_POWER)) config HAS_HW_NRF_PPI - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_PPI)) config HAS_HW_NRF_PWM0 - bool + def_bool $(dt_nodelabel_enabled_with_compat,pwm0,$(DT_COMPAT_NORDIC_NRF_PWM)) config HAS_HW_NRF_PWM1 - bool + def_bool $(dt_nodelabel_enabled_with_compat,pwm1,$(DT_COMPAT_NORDIC_NRF_PWM)) config HAS_HW_NRF_PWM2 - bool + def_bool $(dt_nodelabel_enabled_with_compat,pwm2,$(DT_COMPAT_NORDIC_NRF_PWM)) config HAS_HW_NRF_PWM3 - bool - -config HAS_HW_NRF_QDEC - bool + def_bool $(dt_nodelabel_enabled_with_compat,pwm3,$(DT_COMPAT_NORDIC_NRF_PWM)) config HAS_HW_NRF_QDEC0 - bool + def_bool $(dt_nodelabel_enabled_with_compat,qdec0,$(DT_COMPAT_NORDIC_NRF_QDEC)) config HAS_HW_NRF_QDEC1 - bool + def_bool $(dt_nodelabel_enabled_with_compat,qdec1,$(DT_COMPAT_NORDIC_NRF_QDEC)) config HAS_HW_NRF_QSPI - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_QSPI)) config HAS_HW_NRF_RADIO_BLE_2M - bool - -config HAS_HW_NRF_RADIO_TX_PWR_HIGH - bool + def_bool $(dt_nodelabel_bool_prop,radio,ble-2mbps-supported) config HAS_HW_NRF_RADIO_BLE_CODED - bool + def_bool $(dt_nodelabel_bool_prop,radio,ble-coded-phy-supported) + +config HAS_HW_NRF_RADIO_DFE + def_bool $(dt_nodelabel_bool_prop,radio,dfe-supported) config HAS_HW_NRF_RADIO_IEEE802154 - bool + def_bool $(dt_nodelabel_bool_prop,radio,ieee802154-supported) + +config HAS_HW_NRF_RADIO_TX_PWR_HIGH + def_bool $(dt_nodelabel_bool_prop,radio,tx-high-power-supported) config HAS_HW_NRF_REGULATORS - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_REGULATORS)) config HAS_HW_NRF_RESET - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_RESET)) config HAS_HW_NRF_RNG - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_RNG)) config HAS_HW_NRF_RTC0 - bool + def_bool $(dt_nodelabel_enabled_with_compat,rtc0,$(DT_COMPAT_NORDIC_NRF_RTC)) config HAS_HW_NRF_RTC1 - bool + def_bool $(dt_nodelabel_enabled_with_compat,rtc1,$(DT_COMPAT_NORDIC_NRF_RTC)) config HAS_HW_NRF_RTC2 - bool + def_bool $(dt_nodelabel_enabled_with_compat,rtc2,$(DT_COMPAT_NORDIC_NRF_RTC)) config HAS_HW_NRF_SAADC - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_SAADC)) config HAS_HW_NRF_SPI0 - bool + def_bool $(dt_nodelabel_enabled_with_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPI)) config HAS_HW_NRF_SPI1 - bool + def_bool $(dt_nodelabel_enabled_with_compat,spi1,$(DT_COMPAT_NORDIC_NRF_SPI)) config HAS_HW_NRF_SPI2 - bool + def_bool $(dt_nodelabel_enabled_with_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPI)) config HAS_HW_NRF_SPIM0 - bool + def_bool $(dt_nodelabel_enabled_with_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPIM)) config HAS_HW_NRF_SPIM1 - bool + def_bool $(dt_nodelabel_enabled_with_compat,spi1,$(DT_COMPAT_NORDIC_NRF_SPIM)) config HAS_HW_NRF_SPIM2 - bool + def_bool $(dt_nodelabel_enabled_with_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPIM)) config HAS_HW_NRF_SPIM3 - bool + def_bool $(dt_nodelabel_enabled_with_compat,spi3,$(DT_COMPAT_NORDIC_NRF_SPIM)) config HAS_HW_NRF_SPIM4 - bool + def_bool $(dt_nodelabel_enabled_with_compat,spi4,$(DT_COMPAT_NORDIC_NRF_SPIM)) config HAS_HW_NRF_SPIS0 - bool + def_bool $(dt_nodelabel_enabled_with_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPIS)) config HAS_HW_NRF_SPIS1 - bool + def_bool $(dt_nodelabel_enabled_with_compat,spi1,$(DT_COMPAT_NORDIC_NRF_SPIS)) config HAS_HW_NRF_SPIS2 - bool + def_bool $(dt_nodelabel_enabled_with_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPIS)) config HAS_HW_NRF_SPIS3 - bool + def_bool $(dt_nodelabel_enabled_with_compat,spi3,$(DT_COMPAT_NORDIC_NRF_SPIS)) config HAS_HW_NRF_SPU - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_SPU)) config HAS_HW_NRF_SWI0 - bool + def_bool $(dt_nodelabel_enabled_with_compat,swi0,$(DT_COMPAT_NORDIC_NRF_SWI)) config HAS_HW_NRF_SWI1 - bool + def_bool $(dt_nodelabel_enabled_with_compat,swi1,$(DT_COMPAT_NORDIC_NRF_SWI)) config HAS_HW_NRF_SWI2 - bool + def_bool $(dt_nodelabel_enabled_with_compat,swi2,$(DT_COMPAT_NORDIC_NRF_SWI)) config HAS_HW_NRF_SWI3 - bool + def_bool $(dt_nodelabel_enabled_with_compat,swi3,$(DT_COMPAT_NORDIC_NRF_SWI)) config HAS_HW_NRF_SWI4 - bool + def_bool $(dt_nodelabel_enabled_with_compat,swi4,$(DT_COMPAT_NORDIC_NRF_SWI)) config HAS_HW_NRF_SWI5 - bool + def_bool $(dt_nodelabel_enabled_with_compat,swi5,$(DT_COMPAT_NORDIC_NRF_SWI)) config HAS_HW_NRF_TEMP - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_TEMP)) config HAS_HW_NRF_TIMER0 - bool + def_bool $(dt_nodelabel_enabled_with_compat,timer0,$(DT_COMPAT_NORDIC_NRF_TIMER)) config HAS_HW_NRF_TIMER1 - bool + def_bool $(dt_nodelabel_enabled_with_compat,timer1,$(DT_COMPAT_NORDIC_NRF_TIMER)) config HAS_HW_NRF_TIMER2 - bool + def_bool $(dt_nodelabel_enabled_with_compat,timer2,$(DT_COMPAT_NORDIC_NRF_TIMER)) config HAS_HW_NRF_TIMER3 - bool + def_bool $(dt_nodelabel_enabled_with_compat,timer3,$(DT_COMPAT_NORDIC_NRF_TIMER)) config HAS_HW_NRF_TIMER4 - bool + def_bool $(dt_nodelabel_enabled_with_compat,timer4,$(DT_COMPAT_NORDIC_NRF_TIMER)) config HAS_HW_NRF_TWI0 - bool + def_bool $(dt_nodelabel_enabled_with_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWI)) config HAS_HW_NRF_TWI1 - bool + def_bool $(dt_nodelabel_enabled_with_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWI)) config HAS_HW_NRF_TWIM0 - bool + def_bool $(dt_nodelabel_enabled_with_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWIM)) config HAS_HW_NRF_TWIM1 - bool + def_bool $(dt_nodelabel_enabled_with_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWIM)) config HAS_HW_NRF_TWIM2 - bool + def_bool $(dt_nodelabel_enabled_with_compat,i2c2,$(DT_COMPAT_NORDIC_NRF_TWIM)) config HAS_HW_NRF_TWIM3 - bool + def_bool $(dt_nodelabel_enabled_with_compat,i2c3,$(DT_COMPAT_NORDIC_NRF_TWIM)) config HAS_HW_NRF_TWIS0 - bool + def_bool $(dt_nodelabel_enabled_with_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWIS)) config HAS_HW_NRF_TWIS1 - bool + def_bool $(dt_nodelabel_enabled_with_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWIS)) config HAS_HW_NRF_TWIS2 - bool + def_bool $(dt_nodelabel_enabled_with_compat,i2c2,$(DT_COMPAT_NORDIC_NRF_TWIS)) config HAS_HW_NRF_TWIS3 - bool + def_bool $(dt_nodelabel_enabled_with_compat,i2c3,$(DT_COMPAT_NORDIC_NRF_TWIS)) config HAS_HW_NRF_UART0 - bool + def_bool $(dt_nodelabel_enabled_with_compat,uart0,$(DT_COMPAT_NORDIC_NRF_UART)) config HAS_HW_NRF_UARTE0 - bool + def_bool $(dt_nodelabel_enabled_with_compat,uart0,$(DT_COMPAT_NORDIC_NRF_UARTE)) config HAS_HW_NRF_UARTE1 - bool + def_bool $(dt_nodelabel_enabled_with_compat,uart1,$(DT_COMPAT_NORDIC_NRF_UARTE)) config HAS_HW_NRF_UARTE2 - bool + def_bool $(dt_nodelabel_enabled_with_compat,uart2,$(DT_COMPAT_NORDIC_NRF_UARTE)) config HAS_HW_NRF_UARTE3 - bool + def_bool $(dt_nodelabel_enabled_with_compat,uart3,$(DT_COMPAT_NORDIC_NRF_UARTE)) config HAS_HW_NRF_USBD - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_USBD)) config HAS_HW_NRF_USBREG - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_USBREG)) config HAS_HW_NRF_VMC - bool - -config HAS_HW_NRF_WDT - bool + def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_VMC)) config HAS_HW_NRF_WDT0 - bool + def_bool $(dt_nodelabel_enabled_with_compat,wdt0,$(DT_COMPAT_NORDIC_NRF_WDT)) config HAS_HW_NRF_WDT1 - bool + def_bool $(dt_nodelabel_enabled_with_compat,wdt1,$(DT_COMPAT_NORDIC_NRF_WDT)) # Reserved HW peripherals config NRF_HW_TIMER0_RESERVED diff --git a/soc/arm/nordic_nrf/nrf51/Kconfig.soc b/soc/arm/nordic_nrf/nrf51/Kconfig.soc index 28130910be4..aa42e2a729a 100644 --- a/soc/arm/nordic_nrf/nrf51/Kconfig.soc +++ b/soc/arm/nordic_nrf/nrf51/Kconfig.soc @@ -9,86 +9,11 @@ choice config SOC_NRF51822_QFAA bool "NRF51822_QFAA" - select HAS_HW_NRF_ADC - select HAS_HW_NRF_CCM - select HAS_HW_NRF_CLOCK - select HAS_HW_NRF_ECB - select HAS_HW_NRF_GPIO0 - select HAS_HW_NRF_GPIOTE - select HAS_HW_NRF_LPCOMP - select HAS_HW_NRF_MPU - select HAS_HW_NRF_QDEC - select HAS_HW_NRF_POWER - select HAS_HW_NRF_PPI - select HAS_HW_NRF_RNG - select HAS_HW_NRF_RTC0 - select HAS_HW_NRF_RTC1 - select HAS_HW_NRF_SPI0 - select HAS_HW_NRF_SPI1 - select HAS_HW_NRF_SPIS1 - select HAS_HW_NRF_TEMP - select HAS_HW_NRF_TIMER0 - select HAS_HW_NRF_TIMER1 - select HAS_HW_NRF_TIMER2 - select HAS_HW_NRF_TWI0 - select HAS_HW_NRF_TWI1 - select HAS_HW_NRF_UART0 - select HAS_HW_NRF_WDT config SOC_NRF51822_QFAB bool "NRF51822_QFAB" - select HAS_HW_NRF_ADC - select HAS_HW_NRF_CCM - select HAS_HW_NRF_CLOCK - select HAS_HW_NRF_ECB - select HAS_HW_NRF_GPIO0 - select HAS_HW_NRF_GPIOTE - select HAS_HW_NRF_LPCOMP - select HAS_HW_NRF_MPU - select HAS_HW_NRF_QDEC - select HAS_HW_NRF_POWER - select HAS_HW_NRF_PPI - select HAS_HW_NRF_RNG - select HAS_HW_NRF_RTC0 - select HAS_HW_NRF_RTC1 - select HAS_HW_NRF_SPI0 - select HAS_HW_NRF_SPI1 - select HAS_HW_NRF_SPIS1 - select HAS_HW_NRF_TEMP - select HAS_HW_NRF_TIMER0 - select HAS_HW_NRF_TIMER1 - select HAS_HW_NRF_TIMER2 - select HAS_HW_NRF_TWI0 - select HAS_HW_NRF_TWI1 - select HAS_HW_NRF_UART0 - select HAS_HW_NRF_WDT config SOC_NRF51822_QFAC bool "NRF51822_QFAC" - select HAS_HW_NRF_ADC - select HAS_HW_NRF_CCM - select HAS_HW_NRF_CLOCK - select HAS_HW_NRF_ECB - select HAS_HW_NRF_GPIO0 - select HAS_HW_NRF_GPIOTE - select HAS_HW_NRF_LPCOMP - select HAS_HW_NRF_MPU - select HAS_HW_NRF_QDEC - select HAS_HW_NRF_POWER - select HAS_HW_NRF_PPI - select HAS_HW_NRF_RNG - select HAS_HW_NRF_RTC0 - select HAS_HW_NRF_RTC1 - select HAS_HW_NRF_SPI0 - select HAS_HW_NRF_SPI1 - select HAS_HW_NRF_SPIS1 - select HAS_HW_NRF_TEMP - select HAS_HW_NRF_TIMER0 - select HAS_HW_NRF_TIMER1 - select HAS_HW_NRF_TIMER2 - select HAS_HW_NRF_TWI0 - select HAS_HW_NRF_TWI1 - select HAS_HW_NRF_UART0 - select HAS_HW_NRF_WDT endchoice diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.soc b/soc/arm/nordic_nrf/nrf52/Kconfig.soc index 05adae88def..cc0d2d81197 100644 --- a/soc/arm/nordic_nrf/nrf52/Kconfig.soc +++ b/soc/arm/nordic_nrf/nrf52/Kconfig.soc @@ -6,189 +6,18 @@ config SOC_NRF52805 depends on SOC_SERIES_NRF52X bool - select HAS_HW_NRF_BPROT - select HAS_HW_NRF_CCM - select HAS_HW_NRF_CCM_LFLEN_8BIT - select HAS_HW_NRF_CLOCK - select HAS_HW_NRF_ECB - select HAS_HW_NRF_EGU0 - select HAS_HW_NRF_EGU1 - select HAS_HW_NRF_GPIO0 - select HAS_HW_NRF_GPIOTE - select HAS_HW_NRF_NVMC_PE - select HAS_HW_NRF_POWER - select HAS_HW_NRF_PPI - select HAS_HW_NRF_QDEC - select HAS_HW_NRF_RADIO_BLE_2M - select HAS_HW_NRF_RNG - select HAS_HW_NRF_RTC0 - select HAS_HW_NRF_RTC1 - select HAS_HW_NRF_SAADC - select HAS_HW_NRF_SPI0 - select HAS_HW_NRF_SPIM0 - select HAS_HW_NRF_SPIS0 - select HAS_HW_NRF_SWI0 - select HAS_HW_NRF_SWI1 - select HAS_HW_NRF_SWI2 - select HAS_HW_NRF_SWI3 - select HAS_HW_NRF_SWI4 - select HAS_HW_NRF_SWI5 - select HAS_HW_NRF_TEMP - select HAS_HW_NRF_TIMER0 - select HAS_HW_NRF_TIMER1 - select HAS_HW_NRF_TIMER2 - select HAS_HW_NRF_TWI0 - select HAS_HW_NRF_TWIM0 - select HAS_HW_NRF_TWIS0 - select HAS_HW_NRF_UART0 - select HAS_HW_NRF_UARTE0 - select HAS_HW_NRF_WDT config SOC_NRF52810 depends on SOC_SERIES_NRF52X bool - select HAS_HW_NRF_BPROT - select HAS_HW_NRF_CCM - select HAS_HW_NRF_CCM_LFLEN_8BIT - select HAS_HW_NRF_CLOCK - select HAS_HW_NRF_COMP - select HAS_HW_NRF_ECB - select HAS_HW_NRF_EGU0 - select HAS_HW_NRF_EGU1 - select HAS_HW_NRF_GPIO0 - select HAS_HW_NRF_GPIOTE - select HAS_HW_NRF_NVMC_PE - select HAS_HW_NRF_PDM - select HAS_HW_NRF_POWER - select HAS_HW_NRF_PPI - select HAS_HW_NRF_PWM0 - select HAS_HW_NRF_QDEC - select HAS_HW_NRF_RADIO_BLE_2M - select HAS_HW_NRF_RNG - select HAS_HW_NRF_RTC0 - select HAS_HW_NRF_RTC1 - select HAS_HW_NRF_SAADC - select HAS_HW_NRF_SPI0 - select HAS_HW_NRF_SPIM0 - select HAS_HW_NRF_SPIS0 - select HAS_HW_NRF_SWI0 - select HAS_HW_NRF_SWI1 - select HAS_HW_NRF_SWI2 - select HAS_HW_NRF_SWI3 - select HAS_HW_NRF_SWI4 - select HAS_HW_NRF_SWI5 - select HAS_HW_NRF_TEMP - select HAS_HW_NRF_TIMER0 - select HAS_HW_NRF_TIMER1 - select HAS_HW_NRF_TIMER2 - select HAS_HW_NRF_TWI0 - select HAS_HW_NRF_TWIM0 - select HAS_HW_NRF_TWIS0 - select HAS_HW_NRF_UART0 - select HAS_HW_NRF_UARTE0 - select HAS_HW_NRF_WDT config SOC_NRF52811 depends on SOC_SERIES_NRF52X bool - select HAS_HW_NRF_BPROT - select HAS_HW_NRF_CCM - select HAS_HW_NRF_CCM_LFLEN_8BIT - select HAS_HW_NRF_CLOCK - select HAS_HW_NRF_COMP - select HAS_HW_NRF_ECB - select HAS_HW_NRF_EGU0 - select HAS_HW_NRF_EGU1 - select HAS_HW_NRF_GPIO0 - select HAS_HW_NRF_GPIOTE - select HAS_HW_NRF_NVMC_PE - select HAS_HW_NRF_PDM - select HAS_HW_NRF_POWER - select HAS_HW_NRF_PPI - select HAS_HW_NRF_PWM0 - select HAS_HW_NRF_QDEC - select HAS_HW_NRF_RADIO_BLE_2M - select HAS_HW_NRF_RADIO_BLE_CODED - select HAS_HW_NRF_RADIO_IEEE802154 - select HAS_HW_NRF_RNG - select HAS_HW_NRF_RTC0 - select HAS_HW_NRF_RTC1 - select HAS_HW_NRF_SAADC - select HAS_HW_NRF_SPI0 - select HAS_HW_NRF_SPIM0 - select HAS_HW_NRF_SPIS0 - select HAS_HW_NRF_SPI1 - select HAS_HW_NRF_SPIM1 - select HAS_HW_NRF_SPIS1 - select HAS_HW_NRF_SWI0 - select HAS_HW_NRF_SWI1 - select HAS_HW_NRF_SWI2 - select HAS_HW_NRF_SWI3 - select HAS_HW_NRF_SWI4 - select HAS_HW_NRF_SWI5 - select HAS_HW_NRF_TEMP - select HAS_HW_NRF_TIMER0 - select HAS_HW_NRF_TIMER1 - select HAS_HW_NRF_TIMER2 - select HAS_HW_NRF_TWI0 - select HAS_HW_NRF_TWIM0 - select HAS_HW_NRF_TWIS0 - select HAS_HW_NRF_UART0 - select HAS_HW_NRF_UARTE0 - select HAS_HW_NRF_WDT config SOC_NRF52820 depends on SOC_SERIES_NRF52X bool - select HAS_HW_NRF_ACL - select HAS_HW_NRF_CCM - select HAS_HW_NRF_CCM_LFLEN_8BIT - select HAS_HW_NRF_CLOCK - select HAS_HW_NRF_COMP - select HAS_HW_NRF_ECB - select HAS_HW_NRF_EGU0 - select HAS_HW_NRF_EGU1 - select HAS_HW_NRF_EGU2 - select HAS_HW_NRF_EGU3 - select HAS_HW_NRF_EGU4 - select HAS_HW_NRF_EGU5 - select HAS_HW_NRF_GPIO0 - select HAS_HW_NRF_GPIOTE - select HAS_HW_NRF_POWER - select HAS_HW_NRF_PPI - select HAS_HW_NRF_QDEC - select HAS_HW_NRF_RADIO_BLE_2M - select HAS_HW_NRF_RADIO_TX_PWR_HIGH - select HAS_HW_NRF_RADIO_BLE_CODED - select HAS_HW_NRF_RNG - select HAS_HW_NRF_RTC0 - select HAS_HW_NRF_RTC1 - select HAS_HW_NRF_SPI0 - select HAS_HW_NRF_SPI1 - select HAS_HW_NRF_SPIM0 - select HAS_HW_NRF_SPIM1 - select HAS_HW_NRF_SPIS0 - select HAS_HW_NRF_SPIS1 - select HAS_HW_NRF_SWI0 - select HAS_HW_NRF_SWI1 - select HAS_HW_NRF_SWI2 - select HAS_HW_NRF_SWI3 - select HAS_HW_NRF_SWI4 - select HAS_HW_NRF_SWI5 - select HAS_HW_NRF_TEMP - select HAS_HW_NRF_TIMER0 - select HAS_HW_NRF_TIMER1 - select HAS_HW_NRF_TIMER2 - select HAS_HW_NRF_TWI0 - select HAS_HW_NRF_TWI1 - select HAS_HW_NRF_TWIM0 - select HAS_HW_NRF_TWIM1 - select HAS_HW_NRF_TWIS0 - select HAS_HW_NRF_TWIS1 - select HAS_HW_NRF_UART0 - select HAS_HW_NRF_UARTE0 - select HAS_HW_NRF_USBD - select HAS_HW_NRF_WDT config SOC_NRF52832 depends on SOC_SERIES_NRF52X @@ -196,221 +25,18 @@ config SOC_NRF52832 select SOC_COMPATIBLE_NRF52832 select CPU_CORTEX_M_HAS_DWT select CPU_HAS_FPU - select HAS_HW_NRF_BPROT - select HAS_HW_NRF_CCM - select HAS_HW_NRF_CCM_LFLEN_8BIT - select HAS_HW_NRF_CLOCK - select HAS_HW_NRF_COMP - select HAS_HW_NRF_ECB - select HAS_HW_NRF_EGU0 - select HAS_HW_NRF_EGU1 - select HAS_HW_NRF_EGU2 - select HAS_HW_NRF_EGU3 - select HAS_HW_NRF_EGU4 - select HAS_HW_NRF_EGU5 - select HAS_HW_NRF_GPIO0 - select HAS_HW_NRF_GPIOTE - select HAS_HW_NRF_I2S - select HAS_HW_NRF_LPCOMP - select HAS_HW_NRF_MWU - select HAS_HW_NRF_NFCT - select HAS_HW_NRF_PDM - select HAS_HW_NRF_POWER - select HAS_HW_NRF_PPI - select HAS_HW_NRF_PWM0 - select HAS_HW_NRF_PWM1 - select HAS_HW_NRF_PWM2 - select HAS_HW_NRF_QDEC - select HAS_HW_NRF_RADIO_BLE_2M - select HAS_HW_NRF_RNG - select HAS_HW_NRF_RTC0 - select HAS_HW_NRF_RTC1 - select HAS_HW_NRF_RTC2 - select HAS_HW_NRF_SAADC - select HAS_HW_NRF_SPI0 - select HAS_HW_NRF_SPI1 - select HAS_HW_NRF_SPI2 - select HAS_HW_NRF_SPIM0 - select HAS_HW_NRF_SPIM1 - select HAS_HW_NRF_SPIM2 - select HAS_HW_NRF_SPIS0 - select HAS_HW_NRF_SPIS1 - select HAS_HW_NRF_SPIS2 - select HAS_HW_NRF_SWI0 - select HAS_HW_NRF_SWI1 - select HAS_HW_NRF_SWI2 - select HAS_HW_NRF_SWI3 - select HAS_HW_NRF_SWI4 - select HAS_HW_NRF_SWI5 - select HAS_HW_NRF_TEMP - select HAS_HW_NRF_TIMER0 - select HAS_HW_NRF_TIMER1 - select HAS_HW_NRF_TIMER2 - select HAS_HW_NRF_TIMER3 - select HAS_HW_NRF_TIMER4 - select HAS_HW_NRF_TWI0 - select HAS_HW_NRF_TWI1 - select HAS_HW_NRF_TWIM0 - select HAS_HW_NRF_TWIM1 - select HAS_HW_NRF_TWIS0 - select HAS_HW_NRF_TWIS1 - select HAS_HW_NRF_UART0 - select HAS_HW_NRF_UARTE0 - select HAS_HW_NRF_WDT config SOC_NRF52833 depends on SOC_SERIES_NRF52X bool select CPU_CORTEX_M_HAS_DWT select CPU_HAS_FPU - select HAS_HW_NRF_ACL - select HAS_HW_NRF_CCM - select HAS_HW_NRF_CCM_LFLEN_8BIT - select HAS_HW_NRF_CLOCK - select HAS_HW_NRF_COMP - select HAS_HW_NRF_ECB - select HAS_HW_NRF_EGU0 - select HAS_HW_NRF_EGU1 - select HAS_HW_NRF_EGU2 - select HAS_HW_NRF_EGU3 - select HAS_HW_NRF_EGU4 - select HAS_HW_NRF_EGU5 - select HAS_HW_NRF_GPIO0 - select HAS_HW_NRF_GPIO1 - select HAS_HW_NRF_GPIOTE - select HAS_HW_NRF_I2S - select HAS_HW_NRF_LPCOMP - select HAS_HW_NRF_MWU - select HAS_HW_NRF_NFCT - select HAS_HW_NRF_NVMC_PE - select HAS_HW_NRF_PDM - select HAS_HW_NRF_POWER - select HAS_HW_NRF_PPI - select HAS_HW_NRF_PWM0 - select HAS_HW_NRF_PWM1 - select HAS_HW_NRF_PWM2 - select HAS_HW_NRF_PWM3 - select HAS_HW_NRF_QDEC - select HAS_HW_NRF_RADIO_BLE_2M - select HAS_HW_NRF_RADIO_TX_PWR_HIGH - select HAS_HW_NRF_RADIO_BLE_CODED - select HAS_HW_NRF_RADIO_IEEE802154 - select HAS_HW_NRF_RNG - select HAS_HW_NRF_RTC0 - select HAS_HW_NRF_RTC1 - select HAS_HW_NRF_RTC2 - select HAS_HW_NRF_SAADC - select HAS_HW_NRF_SPI0 - select HAS_HW_NRF_SPI1 - select HAS_HW_NRF_SPI2 - select HAS_HW_NRF_SPIM0 - select HAS_HW_NRF_SPIM1 - select HAS_HW_NRF_SPIM2 - select HAS_HW_NRF_SPIM3 - select HAS_HW_NRF_SPIS0 - select HAS_HW_NRF_SPIS1 - select HAS_HW_NRF_SPIS2 - select HAS_HW_NRF_SWI0 - select HAS_HW_NRF_SWI1 - select HAS_HW_NRF_SWI2 - select HAS_HW_NRF_SWI3 - select HAS_HW_NRF_SWI4 - select HAS_HW_NRF_SWI5 - select HAS_HW_NRF_TEMP - select HAS_HW_NRF_TIMER0 - select HAS_HW_NRF_TIMER1 - select HAS_HW_NRF_TIMER2 - select HAS_HW_NRF_TIMER3 - select HAS_HW_NRF_TIMER4 - select HAS_HW_NRF_TWI0 - select HAS_HW_NRF_TWI1 - select HAS_HW_NRF_TWIM0 - select HAS_HW_NRF_TWIM1 - select HAS_HW_NRF_TWIS0 - select HAS_HW_NRF_TWIS1 - select HAS_HW_NRF_UART0 - select HAS_HW_NRF_UARTE0 - select HAS_HW_NRF_UARTE1 - select HAS_HW_NRF_USBD - select HAS_HW_NRF_WDT config SOC_NRF52840 depends on SOC_SERIES_NRF52X bool select CPU_CORTEX_M_HAS_DWT select CPU_HAS_FPU - select HAS_HW_NRF_ACL - select HAS_HW_NRF_CC310 - select HAS_HW_NRF_CCM - select HAS_HW_NRF_CCM_LFLEN_8BIT - select HAS_HW_NRF_CLOCK - select HAS_HW_NRF_COMP - select HAS_HW_NRF_ECB - select HAS_HW_NRF_EGU0 - select HAS_HW_NRF_EGU1 - select HAS_HW_NRF_EGU2 - select HAS_HW_NRF_EGU3 - select HAS_HW_NRF_EGU4 - select HAS_HW_NRF_EGU5 - select HAS_HW_NRF_GPIO0 - select HAS_HW_NRF_GPIO1 - select HAS_HW_NRF_GPIOTE - select HAS_HW_NRF_I2S - select HAS_HW_NRF_LPCOMP - select HAS_HW_NRF_MWU - select HAS_HW_NRF_NFCT - select HAS_HW_NRF_NVMC_PE - select HAS_HW_NRF_PDM - select HAS_HW_NRF_POWER - select HAS_HW_NRF_PPI - select HAS_HW_NRF_PWM0 - select HAS_HW_NRF_PWM1 - select HAS_HW_NRF_PWM2 - select HAS_HW_NRF_PWM3 - select HAS_HW_NRF_QDEC - select HAS_HW_NRF_QSPI - select HAS_HW_NRF_RADIO_BLE_2M - select HAS_HW_NRF_RADIO_TX_PWR_HIGH - select HAS_HW_NRF_RADIO_BLE_CODED - select HAS_HW_NRF_RADIO_IEEE802154 - select HAS_HW_NRF_RNG - select HAS_HW_NRF_RTC0 - select HAS_HW_NRF_RTC1 - select HAS_HW_NRF_RTC2 - select HAS_HW_NRF_SAADC - select HAS_HW_NRF_SPI0 - select HAS_HW_NRF_SPI1 - select HAS_HW_NRF_SPI2 - select HAS_HW_NRF_SPIM0 - select HAS_HW_NRF_SPIM1 - select HAS_HW_NRF_SPIM2 - select HAS_HW_NRF_SPIM3 - select HAS_HW_NRF_SPIS0 - select HAS_HW_NRF_SPIS1 - select HAS_HW_NRF_SPIS2 - select HAS_HW_NRF_SWI0 - select HAS_HW_NRF_SWI1 - select HAS_HW_NRF_SWI2 - select HAS_HW_NRF_SWI3 - select HAS_HW_NRF_SWI4 - select HAS_HW_NRF_SWI5 - select HAS_HW_NRF_TEMP - select HAS_HW_NRF_TIMER0 - select HAS_HW_NRF_TIMER1 - select HAS_HW_NRF_TIMER2 - select HAS_HW_NRF_TIMER3 - select HAS_HW_NRF_TIMER4 - select HAS_HW_NRF_TWI0 - select HAS_HW_NRF_TWI1 - select HAS_HW_NRF_TWIM0 - select HAS_HW_NRF_TWIM1 - select HAS_HW_NRF_TWIS0 - select HAS_HW_NRF_TWIS1 - select HAS_HW_NRF_UART0 - select HAS_HW_NRF_UARTE0 - select HAS_HW_NRF_UARTE1 - select HAS_HW_NRF_USBD - select HAS_HW_NRF_WDT choice prompt "nRF52x MCU Selection" diff --git a/soc/arm/nordic_nrf/nrf53/Kconfig.soc b/soc/arm/nordic_nrf/nrf53/Kconfig.soc index e4a52d0c118..68c2ec0928e 100644 --- a/soc/arm/nordic_nrf/nrf53/Kconfig.soc +++ b/soc/arm/nordic_nrf/nrf53/Kconfig.soc @@ -9,109 +9,9 @@ config SOC_NRF5340_CPUAPP select CPU_HAS_NRF_IDAU select CPU_HAS_FPU select ARMV8_M_DSP - select HAS_HW_NRF_CC312 - select HAS_HW_NRF_COMP - select HAS_HW_NRF_CLOCK - select HAS_HW_NRF_CTRLAP - select HAS_HW_NRF_DCNF - select HAS_HW_NRF_DPPIC - select HAS_HW_NRF_EGU0 - select HAS_HW_NRF_EGU1 - select HAS_HW_NRF_EGU2 - select HAS_HW_NRF_EGU3 - select HAS_HW_NRF_EGU4 - select HAS_HW_NRF_EGU5 - select HAS_HW_NRF_GPIO0 - select HAS_HW_NRF_GPIO1 - select HAS_HW_NRF_GPIOTE - select HAS_HW_NRF_I2S - select HAS_HW_NRF_IPC - select HAS_HW_NRF_KMU - select HAS_HW_NRF_LPCOMP - select HAS_HW_NRF_MUTEX - select HAS_HW_NRF_NFCT - select HAS_HW_NRF_NVMC_PE - select HAS_HW_NRF_OSCILLATORS - select HAS_HW_NRF_PDM - select HAS_HW_NRF_POWER - select HAS_HW_NRF_PWM0 - select HAS_HW_NRF_PWM1 - select HAS_HW_NRF_PWM2 - select HAS_HW_NRF_PWM3 - select HAS_HW_NRF_QDEC0 - select HAS_HW_NRF_QDEC1 - select HAS_HW_NRF_QSPI - select HAS_HW_NRF_REGULATORS - select HAS_HW_NRF_RESET - select HAS_HW_NRF_RTC0 - select HAS_HW_NRF_RTC1 - select HAS_HW_NRF_SAADC - select HAS_HW_NRF_SPIM0 - select HAS_HW_NRF_SPIM1 - select HAS_HW_NRF_SPIM2 - select HAS_HW_NRF_SPIM3 - select HAS_HW_NRF_SPIM4 - select HAS_HW_NRF_SPIS0 - select HAS_HW_NRF_SPIS1 - select HAS_HW_NRF_SPIS2 - select HAS_HW_NRF_SPIS3 - select HAS_HW_NRF_SPU - select HAS_HW_NRF_TIMER0 - select HAS_HW_NRF_TIMER1 - select HAS_HW_NRF_TIMER2 - select HAS_HW_NRF_TWIM0 - select HAS_HW_NRF_TWIM1 - select HAS_HW_NRF_TWIM2 - select HAS_HW_NRF_TWIM3 - select HAS_HW_NRF_TWIS0 - select HAS_HW_NRF_TWIS1 - select HAS_HW_NRF_TWIS2 - select HAS_HW_NRF_TWIS3 - select HAS_HW_NRF_UARTE0 - select HAS_HW_NRF_UARTE1 - select HAS_HW_NRF_UARTE2 - select HAS_HW_NRF_UARTE3 - select HAS_HW_NRF_USBD - select HAS_HW_NRF_USBREG - select HAS_HW_NRF_VMC - select HAS_HW_NRF_WDT0 - select HAS_HW_NRF_WDT1 config SOC_NRF5340_CPUNET bool - select HAS_HW_NRF_ACL - select HAS_HW_NRF_CLOCK - select HAS_HW_NRF_CCM - select HAS_HW_NRF_CCM_LFLEN_8BIT - select HAS_HW_NRF_DPPIC - select HAS_HW_NRF_ECB - select HAS_HW_NRF_EGU0 - select HAS_HW_NRF_GPIO0 - select HAS_HW_NRF_GPIO1 - select HAS_HW_NRF_GPIOTE - select HAS_HW_NRF_IPC - select HAS_HW_NRF_NVMC_PE - select HAS_HW_NRF_POWER - select HAS_HW_NRF_RADIO_BLE_2M - select HAS_HW_NRF_RADIO_BLE_CODED - select HAS_HW_NRF_RADIO_IEEE802154 - select HAS_HW_NRF_RNG - select HAS_HW_NRF_RTC0 - select HAS_HW_NRF_RTC1 - select HAS_HW_NRF_SPIM0 - select HAS_HW_NRF_SPIS0 - select HAS_HW_NRF_SWI0 - select HAS_HW_NRF_SWI1 - select HAS_HW_NRF_SWI2 - select HAS_HW_NRF_SWI3 - select HAS_HW_NRF_TEMP - select HAS_HW_NRF_TIMER0 - select HAS_HW_NRF_TIMER1 - select HAS_HW_NRF_TIMER2 - select HAS_HW_NRF_TWIM0 - select HAS_HW_NRF_TWIS0 - select HAS_HW_NRF_UARTE0 - select HAS_HW_NRF_WDT select HAS_NO_PM choice diff --git a/soc/arm/nordic_nrf/nrf91/Kconfig.soc b/soc/arm/nordic_nrf/nrf91/Kconfig.soc index b9191da2249..0d5e7992498 100644 --- a/soc/arm/nordic_nrf/nrf91/Kconfig.soc +++ b/soc/arm/nordic_nrf/nrf91/Kconfig.soc @@ -6,58 +6,6 @@ config SOC_NRF9160 depends on SOC_SERIES_NRF91X bool - select HAS_HW_NRF_CC310 - select HAS_HW_NRF_CLOCK - select HAS_HW_NRF_CTRLAP - select HAS_HW_NRF_DPPIC - select HAS_HW_NRF_EGU0 - select HAS_HW_NRF_EGU1 - select HAS_HW_NRF_EGU2 - select HAS_HW_NRF_EGU3 - select HAS_HW_NRF_EGU4 - select HAS_HW_NRF_EGU5 - select HAS_HW_NRF_GPIO0 - select HAS_HW_NRF_GPIOTE - select HAS_HW_NRF_I2S - select HAS_HW_NRF_IPC - select HAS_HW_NRF_KMU - select HAS_HW_NRF_NVMC_PE - select HAS_HW_NRF_PDM - select HAS_HW_NRF_POWER - select HAS_HW_NRF_PWM0 - select HAS_HW_NRF_PWM1 - select HAS_HW_NRF_PWM2 - select HAS_HW_NRF_PWM3 - select HAS_HW_NRF_REGULATORS - select HAS_HW_NRF_RTC0 - select HAS_HW_NRF_RTC1 - select HAS_HW_NRF_SAADC - select HAS_HW_NRF_SPIM0 - select HAS_HW_NRF_SPIM1 - select HAS_HW_NRF_SPIM2 - select HAS_HW_NRF_SPIM3 - select HAS_HW_NRF_SPIS0 - select HAS_HW_NRF_SPIS1 - select HAS_HW_NRF_SPIS2 - select HAS_HW_NRF_SPIS3 - select HAS_HW_NRF_SPU - select HAS_HW_NRF_TIMER0 - select HAS_HW_NRF_TIMER1 - select HAS_HW_NRF_TIMER2 - select HAS_HW_NRF_TWIM0 - select HAS_HW_NRF_TWIM1 - select HAS_HW_NRF_TWIM2 - select HAS_HW_NRF_TWIM3 - select HAS_HW_NRF_TWIS0 - select HAS_HW_NRF_TWIS1 - select HAS_HW_NRF_TWIS2 - select HAS_HW_NRF_TWIS3 - select HAS_HW_NRF_UARTE0 - select HAS_HW_NRF_UARTE1 - select HAS_HW_NRF_UARTE2 - select HAS_HW_NRF_UARTE3 - select HAS_HW_NRF_VMC - select HAS_HW_NRF_WDT choice prompt "nRF91x MCU Selection" diff --git a/subsys/bluetooth/controller/Kconfig.ll_sw_split b/subsys/bluetooth/controller/Kconfig.ll_sw_split index 6a9808977b3..e12729e721b 100644 --- a/subsys/bluetooth/controller/Kconfig.ll_sw_split +++ b/subsys/bluetooth/controller/Kconfig.ll_sw_split @@ -5,9 +5,6 @@ if BT_LL_SW_SPLIT -DT_PATH_NORDIC_RADIO := $(dt_nodelabel_path,radio) -DT_NORDIC_RADIO_DFE_SUPPORTED := $(dt_node_bool_prop,$(DT_PATH_NORDIC_RADIO),dfe-supported) - config BT_LLL_VENDOR_NORDIC bool "Use Nordic LLL" depends on SOC_COMPATIBLE_NRF @@ -34,8 +31,8 @@ config BT_LLL_VENDOR_NORDIC select BT_CTLR_SYNC_PERIODIC_SUPPORT select BT_CTLR_ADV_ISO_SUPPORT select BT_CTLR_SYNC_ISO_SUPPORT - select BT_CTLR_DF_SUPPORT if $(DT_NORDIC_RADIO_DFE_SUPPORTED) - select BT_CTLR_CTEINLINE_SUPPORT if $(DT_NORDIC_RADIO_DFE_SUPPORTED) + select BT_CTLR_DF_SUPPORT if HAS_HW_NRF_RADIO_DFE + select BT_CTLR_CTEINLINE_SUPPORT if HAS_HW_NRF_RADIO_DFE select BT_CTLR_CHAN_SEL_2_SUPPORT select BT_CTLR_MIN_USED_CHAN_SUPPORT select BT_CTLR_DTM_HCI_SUPPORT