Skip to content

soc: silabs: s2: make order in soc Kconfig's #93456

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+79 −75
Open

soc: silabs: s2: make order in soc Kconfig's #93456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions include/zephyr/drivers/clock_control/clock_control_silabs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@

#include <zephyr/drivers/clock_control.h>

#if defined(CONFIG_SOC_SERIES_EFR32MG21)
#if defined(CONFIG_SOC_SILABS_XG21)
#include <zephyr/dt-bindings/clock/silabs/xg21-clock.h>
#elif defined(CONFIG_SOC_SERIES_EFR32BG22)
#elif defined(CONFIG_SOC_SILABS_XG22)
#include <zephyr/dt-bindings/clock/silabs/xg22-clock.h>
#elif defined(CONFIG_SOC_SERIES_EFR32ZG23)
#elif defined(CONFIG_SOC_SILABS_XG23)
#include <zephyr/dt-bindings/clock/silabs/xg23-clock.h>
#elif defined(CONFIG_SOC_SERIES_XG24)
#elif defined(CONFIG_SOC_SILABS_XG24)
#include <zephyr/dt-bindings/clock/silabs/xg24-clock.h>
#elif defined(CONFIG_SOC_SERIES_EFR32BG27)
#elif defined(CONFIG_SOC_SILABS_XG27)
#include <zephyr/dt-bindings/clock/silabs/xg27-clock.h>
#elif defined(CONFIG_SOC_SERIES_EFR32BG29) || defined(CONFIG_SOC_SERIES_EFR32MG29)
#elif defined(CONFIG_SOC_SILABS_XG29)
#include <zephyr/dt-bindings/clock/silabs/xg29-clock.h>
#endif

Expand Down
1 change: 1 addition & 0 deletions soc/silabs/silabs_s2/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ config SOC_FAMILY_SILABS_S2
select BUILD_OUTPUT_HEX
select SOC_PREP_HOOK
select SOC_EARLY_INIT_HOOK
select HAS_SILABS_SISDK

rsource "*/Kconfig"

Expand Down
7 changes: 4 additions & 3 deletions soc/silabs/silabs_s2/efr32mg21/Kconfig → soc/silabs/silabs_s2/xg21/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2020 TriaGnoSys GmbH
# SPDX-License-Identifier: Apache-2.0

config SOC_SERIES_EFR32MG21
config SOC_SILABS_XG21
select ARM
select CPU_CORTEX_M33
select CPU_CORTEX_M_HAS_DWT
Expand All @@ -10,12 +10,13 @@ config SOC_SERIES_EFR32MG21
select CPU_HAS_FPU
select CPU_HAS_ARM_MPU
select CPU_HAS_ARM_SAU
select SOC_GECKO_HAS_RADIO
select HAS_SILABS_SISDK
select HAS_SWO
select SOC_GECKO_CMU
select SOC_GECKO_EMU
select SOC_GECKO_GPIO
select SOC_GECKO_DEV_INIT
select SOC_GECKO_SE
select HAS_PM

config SOC_SERIES_EFR32MG21
select SOC_GECKO_HAS_RADIO
2 changes: 1 addition & 1 deletion ...abs/silabs_s2/efr32mg21/Kconfig.defconfig → soc/silabs/silabs_s2/xg21/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2020 TriaGnoSys GmbH
# SPDX-License-Identifier: Apache-2.0

if SOC_SERIES_EFR32MG21
if SOC_SILABS_XG21

config NUM_IRQS
# must be >= the highest interrupt number used
Expand Down
8 changes: 7 additions & 1 deletion soc/silabs/silabs_s2/efr32mg21/Kconfig.soc → soc/silabs/silabs_s2/xg21/Kconfig.soc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
# Copyright (c) 2020 TriaGnoSys GmbH
# SPDX-License-Identifier: Apache-2.0

config SOC_SERIES_EFR32MG21
config SOC_SILABS_XG21
bool
select SOC_FAMILY_SILABS_S2
help
Silicon Labs XG21 Generic Family SoC and modules

config SOC_SERIES_EFR32MG21
bool
select SOC_SILABS_XG21
help
Silicon Labs EFR32MG21 (Mighty Gecko) Series MCU

