michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kconfig: remove redundant IEEE 802.15.4 defaults or selections

Browse source 
All IEEE 802.15.4 drivers are now automatically enabled if they are
'okay' in DT and all of its dependencies are 'y', including
CONFIG_IEEE802154. This means individual driver enablement is not
necessary anymore in Kconfig.defconfig files or samples/tests. Boards
need to still make sure any dependencies are enabled, e.g. SPI bus in
some cases.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2022-07-18 16:30:50 +02:00 • committed by Carles Cufí
commit 61361e870b
23 changed files with 2 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

3
boards/arm/atsamr21_xpro/Kconfig.defconfig
View file

@ -8,7 +8,4 @@ if BOARD_ATSAMR21_XPRO
config BOARD config BOARD
default "atsamr21_xpro" default "atsamr21_xpro"
config IEEE802154_RF2XX
default IEEE802154
endif # BOARD_ATSAMR21_XPRO endif # BOARD_ATSAMR21_XPRO

4
boards/arm/bl653_dvk/Kconfig.defconfig
View file

@ -8,10 +8,6 @@ if BOARD_BL653_DVK
config BOARD config BOARD
default "bl653_dvk" default "bl653_dvk"
config IEEE802154_NRF5
default y
depends on IEEE802154
config BT_CTLR config BT_CTLR
default BT default BT

7
boards/arm/bl654_usb/Kconfig.defconfig
View file

@ -44,13 +44,6 @@ config SHELL_BACKEND_SERIAL_CHECK_DTR
endif #BL654_USB_SERIAL_BACKEND_CDCACM endif #BL654_USB_SERIAL_BACKEND_CDCACM
if IEEE802154
config IEEE802154_NRF5
default y
endif # IEEE802154
config BT_CTLR config BT_CTLR
default BT default BT

4
boards/arm/bt510/Kconfig.defconfig
View file

@ -8,10 +8,6 @@ if BOARD_BT510
config BOARD config BOARD
default "bt510" default "bt510"
config IEEE802154_NRF5
default y
depends on IEEE802154
config BT_CTLR config BT_CTLR
default BT default BT

4
boards/arm/bt610/Kconfig.defconfig
View file

@ -8,10 +8,6 @@ if BOARD_BT610
config BOARD config BOARD
default "bt610" default "bt610"
config IEEE802154_NRF5
default y
depends on IEEE802154
config BT_CTLR config BT_CTLR
default BT default BT

4
boards/arm/decawave_dwm1001_dev/Kconfig.defconfig
View file

@ -18,10 +18,6 @@ config SPI
default y default y
depends on IEEE802154 depends on IEEE802154
config IEEE802154_DW1000
default y
depends on IEEE802154
config NET_CONFIG_IEEE802154_DEV_NAME config NET_CONFIG_IEEE802154_DEV_NAME
default "DW1000" default "DW1000"

4
boards/arm/pinnacle_100_dvk/Kconfig.defconfig
View file

@ -11,10 +11,6 @@ config BOARD
config MODEM_HL7800 config MODEM_HL7800
default NETWORKING default NETWORKING
config IEEE802154_NRF5
default y
depends on IEEE802154
config BT_CTLR config BT_CTLR
default BT default BT

4
boards/arm/ubx_bmd380eval_nrf52840/Kconfig.defconfig
View file

@ -8,10 +8,6 @@ if BOARD_UBX_BMD380EVAL_NRF52840
config BOARD config BOARD
default "ubx_bmd380eval_nrf52840" default "ubx_bmd380eval_nrf52840"
config IEEE802154_NRF5
default y
depends on IEEE802154
config BT_CTLR config BT_CTLR
default BT default BT

4
boards/arm/ubx_evkninab3_nrf52840/Kconfig.defconfig
View file

@ -8,10 +8,6 @@ if BOARD_UBX_EVKNINAB3_NRF52840
config BOARD config BOARD
default "ubx_evkninab3_nrf52840" default "ubx_evkninab3_nrf52840"
config IEEE802154_NRF5
default y
depends on IEEE802154
config BT_CTLR config BT_CTLR
default BT default BT

3
boards/riscv/tlsr9518adk80d/Kconfig.defconfig
View file

@ -12,9 +12,6 @@ config ENTROPY_TELINK_B91_TRNG
config SOC_FLASH_TELINK_B91 config SOC_FLASH_TELINK_B91
default y if FLASH default y if FLASH
config IEEE802154_TELINK_B91
default y if IEEE802154
config NET_CONFIG_IEEE802154_DEV_NAME config NET_CONFIG_IEEE802154_DEV_NAME
default "IEEE802154_b91" default "IEEE802154_b91"

4
boards/shields/atmel_rf2xx/Kconfig.defconfig
View file

@ -10,10 +10,6 @@ if SHIELD_ATMEL_RF2XX || \
if NETWORKING if NETWORKING
config IEEE802154_RF2XX
default y
depends on IEEE802154
config NET_CONFIG_IEEE802154_DEV_NAME config NET_CONFIG_IEEE802154_DEV_NAME
default "RF2XX_0" default "RF2XX_0"
depends on IEEE802154_RF2XX depends on IEEE802154_RF2XX

3
boards/shields/frdm_cr20a/Kconfig.defconfig
View file

