From b74a22924e7564d656d543269255f00d140f3adb Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Mon, 18 Jul 2022 11:46:49 +0200 Subject: [PATCH] net: lib: config: remove NET_CONFIG_IEEE802154_DEV_NAME Remove NET_CONFIG_IEEE802154_DEV_NAME in favor of DT based choice using zephyr,ieee802154. Signed-off-by: Gerard Marull-Paretas --- boards/arm/decawave_dwm1001_dev/Kconfig.defconfig | 3 --- boards/riscv/tlsr9518adk80d/Kconfig.defconfig | 3 --- boards/shields/atmel_rf2xx/Kconfig.defconfig | 4 ---- samples/net/sockets/echo_client/boards/atsamr21_xpro.conf | 2 -- samples/net/sockets/echo_server/boards/atsamr21_xpro.conf | 2 -- soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52811_QFAA | 3 --- soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52833_QIAA | 3 --- soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA | 3 --- .../nordic_nrf/nrf53/Kconfig.defconfig.nrf5340_CPUAPP_QKAA | 3 --- soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 | 3 --- .../ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.series | 3 --- subsys/net/lib/config/Kconfig | 6 ------ tests/net/all/prj.conf | 1 - 13 files changed, 39 deletions(-) diff --git a/boards/arm/decawave_dwm1001_dev/Kconfig.defconfig b/boards/arm/decawave_dwm1001_dev/Kconfig.defconfig index b677d1ac227..c64fe40b645 100644 --- a/boards/arm/decawave_dwm1001_dev/Kconfig.defconfig +++ b/boards/arm/decawave_dwm1001_dev/Kconfig.defconfig @@ -18,7 +18,4 @@ config SPI default y depends on IEEE802154 -config NET_CONFIG_IEEE802154_DEV_NAME - default "DW1000" - endif # BOARD_DECAWAVE_DWM1001_DEV diff --git a/boards/riscv/tlsr9518adk80d/Kconfig.defconfig b/boards/riscv/tlsr9518adk80d/Kconfig.defconfig index 7f44c1b9230..ce11f3aaabe 100644 --- a/boards/riscv/tlsr9518adk80d/Kconfig.defconfig +++ b/boards/riscv/tlsr9518adk80d/Kconfig.defconfig @@ -9,9 +9,6 @@ config BOARD config SOC_FLASH_TELINK_B91 default y if FLASH -config NET_CONFIG_IEEE802154_DEV_NAME - default "IEEE802154_b91" - if BT # BLE Controller SDK from hal_telink requires diff --git a/boards/shields/atmel_rf2xx/Kconfig.defconfig b/boards/shields/atmel_rf2xx/Kconfig.defconfig index 22f3d75ea5e..7c31ebf775b 100644 --- a/boards/shields/atmel_rf2xx/Kconfig.defconfig +++ b/boards/shields/atmel_rf2xx/Kconfig.defconfig @@ -10,10 +10,6 @@ if SHIELD_ATMEL_RF2XX || \ if NETWORKING -config NET_CONFIG_IEEE802154_DEV_NAME - default "RF2XX_0" - depends on IEEE802154_RF2XX - orsource "boards/*.defconfig" endif # NETWORKING diff --git a/samples/net/sockets/echo_client/boards/atsamr21_xpro.conf b/samples/net/sockets/echo_client/boards/atsamr21_xpro.conf index 35d0f891285..b39d72eed9c 100644 --- a/samples/net/sockets/echo_client/boards/atsamr21_xpro.conf +++ b/samples/net/sockets/echo_client/boards/atsamr21_xpro.conf @@ -5,8 +5,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="RF2XX_0" - # Reduced buffers to fit into SAMR21 SoC CONFIG_CPLUSPLUS=n diff --git a/samples/net/sockets/echo_server/boards/atsamr21_xpro.conf b/samples/net/sockets/echo_server/boards/atsamr21_xpro.conf index 35d0f891285..b39d72eed9c 100644 --- a/samples/net/sockets/echo_server/boards/atsamr21_xpro.conf +++ b/samples/net/sockets/echo_server/boards/atsamr21_xpro.conf @@ -5,8 +5,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="RF2XX_0" - # Reduced buffers to fit into SAMR21 SoC CONFIG_CPLUSPLUS=n diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52811_QFAA b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52811_QFAA index 3919afc0f27..7b291305208 100644 --- a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52811_QFAA +++ b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52811_QFAA @@ -11,7 +11,4 @@ config SOC config NUM_IRQS default 30 -config NET_CONFIG_IEEE802154_DEV_NAME - default "IEEE802154_nrf5" - endif # SOC_NRF52811_QFAA diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52833_QIAA b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52833_QIAA index a5bce8f371d..6256b30e741 100644 --- a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52833_QIAA +++ b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52833_QIAA @@ -13,7 +13,4 @@ config NUM_IRQS int default 48 -config NET_CONFIG_IEEE802154_DEV_NAME - default "IEEE802154_nrf5" - endif # SOC_NRF52833_QIAA diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA index 6d048650eb7..62ca5e76cbd 100644 --- a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA +++ b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA @@ -11,7 +11,4 @@ config SOC config NUM_IRQS default 48 -config NET_CONFIG_IEEE802154_DEV_NAME - default "IEEE802154_nrf5" - endif # SOC_NRF52840_QIAA diff --git a/soc/arm/nordic_nrf/nrf53/Kconfig.defconfig.nrf5340_CPUAPP_QKAA b/soc/arm/nordic_nrf/nrf53/Kconfig.defconfig.nrf5340_CPUAPP_QKAA index fe8f203aa4e..0c0f9f05926 100644 --- a/soc/arm/nordic_nrf/nrf53/Kconfig.defconfig.nrf5340_CPUAPP_QKAA +++ b/soc/arm/nordic_nrf/nrf53/Kconfig.defconfig.nrf5340_CPUAPP_QKAA @@ -14,9 +14,6 @@ config NUM_IRQS config IEEE802154_NRF5 default IEEE802154 -config NET_CONFIG_IEEE802154_DEV_NAME - default "IEEE802154_nrf5" - config HEAP_MEM_POOL_SIZE default 4096 if NRF_802154_SER_HOST diff --git a/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 b/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 index 6fbc02d9831..32547d71237 100644 --- a/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 +++ b/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 @@ -21,9 +21,6 @@ config NET_L2_IEEE802154 default y depends on !NET_L2_OPENTHREAD -config NET_CONFIG_IEEE802154_DEV_NAME - default "KW41Z" - endif # NETWORKING choice CSPRNG_GENERATOR_CHOICE diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.series b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.series index 72e2031ef8f..1631e12497e 100644 --- a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.series +++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.series @@ -37,9 +37,6 @@ config IEEE802154_CC13XX_CC26XX_SUB_GHZ # soc/arm/ti_simplelink/cc13x2_cc26x2/power.c select PM -config NET_CONFIG_IEEE802154_DEV_NAME - default "IEEE802154_0" - endif # IEEE802154 if BT diff --git a/subsys/net/lib/config/Kconfig b/subsys/net/lib/config/Kconfig index fdc6e30e792..528bbb6986f 100644 --- a/subsys/net/lib/config/Kconfig +++ b/subsys/net/lib/config/Kconfig @@ -116,12 +116,6 @@ config NET_CONFIG_PEER_IPV4_ADDR endif # NET_IPV4 -config NET_CONFIG_IEEE802154_DEV_NAME - string "IEEE 802.15.4 device name" - depends on NET_L2_IEEE802154 || IEEE802154_RAW_MODE || NET_L2_OPENTHREAD - help - The device name to get bindings from in the sample application. - if NET_L2_IEEE802154 || IEEE802154_RAW_MODE config NET_CONFIG_IEEE802154_PAN_ID diff --git a/tests/net/all/prj.conf b/tests/net/all/prj.conf index 0aa476ef638..a6bf6cc838d 100644 --- a/tests/net/all/prj.conf +++ b/tests/net/all/prj.conf @@ -183,7 +183,6 @@ CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2" -CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="FOO-BAR" CONFIG_NET_CONFIG_IEEE802154_PAN_ID=0x1234 CONFIG_NET_CONFIG_IEEE802154_CHANNEL=15 CONFIG_NET_CONFIG_IEEE802154_SECURITY_KEY="key"