diff --git a/soc/silabs/CMakeLists.txt b/soc/silabs/CMakeLists.txt index d173ecfec66..63d393a8d74 100644 --- a/soc/silabs/CMakeLists.txt +++ b/soc/silabs/CMakeLists.txt @@ -2,6 +2,7 @@ # Copyright (c) 2017 Christian Taedcke add_subdirectory(common) +zephyr_include_directories(${SOC_FAMILY}) zephyr_include_directories(${SOC_FAMILY}/${SOC_SERIES}) add_subdirectory_ifdef(CONFIG_SOC_FAMILY_SILABS_S2 silabs_s2) diff --git a/soc/silabs/silabs_s2/efr32bg22/soc.h b/soc/silabs/silabs_s2/efr32bg22/soc.h deleted file mode 100644 index 7591b111ad2..00000000000 --- a/soc/silabs/silabs_s2/efr32bg22/soc.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2021 Sateesh Kotapati - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/** - * @file - * @brief Register access macros for the EFR32BG22 SoC - * - */ - -#ifndef EFR32BG22_SOC_H_ -#define EFR32BG22_SOC_H_ - -#ifndef _ASMLANGUAGE - -#include -#include "../common/soc_gpio.h" - -#endif /* !_ASMLANGUAGE */ - -#endif /* EFR32BG22_SOC_H_ */ diff --git a/soc/silabs/silabs_s2/efr32bg27/soc.h b/soc/silabs/silabs_s2/efr32bg27/soc.h deleted file mode 100644 index b1974d02c00..00000000000 --- a/soc/silabs/silabs_s2/efr32bg27/soc.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright (c) 2023 Antmicro - * SPDX-License-Identifier: Apache-2.0 - */ - -/** - * @file - * @brief Register access macros for the EFR32BG27 SoC - */ - -#ifndef EFR32BG27_SOC_H_ -#define EFR32BG27_SOC_H_ - -#ifndef _ASMLANGUAGE -#include -#include "../common/soc_gpio.h" -#endif /* _ASMLANGUAGE */ - -#endif /* EFR32BG27_SOC_H_ */ diff --git a/soc/silabs/silabs_s2/efr32mg21/soc.h b/soc/silabs/silabs_s2/efr32mg21/soc.h deleted file mode 100644 index 90b93a0acd1..00000000000 --- a/soc/silabs/silabs_s2/efr32mg21/soc.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2020 TriaGnoSys GmbH - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/** - * @file - * @brief Board configuration macros for the EFR32MG21 SoC - * - */ - -#ifndef _SILABS_EFR32MG21_SOC_H -#define _SILABS_EFR32MG21_SOC_H - -#include - -#ifndef _ASMLANGUAGE - -#include - -#include "soc_pinmap.h" -#include "../common/soc_gpio.h" - - -#endif /* !_ASMLANGUAGE */ - -#endif /* _SILABS_EFR32MG21_SOC_H */ diff --git a/soc/silabs/silabs_s2/efr32mg24/soc.h b/soc/silabs/silabs_s2/efr32mg24/soc.h deleted file mode 100644 index 210526c1109..00000000000 --- a/soc/silabs/silabs_s2/efr32mg24/soc.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2020 TriaGnoSys GmbH - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/** - * @file - * @brief Board configuration macros for the EFR32MG24 SoC - * - */ - -#ifndef _SILABS_EFR32MG24_SOC_H -#define _SILABS_EFR32MG24_SOC_H - -#include - -#ifndef _ASMLANGUAGE - -#include - -#include "soc_pinmap.h" -#include "../common/soc_gpio.h" - -/* Add include for DTS generated information */ -#include - -#endif /* !_ASMLANGUAGE */ - -#endif /* _SILABS_EFR32MG24_SOC_H */ diff --git a/soc/silabs/silabs_s2/efr32zg23/soc.h b/soc/silabs/silabs_s2/efr32zg23/soc.h deleted file mode 100644 index 21722ac056d..00000000000 --- a/soc/silabs/silabs_s2/efr32zg23/soc.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2024 Yishai Jaffe - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/** - * @file - * @brief Register access macros for the EFR32ZG23 SoC - * - */ - -#ifndef EFR32ZG23_SOC_H_ -#define EFR32ZG23_SOC_H_ - -#ifndef _ASMLANGUAGE - -#include -#include "../common/soc_gpio.h" - -#endif /* !_ASMLANGUAGE */ - -#endif /* EFR32ZG23_SOC_H_ */ diff --git a/soc/silabs/silabs_s2/soc.h b/soc/silabs/silabs_s2/soc.h new file mode 100644 index 00000000000..9933938e09f --- /dev/null +++ b/soc/silabs/silabs_s2/soc.h @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2025 Silicon Laboratories Inc. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/** + * @file + * @brief Register access macros for Silabs Series 2 SoCs + * + */ + +#ifndef SILABS_S2_SOC_H_ +#define SILABS_S2_SOC_H_ + +#ifndef _ASMLANGUAGE +#include +#endif + +#endif