Expand Down
0 soc/silabs/silabs_s2/efr32mg21/soc_pinmap.h → soc/silabs/silabs_s2/xg21/soc_pinmap.h
View file
Open in desktop
File renamed without changes.
7 changes: 4 additions & 3 deletions soc/silabs/silabs_s2/efr32bg22/Kconfig → soc/silabs/silabs_s2/xg22/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
# Copyright (c) 2021 Sateesh Kotapati
# SPDX-License-Identifier: Apache-2.0

config SOC_SERIES_EFR32BG22
config SOC_SILABS_XG22
select ARM
select ARMV8_M_DSP
select ARM_TRUSTZONE_M
select CPU_CORTEX_M33
select CPU_HAS_ARM_MPU
select CPU_HAS_ARM_SAU
select CPU_HAS_FPU
select HAS_SILABS_SISDK
select HAS_SWO
select SOC_GECKO_HAS_RADIO
select SOC_GECKO_GPIO
select SOC_GECKO_CMU
select SOC_GECKO_CORE
select SOC_GECKO_DEV_INIT
select SOC_GECKO_SE
select HAS_PM

config SOC_SERIES_EFR32BG22
select SOC_GECKO_HAS_RADIO
2 changes: 1 addition & 1 deletion ...abs/silabs_s2/efr32bg22/Kconfig.defconfig → soc/silabs/silabs_s2/xg22/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2021 Sateesh Kotapati
# SPDX-License-Identifier: Apache-2.0

if SOC_SERIES_EFR32BG22
if SOC_SILABS_XG22

config NUM_IRQS
# must be >= the highest interrupt number used
Expand Down
8 changes: 7 additions & 1 deletion soc/silabs/silabs_s2/efr32bg22/Kconfig.soc → soc/silabs/silabs_s2/xg22/Kconfig.soc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
# Copyright (c) 2021 Sateesh Kotapati
# SPDX-License-Identifier: Apache-2.0

config SOC_SERIES_EFR32BG22
config SOC_SILABS_XG22
bool
select SOC_FAMILY_SILABS_S2
help
Silicon Labs XG22 Series SoC and modules

config SOC_SERIES_EFR32BG22
bool
select SOC_SILABS_XG22
help
Silicon Labs EFR32BG22 (Blue Gecko) Series MCU

Expand Down
7 changes: 4 additions & 3 deletions soc/silabs/silabs_s2/efr32zg23/Kconfig → soc/silabs/silabs_s2/xg23/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2024 Yishai Jaffe
# SPDX-License-Identifier: Apache-2.0

config SOC_SERIES_EFR32ZG23
config SOC_SILABS_XG23
select ARM
select ARMV8_M_DSP
select ARM_TRUSTZONE_M
Expand All @@ -11,12 +11,13 @@ config SOC_SERIES_EFR32ZG23
select CPU_HAS_ARM_SAU
select CPU_HAS_FPU
select HAS_PM
select HAS_SILABS_SISDK
select HAS_SWO
select SOC_GECKO_CMU
select SOC_GECKO_CORE
select SOC_GECKO_DEV_INIT
select SOC_GECKO_EMU
select SOC_GECKO_GPIO
select SOC_GECKO_HAS_RADIO
select SOC_GECKO_SE

config SOC_SERIES_EFR32ZG23
select SOC_GECKO_HAS_RADIO
2 changes: 1 addition & 1 deletion ...abs/silabs_s2/efr32zg23/Kconfig.defconfig → soc/silabs/silabs_s2/xg23/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2024 Yishai Jaffe
# SPDX-License-Identifier: Apache-2.0

if SOC_SERIES_EFR32ZG23
if SOC_SILABS_XG23

config NUM_IRQS
# must be >= the highest interrupt number used
Expand Down
8 changes: 7 additions & 1 deletion soc/silabs/silabs_s2/efr32zg23/Kconfig.soc → soc/silabs/silabs_s2/xg23/Kconfig.soc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
# Copyright (c) 2024 Yishai Jaffe
# SPDX-License-Identifier: Apache-2.0

