From a411959ddc84c1fd8840133abed41b897f4298d0 Mon Sep 17 00:00:00 2001 From: Reto Schneider Date: Sat, 13 Apr 2024 14:43:50 +0200 Subject: [PATCH] soc: silabs: Rename Gecko identifier Currently, the support for Silicon Labs SoCs is limited to the Gecko families. To allow upstreaming support for other SoCs from Silicon Labs (i.e. SiM3U1xx), SOC_VENDOR_SILABS must be renamed so that it does no longer includes non-Gecko SoCs. Signed-off-by: Reto Schneider --- drivers/hwinfo/Kconfig | 2 +- modules/Kconfig.silabs | 2 +- soc/silabs/Kconfig | 6 +++--- soc/silabs/Kconfig.defconfig | 2 +- soc/silabs/Kconfig.soc | 2 +- soc/silabs/silabs_s0/Kconfig.soc | 2 +- soc/silabs/silabs_s1/Kconfig.soc | 2 +- soc/silabs/silabs_s2/Kconfig.soc | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/hwinfo/Kconfig b/drivers/hwinfo/Kconfig index 467a36ad8afeb4a..e815be75a0fe02e 100644 --- a/drivers/hwinfo/Kconfig +++ b/drivers/hwinfo/Kconfig @@ -180,7 +180,7 @@ 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_GECKO && !SOC_SERIES_EFR32MG21 && !SOC_SERIES_EFR32BG22 select SOC_GECKO_RMU help Enable Silabs GECKO hwinfo driver. diff --git a/modules/Kconfig.silabs b/modules/Kconfig.silabs index 0078bfc0b987943..61fe8e3f52f93c2 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_GECKO diff --git a/soc/silabs/Kconfig b/soc/silabs/Kconfig index 4e86a6e2b74fc29..2793edf9ed23fef 100644 --- a/soc/silabs/Kconfig +++ b/soc/silabs/Kconfig @@ -2,11 +2,11 @@ # Copyright (c) 2018 Gil Benkoe # SPDX-License-Identifier: Apache-2.0 -config SOC_VENDOR_SILABS +config SOC_GECKO select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE select BUILD_OUTPUT_HEX -if SOC_VENDOR_SILABS +if SOC_GECKO rsource "*/*/Kconfig" @@ -322,4 +322,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_GECKO diff --git a/soc/silabs/Kconfig.defconfig b/soc/silabs/Kconfig.defconfig index 530325a76a8c0f8..21d19e6c65a26ff 100644 --- a/soc/silabs/Kconfig.defconfig +++ b/soc/silabs/Kconfig.defconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright (c) 2017 Christian Taedcke -if SOC_VENDOR_SILABS +if SOC_GECKO rsource "*/*/Kconfig.defconfig" diff --git a/soc/silabs/Kconfig.soc b/soc/silabs/Kconfig.soc index bea030078b79f67..d34b71462ad57d8 100644 --- a/soc/silabs/Kconfig.soc +++ b/soc/silabs/Kconfig.soc @@ -1,7 +1,7 @@ # Copyright (c) 2017 Christian Taedcke # SPDX-License-Identifier: Apache-2.0 -config SOC_VENDOR_SILABS +config SOC_GECKO bool config SOC_FAMILY diff --git a/soc/silabs/silabs_s0/Kconfig.soc b/soc/silabs/silabs_s0/Kconfig.soc index 870fecc2a4a4951..2c13b65c367cf7c 100644 --- a/soc/silabs/silabs_s0/Kconfig.soc +++ b/soc/silabs/silabs_s0/Kconfig.soc @@ -3,6 +3,6 @@ config SOC_FAMILY_SILABS_S0 bool - select SOC_VENDOR_SILABS + select SOC_GECKO rsource "*/Kconfig.soc" diff --git a/soc/silabs/silabs_s1/Kconfig.soc b/soc/silabs/silabs_s1/Kconfig.soc index d2771e803ec8562..3ee8dfcade595d1 100644 --- a/soc/silabs/silabs_s1/Kconfig.soc +++ b/soc/silabs/silabs_s1/Kconfig.soc @@ -3,6 +3,6 @@ config SOC_FAMILY_SILABS_S1 bool - select SOC_VENDOR_SILABS + select SOC_GECKO rsource "*/Kconfig.soc" diff --git a/soc/silabs/silabs_s2/Kconfig.soc b/soc/silabs/silabs_s2/Kconfig.soc index c8926b83e6ee3a4..698998268fc21d9 100644 --- a/soc/silabs/silabs_s2/Kconfig.soc +++ b/soc/silabs/silabs_s2/Kconfig.soc @@ -3,6 +3,6 @@ config SOC_FAMILY_SILABS_S2 bool - select SOC_VENDOR_SILABS + select SOC_GECKO rsource "*/Kconfig.soc"