@ -11,9 +11,6 @@ if IEEE802154
config SPI config SPI
default y default y
config IEEE802154_MCR20A
default y
config NET_CONFIG_IEEE802154_DEV_NAME config NET_CONFIG_IEEE802154_DEV_NAME
default "mcr20a" default "mcr20a"

2
samples/net/sockets/echo_client/overlay-cc2520.conf
View file

@ -1,7 +1,5 @@
CONFIG_NET_L2_IEEE802154=y CONFIG_NET_L2_IEEE802154=y
CONFIG_IEEE802154_CC2520=y
CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="cc2520" CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="cc2520"
CONFIG_NET_IPV4=n CONFIG_NET_IPV4=n

2
samples/net/sockets/echo_server/overlay-cc2520.conf
View file

@ -1,6 +1,4 @@
CONFIG_NET_L2_IEEE802154=y CONFIG_NET_L2_IEEE802154=y
CONFIG_IEEE802154_CC2520=y
CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2"
CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="cc2520" CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="cc2520"

9
samples/net/wpan_serial/README.rst
View file

@ -36,12 +36,6 @@ Building and Running
This is the standard default config. This can be used by itself for This is the standard default config. This can be used by itself for
hardware which has native 802.15.4 support. hardware which has native 802.15.4 support.
- :file:`overlay-cc2520.conf`
This overlay enables support for CC2520 transceiver
- :file:`overlay-rf2xx.conf`
This overlay enables support for RF2XX transceiver
To build the wpan_serial sample: To build the wpan_serial sample:
.. zephyr-app-commands:: .. zephyr-app-commands::
@ -52,8 +46,7 @@ Building and Running
:compact: :compact:
Here's how to build and flash the sample for the Atmel SAM R21 Here's how to build and flash the sample for the Atmel SAM R21
Xplained Pro Development Kit. Note that for this SoC, you don't Xplained Pro Development Kit.
need to include ``overlay-rf2xx.conf``.
.. zephyr-app-commands:: .. zephyr-app-commands::
:zephyr-app: samples/net/wpan_serial :zephyr-app: samples/net/wpan_serial

1
samples/net/wpan_serial/overlay-cc2520.conf
View file

@ -1,2 +1 @@
CONFIG_IEEE802154_CC2520=y
CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="cc2520" CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="cc2520"

1
samples/net/wpan_serial/overlay-rf2xx.conf
View file

@ -4,5 +4,4 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
CONFIG_IEEE802154_RF2XX=y
CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="RF2XX_0" CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="RF2XX_0"

3
soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52811_QFAA
View file

@ -14,7 +14,4 @@ config NUM_IRQS
config NET_CONFIG_IEEE802154_DEV_NAME config NET_CONFIG_IEEE802154_DEV_NAME
default "IEEE802154_nrf5" default "IEEE802154_nrf5"
config IEEE802154_NRF5
default IEEE802154
endif # SOC_NRF52811_QFAA endif # SOC_NRF52811_QFAA

3
soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52820_QDAA
View file

@ -13,7 +13,4 @@ config NUM_IRQS
int int
default 40 default 40
config IEEE802154_NRF5
default IEEE802154
endif # SOC_NRF52820_QDAA endif # SOC_NRF52820_QDAA

3
soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52833_QIAA
View file

@ -16,7 +16,4 @@ config NUM_IRQS
config NET_CONFIG_IEEE802154_DEV_NAME config NET_CONFIG_IEEE802154_DEV_NAME
default "IEEE802154_nrf5" default "IEEE802154_nrf5"
config IEEE802154_NRF5
default IEEE802154
endif # SOC_NRF52833_QIAA endif # SOC_NRF52833_QIAA

3
soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA
View file

@ -14,7 +14,4 @@ config NUM_IRQS
config NET_CONFIG_IEEE802154_DEV_NAME config NET_CONFIG_IEEE802154_DEV_NAME
default "IEEE802154_nrf5" default "IEEE802154_nrf5"
config IEEE802154_NRF5
default IEEE802154
endif # SOC_NRF52840_QIAA endif # SOC_NRF52840_QIAA

5
soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4
View file

@ -29,11 +29,8 @@ config NET_L2_IEEE802154
default y default y
depends on !NET_L2_OPENTHREAD depends on !NET_L2_OPENTHREAD
config IEEE802154_KW41Z
default y
config NET_CONFIG_IEEE802154_DEV_NAME config NET_CONFIG_IEEE802154_DEV_NAME
default "KW41Z" default "KW41Z"
endif # NETWORKING endif # NETWORKING

2
soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.series
View file

@ -32,13 +32,11 @@ config ENTROPY_CC13XX_CC26XX_RNG
if IEEE802154 if IEEE802154
config IEEE802154_CC13XX_CC26XX config IEEE802154_CC13XX_CC26XX
default y
# required for linking with PowerCC26X2_config in # required for linking with PowerCC26X2_config in
# soc/arm/ti_simplelink/cc13x2_cc26x2/power.c # soc/arm/ti_simplelink/cc13x2_cc26x2/power.c
select PM select PM
config IEEE802154_CC13XX_CC26XX_SUB_GHZ config IEEE802154_CC13XX_CC26XX_SUB_GHZ
default y
# required for linking with PowerCC26X2_config in # required for linking with PowerCC26X2_config in
# soc/arm/ti_simplelink/cc13x2_cc26x2/power.c # soc/arm/ti_simplelink/cc13x2_cc26x2/power.c
select PM select PM