diff --git a/modules/hal_silabs/gecko/CMakeLists.txt b/modules/hal_silabs/gecko/CMakeLists.txt index acf8ead687d..3df7bc6d6cb 100644 --- a/modules/hal_silabs/gecko/CMakeLists.txt +++ b/modules/hal_silabs/gecko/CMakeLists.txt @@ -16,11 +16,11 @@ set(BLOBS_DIR ${ZEPHYR_HAL_SILABS_MODULE_DIR/zephyr/blobs}) # Translate the SoC name and part number into the gecko device and cpu name # respectively. string(TOUPPER ${CONFIG_SOC_SERIES} SILABS_GECKO_DEVICE) +string(TOUPPER ${CONFIG_SOC} SILABS_GECKO_PART_NUMBER) # Get SoC series number, i.e. translate e.g. efr32bg22 -> 22 string(SUBSTRING ${CONFIG_SOC_SERIES} 7 2 GECKO_SERIES_NUMBER) -set(SILABS_GECKO_PART_NUMBER ${CONFIG_SOC_PART_NUMBER}) function(add_prebuilt_library lib_name prebuilt_path) add_library(${lib_name} STATIC IMPORTED GLOBAL) diff --git a/modules/hal_silabs/simplicity_sdk/CMakeLists.txt b/modules/hal_silabs/simplicity_sdk/CMakeLists.txt index 3217c556e08..15327389554 100644 --- a/modules/hal_silabs/simplicity_sdk/CMakeLists.txt +++ b/modules/hal_silabs/simplicity_sdk/CMakeLists.txt @@ -22,6 +22,7 @@ set(BLOBS_DIR ${ZEPHYR_HAL_SILABS_MODULE_DIR}/zephyr/blobs/simplicity_sdk) # Translate the SoC name and part number into the gecko device and cpu name # respectively. string(TOUPPER ${CONFIG_SOC_SERIES} SILABS_DEVICE_FAMILY) +string(TOUPPER ${CONFIG_SOC} SILABS_DEVICE_PART_NUMBER) # Get SoC series number, i.e. translate efr32bg22 -> 22, mgm240p -> 24, simg301 -> 301 if(CONFIG_SOC_SERIES MATCHES "^ef[rm]32") @@ -34,8 +35,6 @@ else() message(FATAL_ERROR "unknown part") endif() -set(SILABS_DEVICE_PART_NUMBER ${CONFIG_SOC_PART_NUMBER}) - function(add_prebuilt_library lib_name prebuilt_path) if(NOT CONFIG_BUILD_ONLY_NO_BLOBS) add_library(${lib_name} STATIC IMPORTED GLOBAL) diff --git a/soc/silabs/silabs_s0/efm32hg/Kconfig.soc b/soc/silabs/silabs_s0/efm32hg/Kconfig.soc index 554419215ee..5158f34af88 100644 --- a/soc/silabs/silabs_s0/efm32hg/Kconfig.soc +++ b/soc/silabs/silabs_s0/efm32hg/Kconfig.soc @@ -16,6 +16,3 @@ config SOC_SERIES config SOC default "efm32hg322f64" if SOC_PART_NUMBER_EFM32HG322F64 - -config SOC_PART_NUMBER - default "EFM32HG322F64" if SOC_PART_NUMBER_EFM32HG322F64 diff --git a/soc/silabs/silabs_s0/efm32wg/Kconfig.soc b/soc/silabs/silabs_s0/efm32wg/Kconfig.soc index d97cbb0409b..41ac2154459 100644 --- a/soc/silabs/silabs_s0/efm32wg/Kconfig.soc +++ b/soc/silabs/silabs_s0/efm32wg/Kconfig.soc @@ -16,6 +16,3 @@ config SOC_SERIES config SOC default "efm32wg990f256" if SOC_PART_NUMBER_EFM32WG990F256 - -config SOC_PART_NUMBER - default "EFM32WG990F256" if SOC_PART_NUMBER_EFM32WG990F256 diff --git a/soc/silabs/silabs_s1/efm32gg11b/Kconfig.soc b/soc/silabs/silabs_s1/efm32gg11b/Kconfig.soc index 6894af2c063..41e47f7341a 100644 --- a/soc/silabs/silabs_s1/efm32gg11b/Kconfig.soc +++ b/soc/silabs/silabs_s1/efm32gg11b/Kconfig.soc @@ -22,7 +22,3 @@ config SOC_SERIES config SOC default "efm32gg11b820f2048gl192" if SOC_PART_NUMBER_EFM32GG11B820F2048GL192 default "efm32gg11b820f2048gm64" if SOC_PART_NUMBER_EFM32GG11B820F2048GM64 - -config SOC_PART_NUMBER - default "EFM32GG11B820F2048GL192" if SOC_PART_NUMBER_EFM32GG11B820F2048GL192 - default "EFM32GG11B820F2048GM64" if SOC_PART_NUMBER_EFM32GG11B820F2048GM64 diff --git a/soc/silabs/silabs_s1/efm32gg12b/Kconfig.soc b/soc/silabs/silabs_s1/efm32gg12b/Kconfig.soc index 1a7798c15e0..af8d4df7502 100644 --- a/soc/silabs/silabs_s1/efm32gg12b/Kconfig.soc +++ b/soc/silabs/silabs_s1/efm32gg12b/Kconfig.soc @@ -16,6 +16,3 @@ config SOC_SERIES config SOC default "efm32gg12b810f1024gm64" if SOC_PART_NUMBER_EFM32GG12B810F1024GM64 - -config SOC_PART_NUMBER - default "EFM32GG12B810F1024GM64" if SOC_PART_NUMBER_EFM32GG12B810F1024GM64 diff --git a/soc/silabs/silabs_s1/efm32jg12b/Kconfig.soc b/soc/silabs/silabs_s1/efm32jg12b/Kconfig.soc index 3542d1fb3f9..09b6b226630 100644 --- a/soc/silabs/silabs_s1/efm32jg12b/Kconfig.soc +++ b/soc/silabs/silabs_s1/efm32jg12b/Kconfig.soc @@ -16,6 +16,3 @@ config SOC_SERIES config SOC default "efm32jg12b500f1024gl125" if SOC_PART_NUMBER_EFM32JG12B500F1024GL125 - -config SOC_PART_NUMBER - default "EFM32JG12B500F1024GL125" if SOC_PART_NUMBER_EFM32JG12B500F1024GL125 diff --git a/soc/silabs/silabs_s1/efm32pg12b/Kconfig.soc b/soc/silabs/silabs_s1/efm32pg12b/Kconfig.soc index f8b268c2b67..745b9be884e 100644 --- a/soc/silabs/silabs_s1/efm32pg12b/Kconfig.soc +++ b/soc/silabs/silabs_s1/efm32pg12b/Kconfig.soc @@ -16,6 +16,3 @@ config SOC_SERIES config SOC default "efm32pg12b500f1024gl125" if SOC_PART_NUMBER_EFM32PG12B500F1024GL125 - -config SOC_PART_NUMBER - default "EFM32PG12B500F1024GL125" if SOC_PART_NUMBER_EFM32PG12B500F1024GL125 diff --git a/soc/silabs/silabs_s1/efm32pg1b/Kconfig.soc b/soc/silabs/silabs_s1/efm32pg1b/Kconfig.soc index 39e5ac4d88a..ada131f1a35 100644 --- a/soc/silabs/silabs_s1/efm32pg1b/Kconfig.soc +++ b/soc/silabs/silabs_s1/efm32pg1b/Kconfig.soc @@ -16,6 +16,3 @@ config SOC_SERIES config SOC default "efm32pg1b200f256gm48" if SOC_PART_NUMBER_EFM32PG1B200F256GM48 - -config SOC_PART_NUMBER - default "EFM32PG1B200F256GM48" if SOC_PART_NUMBER_EFM32PG1B200F256GM48 diff --git a/soc/silabs/silabs_s1/efr32bg13p/Kconfig.soc b/soc/silabs/silabs_s1/efr32bg13p/Kconfig.soc index 737b2706d70..c377343f1d2 100644 --- a/soc/silabs/silabs_s1/efr32bg13p/Kconfig.soc +++ b/soc/silabs/silabs_s1/efr32bg13p/Kconfig.soc @@ -16,6 +16,3 @@ config SOC_SERIES config SOC default "efr32bg13p632f512gm48" if SOC_PART_NUMBER_EFR32BG13P632F512GM48 - -config SOC_PART_NUMBER - default "EFR32BG13P632F512GM48" if SOC_PART_NUMBER_EFR32BG13P632F512GM48 diff --git a/soc/silabs/silabs_s1/efr32fg13p/Kconfig.soc b/soc/silabs/silabs_s1/efr32fg13p/Kconfig.soc index 6b3520579e0..b934fae74cc 100644 --- a/soc/silabs/silabs_s1/efr32fg13p/Kconfig.soc +++ b/soc/silabs/silabs_s1/efr32fg13p/Kconfig.soc @@ -16,6 +16,3 @@ config SOC_SERIES config SOC default "efr32fg13p233f512gm48" if SOC_PART_NUMBER_EFR32FG13P233F512GM48 - -config SOC_PART_NUMBER - default "EFR32FG13P233F512GM48" if SOC_PART_NUMBER_EFR32FG13P233F512GM48 diff --git a/soc/silabs/silabs_s1/efr32fg1p/Kconfig.soc b/soc/silabs/silabs_s1/efr32fg1p/Kconfig.soc index 53aa0954032..c23893a71a7 100644 --- a/soc/silabs/silabs_s1/efr32fg1p/Kconfig.soc +++ b/soc/silabs/silabs_s1/efr32fg1p/Kconfig.soc @@ -16,6 +16,3 @@ config SOC_SERIES config SOC default "efr32fg1p133f256gm48" if SOC_PART_NUMBER_EFR32FG1P133F256GM48 - -config SOC_PART_NUMBER - default "EFR32FG1P133F256GM48" if SOC_PART_NUMBER_EFR32FG1P133F256GM48 diff --git a/soc/silabs/silabs_s1/efr32mg12p/Kconfig.soc b/soc/silabs/silabs_s1/efr32mg12p/Kconfig.soc index 6a6b2d77959..cbdf46b522b 100644 --- a/soc/silabs/silabs_s1/efr32mg12p/Kconfig.soc +++ b/soc/silabs/silabs_s1/efr32mg12p/Kconfig.soc @@ -26,8 +26,3 @@ config SOC default "efr32mg12p332f1024gl125" if SOC_PART_NUMBER_EFR32MG12P332F1024GL125 default "efr32mg12p432f1024gl125" if SOC_PART_NUMBER_EFR32MG12P432F1024GL125 default "efr32mg12p433f1024gm68" if SOC_PART_NUMBER_EFR32MG12P433F1024GM68 - -config SOC_PART_NUMBER - default "EFR32MG12P332F1024GL125" if SOC_PART_NUMBER_EFR32MG12P332F1024GL125 - default "EFR32MG12P432F1024GL125" if SOC_PART_NUMBER_EFR32MG12P432F1024GL125 - default "EFR32MG12P433F1024GM68" if SOC_PART_NUMBER_EFR32MG12P433F1024GM68 diff --git a/soc/silabs/silabs_s2/efr32bg22/Kconfig.soc b/soc/silabs/silabs_s2/efr32bg22/Kconfig.soc index 5f3736fa5f5..022aa3816c9 100644 --- a/soc/silabs/silabs_s2/efr32bg22/Kconfig.soc +++ b/soc/silabs/silabs_s2/efr32bg22/Kconfig.soc @@ -16,6 +16,3 @@ config SOC_SERIES config SOC default "efr32bg22c224f512im40" if SOC_PART_NUMBER_EFR32BG22C224F512IM40 - -config SOC_PART_NUMBER - default "EFR32BG22C224F512IM40" if SOC_PART_NUMBER_EFR32BG22C224F512IM40 diff --git a/soc/silabs/silabs_s2/efr32bg27/Kconfig.soc b/soc/silabs/silabs_s2/efr32bg27/Kconfig.soc index 0178346f49b..8a435591729 100644 --- a/soc/silabs/silabs_s2/efr32bg27/Kconfig.soc +++ b/soc/silabs/silabs_s2/efr32bg27/Kconfig.soc @@ -16,6 +16,3 @@ config SOC_SERIES config SOC default "efr32bg27c140f768im40" if SOC_PART_NUMBER_EFR32BG27C140F768IM40 - -config SOC_PART_NUMBER - default "EFR32BG27C140F768IM40" if SOC_PART_NUMBER_EFR32BG27C140F768IM40 diff --git a/soc/silabs/silabs_s2/efr32mg21/Kconfig.soc b/soc/silabs/silabs_s2/efr32mg21/Kconfig.soc index 2fc8c4aa4d1..504b53aae29 100644 --- a/soc/silabs/silabs_s2/efr32mg21/Kconfig.soc +++ b/soc/silabs/silabs_s2/efr32mg21/Kconfig.soc @@ -16,6 +16,3 @@ config SOC_SERIES config SOC default "efr32mg21a020f1024im32" if SOC_PART_NUMBER_EFR32MG21A020F1024IM32 - -config SOC_PART_NUMBER - default "EFR32MG21A020F1024IM32" if SOC_PART_NUMBER_EFR32MG21A020F1024IM32 diff --git a/soc/silabs/silabs_s2/efr32zg23/Kconfig.soc b/soc/silabs/silabs_s2/efr32zg23/Kconfig.soc index 02f6a8229e3..c774e67ba29 100644 --- a/soc/silabs/silabs_s2/efr32zg23/Kconfig.soc +++ b/soc/silabs/silabs_s2/efr32zg23/Kconfig.soc @@ -16,6 +16,3 @@ config SOC_SERIES config SOC default "efr32zg23b020f512im48" if SOC_PART_NUMBER_EFR32ZG23B020F512IM48 - -config SOC_PART_NUMBER - default "EFR32ZG23B020F512IM48" if SOC_PART_NUMBER_EFR32ZG23B020F512IM48 diff --git a/soc/silabs/silabs_s2/xg24/Kconfig.soc b/soc/silabs/silabs_s2/xg24/Kconfig.soc index 80b8f059117..79007042be1 100644 --- a/soc/silabs/silabs_s2/xg24/Kconfig.soc +++ b/soc/silabs/silabs_s2/xg24/Kconfig.soc @@ -56,11 +56,3 @@ config SOC default "efr32mg24b020f1536im40" if SOC_PART_NUMBER_EFR32MG24B020F1536IM40 default "mgm240sd22vna" if SOC_PART_NUMBER_MGM240SD22VNA default "mgm240pb32vna" if SOC_PART_NUMBER_MGM240PB32VNA - -config SOC_PART_NUMBER - default "EFR32MG24B220F1536IM48" if SOC_PART_NUMBER_EFR32MG24B220F1536IM48 - default "EFR32MG24B310F1536IM48" if SOC_PART_NUMBER_EFR32MG24B310F1536IM48 - default "EFR32MG24B210F1536IM48" if SOC_PART_NUMBER_EFR32MG24B210F1536IM48 - default "EFR32MG24B020F1536IM40" if SOC_PART_NUMBER_EFR32MG24B020F1536IM40 - default "MGM240SD22VNA" if SOC_PART_NUMBER_MGM240SD22VNA - default "MGM240PB32VNA" if SOC_PART_NUMBER_MGM240PB32VNA diff --git a/soc/silabs/silabs_s2/xg29/Kconfig.soc b/soc/silabs/silabs_s2/xg29/Kconfig.soc index f17bd7e5033..cc49f743900 100644 --- a/soc/silabs/silabs_s2/xg29/Kconfig.soc +++ b/soc/silabs/silabs_s2/xg29/Kconfig.soc @@ -48,11 +48,3 @@ config SOC default "efr32bg29b230f1024cm40" if SOC_PART_NUMBER_EFR32BG29B230F1024CM40 default "efr32mg29b140f1024im40" if SOC_PART_NUMBER_EFR32MG29B140F1024IM40 default "efr32mg29b230f1024cm40" if SOC_PART_NUMBER_EFR32MG29B230F1024CM40 - -config SOC_PART_NUMBER - default "EFR32BG29B140F1024IM40" if SOC_PART_NUMBER_EFR32BG29B140F1024IM40 - default "EFR32BG29B220F1024CJ45" if SOC_PART_NUMBER_EFR32BG29B220F1024CJ45 - default "EFR32BG29B221F1024CJ45" if SOC_PART_NUMBER_EFR32BG29B221F1024CJ45 - default "EFR32BG29B230F1024CM40" if SOC_PART_NUMBER_EFR32BG29B230F1024CM40 - default "EFR32MG29B140F1024IM40" if SOC_PART_NUMBER_EFR32MG29B140F1024IM40 - default "EFR32MG29B230F1024CM40" if SOC_PART_NUMBER_EFR32MG29B230F1024CM40 diff --git a/soc/silabs/silabs_sim3/sim3u/Kconfig.soc b/soc/silabs/silabs_sim3/sim3u/Kconfig.soc index b399f388152..14e8e3ab46f 100644 --- a/soc/silabs/silabs_sim3/sim3u/Kconfig.soc +++ b/soc/silabs/silabs_sim3/sim3u/Kconfig.soc @@ -22,7 +22,3 @@ config SOC_SERIES config SOC default "sim3u167" if SOC_PART_NUMBER_SIM3U167BGM default "sim3u167" if SOC_PART_NUMBER_SIM3U167AGQ - -config SOC_PART_NUMBER - default "SiM3U167BGM" if SOC_PART_NUMBER_SIM3U167BGM - default "SiM3U167AGQ" if SOC_PART_NUMBER_SIM3U167AGQ diff --git a/soc/silabs/silabs_siwx91x/siwg917/Kconfig.soc b/soc/silabs/silabs_siwx91x/siwg917/Kconfig.soc index c5e89582184..84b8d100e3a 100644 --- a/soc/silabs/silabs_siwx91x/siwg917/Kconfig.soc +++ b/soc/silabs/silabs_siwx91x/siwg917/Kconfig.soc @@ -16,6 +16,3 @@ config SOC_SERIES config SOC default "siwg917m111mgtba" if SOC_PART_NUMBER_SIWG917M111MGTBA - -config SOC_PART_NUMBER - default "SIWG917M111MGTBA" if SOC_PART_NUMBER_SIWG917M111MGTBA