michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: silabs: Remove SOC_VENDOR_SILABS

Browse source 
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>
This commit is contained in:
Reto Schneider 2024-04-13 14:43:50 +02:00 • committed by Maureen Helm
commit e90c89d453
10 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
soc/silabs/Kconfig
View file

@ -2,14 +2,10 @@
# Copyright (c) 2018 Gil Benkoe # Copyright (c) 2018 Gil Benkoe
# SPDX-License-Identifier: Apache-2.0 # 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" rsource "*/*/Kconfig"
if SOC_FAMILY_SILABS_S0 || SOC_FAMILY_SILABS_S1 || SOC_FAMILY_SILABS_S2
config SOC_GECKO_SDID config SOC_GECKO_SDID
int int
help help
@ -322,4 +318,4 @@ config SOC_GECKO_CUSTOM_RADIO_PHY
management, sending and receiving packets on radio phy. User has management, sending and receiving packets on radio phy. User has
to provide the radio_config.c and radio_config.h files for the phy. 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

4
soc/silabs/Kconfig.defconfig
View file

@ -1,10 +1,10 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# Copyright (c) 2017 Christian Taedcke # Copyright (c) 2017 Christian Taedcke
if SOC_VENDOR_SILABS
rsource "*/*/Kconfig.defconfig" rsource "*/*/Kconfig.defconfig"
if SOC_FAMILY_SILABS_S0 || SOC_FAMILY_SILABS_S1 || SOC_FAMILY_SILABS_S2
config SOC_GECKO_EMU config SOC_GECKO_EMU
default y default y
select SOC_GECKO_CORE select SOC_GECKO_CORE

3
soc/silabs/Kconfig.soc
View file

@ -1,9 +1,6 @@
# Copyright (c) 2017 Christian Taedcke # Copyright (c) 2017 Christian Taedcke
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
config SOC_VENDOR_SILABS
bool
config SOC_FAMILY config SOC_FAMILY
default "silabs_s0" if SOC_FAMILY_SILABS_S0 default "silabs_s0" if SOC_FAMILY_SILABS_S0
default "silabs_s1" if SOC_FAMILY_SILABS_S1 default "silabs_s1" if SOC_FAMILY_SILABS_S1

4
soc/silabs/common/CMakeLists.txt
View file

@ -1,6 +1,8 @@
# SPDX-License-Identifier: Apache-2.0 # 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_EMU soc_power.c)
zephyr_sources_ifdef(CONFIG_SOC_GECKO_PM_BACKEND_PMGR soc_power_pmgr.c) zephyr_sources_ifdef(CONFIG_SOC_GECKO_PM_BACKEND_PMGR soc_power_pmgr.c)

7
soc/silabs/silabs_s0/Kconfig Normal file
View file

@ -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

1
soc/silabs/silabs_s0/Kconfig.soc
View file

@ -3,6 +3,5 @@
config SOC_FAMILY_SILABS_S0 config SOC_FAMILY_SILABS_S0
bool bool
select SOC_VENDOR_SILABS
rsource "*/Kconfig.soc" rsource "*/Kconfig.soc"

7
soc/silabs/silabs_s1/Kconfig Normal file
View file

@ -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

1
soc/silabs/silabs_s1/Kconfig.soc
View file

@ -3,6 +3,5 @@
config SOC_FAMILY_SILABS_S1 config SOC_FAMILY_SILABS_S1
bool bool
select SOC_VENDOR_SILABS
rsource "*/Kconfig.soc" rsource "*/Kconfig.soc"

7
soc/silabs/silabs_s2/Kconfig Normal file
View file

@ -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

1
soc/silabs/silabs_s2/Kconfig.soc
View file

@ -3,6 +3,5 @@
config SOC_FAMILY_SILABS_S2 config SOC_FAMILY_SILABS_S2
bool bool
select SOC_VENDOR_SILABS
rsource "*/Kconfig.soc" rsource "*/Kconfig.soc"