soc: silabs: Remove SOC_VENDOR_SILABS

Until now, the support for Silicon Labs SoCs is limited to the Gecko families. This commit allows upstreaming support for non-Gecko based SoCs produced by Silicon Labs (i.e. SiM3U1xx). Signed-off-by: Reto Schneider <[email protected]>
zephyrproject-rtos · May 19, 2024 · 64743ef · 64743ef
1 parent 73078dd
commit 64743ef
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -3,6 +3,5 @@
 
 config SOC_FAMILY_SILABS_S2
 	bool
-	select SOC_VENDOR_SILABS
 
 rsource "*/Kconfig.soc"