config SOC_SERIES_EFR32ZG23
config SOC_SILABS_XG23
bool
select SOC_FAMILY_SILABS_S2
help
Silicon Labs XG23 Series SoC and modules

config SOC_SERIES_EFR32ZG23
bool
select SOC_SILABS_XG23
help
Silicon Labs EFR32ZG23 Series MCU

Expand Down
25 changes: 5 additions & 20 deletions soc/silabs/silabs_s2/xg24/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (c) 2025 Silicon Laboratories Inc.
# SPDX-License-Identifier: Apache-2.0

config SOC_SERIES_EFR32MG24
config SOC_SILABS_XG24
select ARM
select CPU_CORTEX_M33
select CPU_HAS_FPU
Expand All @@ -11,8 +11,6 @@ config SOC_SERIES_EFR32MG24
select CPU_CORTEX_M_HAS_DWT
select ARMV8_M_DSP
select ARM_TRUSTZONE_M
select SOC_GECKO_HAS_RADIO
select HAS_SILABS_SISDK
select HAS_SWO
select SOC_GECKO_CMU
select SOC_GECKO_EMU
Expand All @@ -21,22 +19,9 @@ config SOC_SERIES_EFR32MG24
select SOC_GECKO_SE
select HAS_PM

config SOC_SERIES_MGM24
select ARM
select CPU_CORTEX_M33
select CPU_HAS_FPU
select CPU_HAS_ARM_MPU
select CPU_HAS_ARM_SAU
select CPU_CORTEX_M_HAS_DWT
select ARMV8_M_DSP
select ARM_TRUSTZONE_M
config SOC_SERIES_EFR32MG24
select SOC_GECKO_HAS_RADIO
select HAS_SILABS_SISDK
select HAS_SWO
select SOC_GECKO_CMU
select SOC_GECKO_EMU
select SOC_GECKO_GPIO
select SOC_GECKO_DEV_INIT
select SOC_GECKO_SE
select HAS_PM

config SOC_SERIES_MGM24
select SILABS_DEVICE_IS_MODULE
select SOC_GECKO_HAS_RADIO
2 changes: 1 addition & 1 deletion soc/silabs/silabs_s2/xg24/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (c) 2025 Silicon Laboratories Inc.
# SPDX-License-Identifier: Apache-2.0

if SOC_SERIES_EFR32MG24 || SOC_SERIES_MGM24
if SOC_SILABS_XG24

config NUM_IRQS
# must be >= the highest interrupt number used
Expand Down
11 changes: 5 additions & 6 deletions soc/silabs/silabs_s2/xg24/Kconfig.soc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,21 @@
# Copyright (c) 2025 Silicon Laboratories Inc.
# SPDX-License-Identifier: Apache-2.0

config SOC_SERIES_XG24
config SOC_SILABS_XG24
bool
select SOC_FAMILY_SILABS_S2
help
Silicon Labs EFR32 24 Series SoC and modules
Silicon Labs XG24 Series SoC and modules

config SOC_SERIES_EFR32MG24
bool
select SOC_FAMILY_SILABS_S2
select SOC_SERIES_XG24
select SOC_SILABS_XG24
help
Silicon Labs EFR32MG24 (Mighty Gecko) Series MCU

config SOC_SERIES_MGM24
bool
select SOC_FAMILY_SILABS_S2
select SOC_SERIES_XG24
select SOC_SILABS_XG24
help
Silicon Labs MGM240 (Mighty Gecko) Series MCU modules

Expand Down
7 changes: 4 additions & 3 deletions soc/silabs/silabs_s2/efr32bg27/Kconfig → soc/silabs/silabs_s2/xg27/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
# Copyright (c) 2023 Antmicro <www.antmicro.com>
# SPDX-License-Identifier: Apache-2.0

config SOC_SERIES_EFR32BG27
config SOC_SILABS_XG27
select ARM
select ARMV8_M_DSP
select ARM_TRUSTZONE_M
select CPU_CORTEX_M33
select CPU_HAS_ARM_MPU
select CPU_HAS_ARM_SAU
select CPU_HAS_FPU
select HAS_SILABS_SISDK
select HAS_SWO
select SOC_GECKO_HAS_RADIO
select SOC_GECKO_CMU
select SOC_GECKO_CORE
select SOC_GECKO_DEV_INIT
select SOC_GECKO_SE
select HAS_PM

