Skip to content

Commit e90c89d

Browse files
rettichschnidiMaureenHelm
authored andcommitted
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 <reto.schneider@husqvarnagroup.com>
1 parent ce35fbf commit e90c89d

File tree

10 files changed

+29
-16
lines changed

10 files changed

+29
-16
lines changed

soc/silabs/Kconfig

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22
# Copyright (c) 2018 Gil Benkoe
33
# SPDX-License-Identifier: Apache-2.0
44

5-
config SOC_VENDOR_SILABS
6-
select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
7-
select BUILD_OUTPUT_HEX
8-
9-
if SOC_VENDOR_SILABS
10-
115
rsource "*/*/Kconfig"
126

7+
if SOC_FAMILY_SILABS_S0 || SOC_FAMILY_SILABS_S1 || SOC_FAMILY_SILABS_S2
8+
139
config SOC_GECKO_SDID
1410
int
1511
help
@@ -322,4 +318,4 @@ config SOC_GECKO_CUSTOM_RADIO_PHY
322318
management, sending and receiving packets on radio phy. User has
323319
to provide the radio_config.c and radio_config.h files for the phy.
324320

325-
endif # SOC_VENDOR_SILABS
321+
endif # SOC_FAMILY_SILABS_S0 || SOC_FAMILY_SILABS_S1 || SOC_FAMILY_SILABS_S2

soc/silabs/Kconfig.defconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# SPDX-License-Identifier: Apache-2.0
22
# Copyright (c) 2017 Christian Taedcke
33

4-
if SOC_VENDOR_SILABS
5-
64
rsource "*/*/Kconfig.defconfig"
75

6+
if SOC_FAMILY_SILABS_S0 || SOC_FAMILY_SILABS_S1 || SOC_FAMILY_SILABS_S2
7+
88
config SOC_GECKO_EMU
99
default y
1010
select SOC_GECKO_CORE

soc/silabs/Kconfig.soc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Copyright (c) 2017 Christian Taedcke
22
# SPDX-License-Identifier: Apache-2.0
33

4-
config SOC_VENDOR_SILABS
5-
bool
6-
74
config SOC_FAMILY
85
default "silabs_s0" if SOC_FAMILY_SILABS_S0
96
default "silabs_s1" if SOC_FAMILY_SILABS_S1

soc/silabs/common/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3-
zephyr_sources(soc.c)
3+
if(SOC_FAMILY_SILABS_S0 OR SOC_FAMILY_SILABS_S1 OR SOC_FAMILY_SILABS_S2)
4+
zephyr_sources(soc.c)
5+
endif()
46

57
zephyr_sources_ifdef(CONFIG_SOC_GECKO_PM_BACKEND_EMU soc_power.c)
68
zephyr_sources_ifdef(CONFIG_SOC_GECKO_PM_BACKEND_PMGR soc_power_pmgr.c)

soc/silabs/silabs_s0/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Copyright (c) 2024 GARDENA GmbH
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
config SOC_FAMILY_SILABS_S0
6+
select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
7+
select BUILD_OUTPUT_HEX

soc/silabs/silabs_s0/Kconfig.soc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33

44
config SOC_FAMILY_SILABS_S0
55
bool
6-
select SOC_VENDOR_SILABS
76

87
rsource "*/Kconfig.soc"

soc/silabs/silabs_s1/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Copyright (c) 2024 GARDENA GmbH
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
config SOC_FAMILY_SILABS_S1
6+
select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
7+
select BUILD_OUTPUT_HEX

soc/silabs/silabs_s1/Kconfig.soc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33

44
config SOC_FAMILY_SILABS_S1
55
bool
6-
select SOC_VENDOR_SILABS
76

87
rsource "*/Kconfig.soc"

soc/silabs/silabs_s2/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Copyright (c) 2024 GARDENA GmbH
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
config SOC_FAMILY_SILABS_S2
6+
select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
7+
select BUILD_OUTPUT_HEX

soc/silabs/silabs_s2/Kconfig.soc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33

44
config SOC_FAMILY_SILABS_S2
55
bool
6-
select SOC_VENDOR_SILABS
76

87
rsource "*/Kconfig.soc"

0 commit comments

Comments
 (0)