From 9639a1b5dc096d57f46d1195a0e307701b35e2c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Fri, 23 Feb 2024 17:04:44 +0100 Subject: [PATCH] soc: silabs: drop useless defconfigs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, some soc subdirectories contains Kconfig.defconfig. and Kconfig.defconfig. However: - Kconfig.defconfig. is included unconditionally by Kconfig.defconfig - each subdirectory only contains one SoC So, it does not make sense to keep these two files. Signed-off-by: Jérôme Pouiller --- soc/silabs/silabs_s1/efm32gg11b/Kconfig.defconfig | 4 +++- .../silabs_s1/efm32gg11b/Kconfig.defconfig.efm32gg11b | 8 -------- soc/silabs/silabs_s1/efm32gg12b/Kconfig.defconfig | 4 +++- .../silabs_s1/efm32gg12b/Kconfig.defconfig.efm32gg12b | 7 ------- soc/silabs/silabs_s2/efr32bg22/Kconfig.defconfig | 3 ++- .../silabs_s2/efr32bg22/Kconfig.defconfig.efr32bg22 | 7 ------- soc/silabs/silabs_s2/efr32bg27/Kconfig.defconfig | 3 ++- .../silabs_s2/efr32bg27/Kconfig.defconfig.efr32bg27 | 7 ------- soc/silabs/silabs_s2/efr32mg21/Kconfig.defconfig | 4 +++- .../silabs_s2/efr32mg21/Kconfig.defconfig.efr32mg21 | 8 -------- 10 files changed, 13 insertions(+), 42 deletions(-) delete mode 100644 soc/silabs/silabs_s1/efm32gg11b/Kconfig.defconfig.efm32gg11b delete mode 100644 soc/silabs/silabs_s1/efm32gg12b/Kconfig.defconfig.efm32gg12b delete mode 100644 soc/silabs/silabs_s2/efr32bg22/Kconfig.defconfig.efr32bg22 delete mode 100644 soc/silabs/silabs_s2/efr32bg27/Kconfig.defconfig.efr32bg27 delete mode 100644 soc/silabs/silabs_s2/efr32mg21/Kconfig.defconfig.efr32mg21 diff --git a/soc/silabs/silabs_s1/efm32gg11b/Kconfig.defconfig b/soc/silabs/silabs_s1/efm32gg11b/Kconfig.defconfig index bcee41ada43..07a92c66b82 100644 --- a/soc/silabs/silabs_s1/efm32gg11b/Kconfig.defconfig +++ b/soc/silabs/silabs_s1/efm32gg11b/Kconfig.defconfig @@ -10,6 +10,8 @@ config NUM_IRQS # must be >= the highest interrupt number used default 68 -rsource "Kconfig.defconfig.efm32gg11b" +config GPIO_GECKO + default y + depends on GPIO || LOG_BACKEND_SWO endif # SOC_SERIES_EFM32GG11B diff --git a/soc/silabs/silabs_s1/efm32gg11b/Kconfig.defconfig.efm32gg11b b/soc/silabs/silabs_s1/efm32gg11b/Kconfig.defconfig.efm32gg11b deleted file mode 100644 index da0d6b66b91..00000000000 --- a/soc/silabs/silabs_s1/efm32gg11b/Kconfig.defconfig.efm32gg11b +++ /dev/null @@ -1,8 +0,0 @@ -# Silicon Labs EFM32GG-STK3701A platform configuration options -# Copyright (c) 2019 Interay Solutions B.V. -# Copyright (c) 2019 Oane Kingma -# SPDX-License-Identifier: Apache-2.0 - -config GPIO_GECKO - default y - depends on GPIO || LOG_BACKEND_SWO diff --git a/soc/silabs/silabs_s1/efm32gg12b/Kconfig.defconfig b/soc/silabs/silabs_s1/efm32gg12b/Kconfig.defconfig index 49afd39d31d..7bcb50e8ef7 100644 --- a/soc/silabs/silabs_s1/efm32gg12b/Kconfig.defconfig +++ b/soc/silabs/silabs_s1/efm32gg12b/Kconfig.defconfig @@ -9,6 +9,8 @@ config NUM_IRQS # must be >= the highest interrupt number used default 68 -rsource "Kconfig.defconfig.efm32gg12b" +config GPIO_GECKO + default y + depends on GPIO || LOG_BACKEND_SWO endif # SOC_SERIES_EFM32GG12B diff --git a/soc/silabs/silabs_s1/efm32gg12b/Kconfig.defconfig.efm32gg12b b/soc/silabs/silabs_s1/efm32gg12b/Kconfig.defconfig.efm32gg12b deleted file mode 100644 index ce234528a58..00000000000 --- a/soc/silabs/silabs_s1/efm32gg12b/Kconfig.defconfig.efm32gg12b +++ /dev/null @@ -1,7 +0,0 @@ -# Silicon Labs EFM32GG12B (Giant Gecko) platform configuration options -# Copyright (c) 2023 Antmicro -# SPDX-License-Identifier: Apache-2.0 - -config GPIO_GECKO - default y - depends on GPIO || LOG_BACKEND_SWO diff --git a/soc/silabs/silabs_s2/efr32bg22/Kconfig.defconfig b/soc/silabs/silabs_s2/efr32bg22/Kconfig.defconfig index 0e04ecf6ff5..d0cdff43ea6 100644 --- a/soc/silabs/silabs_s2/efr32bg22/Kconfig.defconfig +++ b/soc/silabs/silabs_s2/efr32bg22/Kconfig.defconfig @@ -13,6 +13,7 @@ config PM select COUNTER select UART_INTERRUPT_DRIVEN -rsource "Kconfig.defconfig.efr32bg22" +config GPIO_GECKO + default y endif # SOC_SERIES_EFR32BG22 diff --git a/soc/silabs/silabs_s2/efr32bg22/Kconfig.defconfig.efr32bg22 b/soc/silabs/silabs_s2/efr32bg22/Kconfig.defconfig.efr32bg22 deleted file mode 100644 index 7600ace022b..00000000000 --- a/soc/silabs/silabs_s2/efr32bg22/Kconfig.defconfig.efr32bg22 +++ /dev/null @@ -1,7 +0,0 @@ -# Silicon Labs EFR32BG22 (Blue Gecko) MCU configuration options - -# Copyright (c) 2021 Sateesh Kotapati -# SPDX-License-Identifier: Apache-2.0 - -config GPIO_GECKO - default y diff --git a/soc/silabs/silabs_s2/efr32bg27/Kconfig.defconfig b/soc/silabs/silabs_s2/efr32bg27/Kconfig.defconfig index a8fe4e41aaf..a997408c74e 100644 --- a/soc/silabs/silabs_s2/efr32bg27/Kconfig.defconfig +++ b/soc/silabs/silabs_s2/efr32bg27/Kconfig.defconfig @@ -12,6 +12,7 @@ config NUM_IRQS config PM select COUNTER -rsource "Kconfig.defconfig.efr32bg27" +config GPIO_GECKO + default y endif # SOC_SERIES_EFR32BG27 diff --git a/soc/silabs/silabs_s2/efr32bg27/Kconfig.defconfig.efr32bg27 b/soc/silabs/silabs_s2/efr32bg27/Kconfig.defconfig.efr32bg27 deleted file mode 100644 index 6b33d3ea25e..00000000000 --- a/soc/silabs/silabs_s2/efr32bg27/Kconfig.defconfig.efr32bg27 +++ /dev/null @@ -1,7 +0,0 @@ -# Silicon Labs EFR32BG27 (Blue Gecko) MCU configuration options - -# Copyright (c) 2023 Antmicro -# SPDX-License-Identifier: Apache-2.0 - -config GPIO_GECKO - default y diff --git a/soc/silabs/silabs_s2/efr32mg21/Kconfig.defconfig b/soc/silabs/silabs_s2/efr32mg21/Kconfig.defconfig index 139e883238a..76555bbaa1c 100644 --- a/soc/silabs/silabs_s2/efr32mg21/Kconfig.defconfig +++ b/soc/silabs/silabs_s2/efr32mg21/Kconfig.defconfig @@ -10,6 +10,8 @@ config NUM_IRQS # must be >= the highest interrupt number used default 61 -rsource "Kconfig.defconfig.efr32mg21" +config GPIO_GECKO + default y + depends on GPIO || LOG_BACKEND_SWO endif # SOC_SERIES_EFR32MG21 diff --git a/soc/silabs/silabs_s2/efr32mg21/Kconfig.defconfig.efr32mg21 b/soc/silabs/silabs_s2/efr32mg21/Kconfig.defconfig.efr32mg21 deleted file mode 100644 index 1844935f015..00000000000 --- a/soc/silabs/silabs_s2/efr32mg21/Kconfig.defconfig.efr32mg21 +++ /dev/null @@ -1,8 +0,0 @@ -# Silicon Labs EFR32MG21 (Mighty Gecko) MCU configuration options - -# Copyright (c) 2020 TriaGnoSys GmbH -# SPDX-License-Identifier: Apache-2.0 - -config GPIO_GECKO - default y - depends on GPIO || LOG_BACKEND_SWO