config SOC_SERIES_EFR32BG27
select SOC_GECKO_HAS_RADIO
2 changes: 1 addition & 1 deletion ...abs/silabs_s2/efr32bg27/Kconfig.defconfig → soc/silabs/silabs_s2/xg27/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2023 Antmicro <www.antmicro.com>
# SPDX-License-Identifier: Apache-2.0

if SOC_SERIES_EFR32BG27
if SOC_SILABS_XG27

config NUM_IRQS
# must be >= the highest interrupt number used
Expand Down
8 changes: 7 additions & 1 deletion soc/silabs/silabs_s2/efr32bg27/Kconfig.soc → soc/silabs/silabs_s2/xg27/Kconfig.soc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
# Copyright (c) 2023 Antmicro <www.antmicro.com>
# SPDX-License-Identifier: Apache-2.0

config SOC_SERIES_EFR32BG27
config SOC_SILABS_XG27
bool
select SOC_FAMILY_SILABS_S2
help
Silicon Labs XG27 Series SoC and modules

config SOC_SERIES_EFR32BG27
bool
select SOC_SILABS_XG27
help
Silicon Labs EFR32BG27 (Blue Gecko) Series MCU

Expand Down
23 changes: 4 additions & 19 deletions soc/silabs/silabs_s2/xg29/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2025 Silicon Laboratories Inc.
# SPDX-License-Identifier: Apache-2.0

config SOC_SERIES_EFR32BG29
config SOC_SILABS_XG29
select ARM
select CPU_CORTEX_M33
select CPU_HAS_FPU
Expand All @@ -10,8 +10,6 @@ config SOC_SERIES_EFR32BG29
select CPU_CORTEX_M_HAS_DWT
select ARMV8_M_DSP
select ARM_TRUSTZONE_M
select SOC_GECKO_HAS_RADIO
select HAS_SILABS_SISDK
select HAS_SWO
select SOC_GECKO_CMU
select SOC_GECKO_EMU
Expand All @@ -20,21 +18,8 @@ config SOC_SERIES_EFR32BG29
select SOC_GECKO_SE
select HAS_PM

config SOC_SERIES_EFR32BG29
select SOC_GECKO_HAS_RADIO

config SOC_SERIES_EFR32MG29
select ARM
select CPU_CORTEX_M33
select CPU_HAS_FPU
select CPU_HAS_ARM_MPU
select CPU_HAS_ARM_SAU
select CPU_CORTEX_M_HAS_DWT
select ARMV8_M_DSP
select ARM_TRUSTZONE_M
select SOC_GECKO_HAS_RADIO
select HAS_SILABS_SISDK
select HAS_SWO
select SOC_GECKO_CMU
select SOC_GECKO_EMU
select SOC_GECKO_GPIO
select SOC_GECKO_DEV_INIT
select SOC_GECKO_SE
select HAS_PM
2 changes: 1 addition & 1 deletion soc/silabs/silabs_s2/xg29/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2025 Silicon Laboratories Inc.
# SPDX-License-Identifier: Apache-2.0

if SOC_SERIES_EFR32BG29 || SOC_SERIES_EFR32MG29
if SOC_SILABS_XG29

config NUM_IRQS
# must be >= the highest interrupt number used
Expand Down
10 changes: 8 additions & 2 deletions soc/silabs/silabs_s2/xg29/Kconfig.soc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
# Copyright (c) 2025 Silicon Laboratories Inc.
# SPDX-License-Identifier: Apache-2.0

config SOC_SERIES_EFR32BG29
config SOC_SILABS_XG29
bool
select SOC_FAMILY_SILABS_S2
help
Silicon Labs XG29 Series SoC and modules

config SOC_SERIES_EFR32BG29
bool
select SOC_SILABS_XG29
help
Silicon Labs EFR32BG29 (Blue Gecko) Series MCU

config SOC_SERIES_EFR32MG29
bool
select SOC_FAMILY_SILABS_S2
select SOC_SILABS_XG29
help
Silicon Labs EFR32MG29 (Mighty Gecko) Series MCU

Expand Down