diff --git a/drivers/hwinfo/Kconfig b/drivers/hwinfo/Kconfig index b3bab9c82afb0c..3bc8c21dde46a2 100644 --- a/drivers/hwinfo/Kconfig +++ b/drivers/hwinfo/Kconfig @@ -180,7 +180,9 @@ config HWINFO_PSOC6 config HWINFO_GECKO bool "GECKO hwinfo" default y - depends on SOC_VENDOR_SILABS && !SOC_SERIES_EFR32MG21 && !SOC_SERIES_EFR32BG22 + depends on SOC_FAMILY_SILABS_S0 || SOC_FAMILY_SILABS_S1 || SOC_FAMILY_SILABS_S2 + depends on !SOC_SERIES_EFR32MG21 + depends on !SOC_SERIES_EFR32BG22 select SOC_GECKO_RMU help Enable Silabs GECKO hwinfo driver. diff --git a/modules/Kconfig.silabs b/modules/Kconfig.silabs index 0078bfc0b98794..c5fb0d6ca149d6 100644 --- a/modules/Kconfig.silabs +++ b/modules/Kconfig.silabs @@ -6,4 +6,4 @@ config HAS_SILABS_GECKO bool select HAS_CMSIS_CORE - depends on SOC_VENDOR_SILABS + depends on SOC_FAMILY_SILABS_S0 || SOC_FAMILY_SILABS_S1 || SOC_FAMILY_SILABS_S2 diff --git a/soc/silabs/Kconfig b/soc/silabs/Kconfig index 4e86a6e2b74fc2..de8656efbb57c6 100644 --- a/soc/silabs/Kconfig +++ b/soc/silabs/Kconfig @@ -2,14 +2,10 @@ # Copyright (c) 2018 Gil Benkoe # SPDX-License-Identifier: Apache-2.0 -config SOC_VENDOR_SILABS - select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE - select BUILD_OUTPUT_HEX - -if SOC_VENDOR_SILABS - rsource "*/*/Kconfig" +if SOC_FAMILY_SILABS_S0 || SOC_FAMILY_SILABS_S1 || SOC_FAMILY_SILABS_S2 + config SOC_GECKO_SDID int help @@ -322,4 +318,4 @@ config SOC_GECKO_CUSTOM_RADIO_PHY management, sending and receiving packets on radio phy. User has to provide the radio_config.c and radio_config.h files for the phy. -endif # SOC_VENDOR_SILABS +endif # SOC_FAMILY_SILABS_S0 || SOC_FAMILY_SILABS_S1 || SOC_FAMILY_SILABS_S2 diff --git a/soc/silabs/Kconfig.defconfig b/soc/silabs/Kconfig.defconfig index 530325a76a8c0f..c4c0f859b9a9ba 100644 --- a/soc/silabs/Kconfig.defconfig +++ b/soc/silabs/Kconfig.defconfig @@ -1,10 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright (c) 2017 Christian Taedcke -if SOC_VENDOR_SILABS - rsource "*/*/Kconfig.defconfig" +if SOC_FAMILY_SILABS_S0 || SOC_FAMILY_SILABS_S1 || SOC_FAMILY_SILABS_S2 + config SOC_GECKO_EMU default y select SOC_GECKO_CORE diff --git a/soc/silabs/Kconfig.soc b/soc/silabs/Kconfig.soc index bea030078b79f6..d3e52c95cd7062 100644 --- a/soc/silabs/Kconfig.soc +++ b/soc/silabs/Kconfig.soc @@ -1,9 +1,6 @@ # Copyright (c) 2017 Christian Taedcke # SPDX-License-Identifier: Apache-2.0 -config SOC_VENDOR_SILABS - bool - config SOC_FAMILY default "silabs_s0" if SOC_FAMILY_SILABS_S0 default "silabs_s1" if SOC_FAMILY_SILABS_S1 diff --git a/soc/silabs/common/CMakeLists.txt b/soc/silabs/common/CMakeLists.txt index 27e11228b9793f..a3e08c2fce19b9 100644 --- a/soc/silabs/common/CMakeLists.txt +++ b/soc/silabs/common/CMakeLists.txt @@ -1,6 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 -zephyr_sources(soc.c) +if(SOC_FAMILY_SILABS_S0 OR SOC_FAMILY_SILABS_S1 OR SOC_FAMILY_SILABS_S2) + zephyr_sources(soc.c) +endif() zephyr_sources_ifdef(CONFIG_SOC_GECKO_PM_BACKEND_EMU soc_power.c) zephyr_sources_ifdef(CONFIG_SOC_GECKO_PM_BACKEND_PMGR soc_power_pmgr.c) diff --git a/soc/silabs/silabs_s0/Kconfig b/soc/silabs/silabs_s0/Kconfig new file mode 100644 index 00000000000000..ad699c92bcc3a3 --- /dev/null +++ b/soc/silabs/silabs_s0/Kconfig @@ -0,0 +1,7 @@ +# Copyright (c) 2024 GARDENA GmbH +# +# SPDX-License-Identifier: Apache-2.0 + +config SOC_FAMILY_SILABS_S0 + select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE + select BUILD_OUTPUT_HEX diff --git a/soc/silabs/silabs_s0/Kconfig.soc b/soc/silabs/silabs_s0/Kconfig.soc index 870fecc2a4a495..a6bcceb37efc61 100644 --- a/soc/silabs/silabs_s0/Kconfig.soc +++ b/soc/silabs/silabs_s0/Kconfig.soc @@ -3,6 +3,5 @@ config SOC_FAMILY_SILABS_S0 bool - select SOC_VENDOR_SILABS rsource "*/Kconfig.soc" diff --git a/soc/silabs/silabs_s1/Kconfig b/soc/silabs/silabs_s1/Kconfig new file mode 100644 index 00000000000000..67c01f3b0773bf --- /dev/null +++ b/soc/silabs/silabs_s1/Kconfig @@ -0,0 +1,7 @@ +# Copyright (c) 2024 GARDENA GmbH +# +# SPDX-License-Identifier: Apache-2.0 + +config SOC_FAMILY_SILABS_S1 + select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE + select BUILD_OUTPUT_HEX diff --git a/soc/silabs/silabs_s1/Kconfig.soc b/soc/silabs/silabs_s1/Kconfig.soc index d2771e803ec856..15187ee2b8f52f 100644 --- a/soc/silabs/silabs_s1/Kconfig.soc +++ b/soc/silabs/silabs_s1/Kconfig.soc @@ -3,6 +3,5 @@ config SOC_FAMILY_SILABS_S1 bool - select SOC_VENDOR_SILABS rsource "*/Kconfig.soc" diff --git a/soc/silabs/silabs_s2/Kconfig b/soc/silabs/silabs_s2/Kconfig new file mode 100644 index 00000000000000..4a6b5c6efd5e19 --- /dev/null +++ b/soc/silabs/silabs_s2/Kconfig @@ -0,0 +1,7 @@ +# Copyright (c) 2024 GARDENA GmbH +# +# SPDX-License-Identifier: Apache-2.0 + +config SOC_FAMILY_SILABS_S2 + select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE + select BUILD_OUTPUT_HEX diff --git a/soc/silabs/silabs_s2/Kconfig.soc b/soc/silabs/silabs_s2/Kconfig.soc index c8926b83e6ee3a..521c42e6bab2db 100644 --- a/soc/silabs/silabs_s2/Kconfig.soc +++ b/soc/silabs/silabs_s2/Kconfig.soc @@ -3,6 +3,5 @@ config SOC_FAMILY_SILABS_S2 bool - select SOC_VENDOR_SILABS rsource "*/Kconfig.soc"