Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

soc: silabs: Facilitate non-Gecko SoC support #71938

Merged
merged 3 commits into from
Jun 10, 2024
Merged

soc: silabs: Facilitate non-Gecko SoC support #71938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
894da77
modules: Move away from SOC_VENDOR_SILABS
rettichschnidi May 19, 2024
73078dd
driver: Move away from SOC_VENDOR_SILABS
rettichschnidi May 19, 2024
64743ef
soc: silabs: Remove SOC_VENDOR_SILABS
rettichschnidi Apr 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion drivers/hwinfo/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion modules/Kconfig.silabs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 3 additions & 7 deletions soc/silabs/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions soc/silabs/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions soc/silabs/Kconfig.soc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion soc/silabs/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
7 changes: 7 additions & 0 deletions soc/silabs/silabs_s0/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 change: 0 additions & 1 deletion soc/silabs/silabs_s0/Kconfig.soc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@

config SOC_FAMILY_SILABS_S0
bool
select SOC_VENDOR_SILABS

rsource "*/Kconfig.soc"
7 changes: 7 additions & 0 deletions soc/silabs/silabs_s1/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 change: 0 additions & 1 deletion soc/silabs/silabs_s1/Kconfig.soc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@

config SOC_FAMILY_SILABS_S1
bool
select SOC_VENDOR_SILABS

rsource "*/Kconfig.soc"
7 changes: 7 additions & 0 deletions soc/silabs/silabs_s2/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 change: 0 additions & 1 deletion soc/silabs/silabs_s2/Kconfig.soc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@

config SOC_FAMILY_SILABS_S2
bool
select SOC_VENDOR_SILABS

rsource "*/Kconfig.soc"
Loading