Skip to content

Commit c24936f

Browse files
jerome-pouillercfriedt
authored andcommitted
soc: silabs: Drop useless SOC_PART_NUMBER
Variable CONFIG_SOC_PART_NUMBER is only used in CMakeLists.txt of hal_silabs. In fact, this variable can be easily calculated from CONFIG_SOC by changing lower case in upper case. So, let's drop this useless variable. Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
1 parent 215d53f commit c24936f

File tree

21 files changed

+2
-74
lines changed

21 files changed

+2
-74
lines changed

modules/hal_silabs/gecko/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ set(BLOBS_DIR ${ZEPHYR_HAL_SILABS_MODULE_DIR/zephyr/blobs})
1616
# Translate the SoC name and part number into the gecko device and cpu name
1717
# respectively.
1818
string(TOUPPER ${CONFIG_SOC_SERIES} SILABS_GECKO_DEVICE)
19+
string(TOUPPER ${CONFIG_SOC} SILABS_GECKO_PART_NUMBER)
1920

2021
# Get SoC series number, i.e. translate e.g. efr32bg22 -> 22
2122
string(SUBSTRING ${CONFIG_SOC_SERIES} 7 2 GECKO_SERIES_NUMBER)
2223

23-
set(SILABS_GECKO_PART_NUMBER ${CONFIG_SOC_PART_NUMBER})
2424

2525
function(add_prebuilt_library lib_name prebuilt_path)
2626
add_library(${lib_name} STATIC IMPORTED GLOBAL)

modules/hal_silabs/simplicity_sdk/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ set(BLOBS_DIR ${ZEPHYR_HAL_SILABS_MODULE_DIR}/zephyr/blobs/simplicity_sdk)
2222
# Translate the SoC name and part number into the gecko device and cpu name
2323
# respectively.
2424
string(TOUPPER ${CONFIG_SOC_SERIES} SILABS_DEVICE_FAMILY)
25+
string(TOUPPER ${CONFIG_SOC} SILABS_DEVICE_PART_NUMBER)
2526

2627
# Get SoC series number, i.e. translate efr32bg22 -> 22, mgm240p -> 24, simg301 -> 301
2728
if(CONFIG_SOC_SERIES MATCHES "^ef[rm]32")
@@ -34,8 +35,6 @@ else()
3435
message(FATAL_ERROR "unknown part")
3536
endif()
3637

37-
set(SILABS_DEVICE_PART_NUMBER ${CONFIG_SOC_PART_NUMBER})
38-
3938
function(add_prebuilt_library lib_name prebuilt_path)
4039
if(NOT CONFIG_BUILD_ONLY_NO_BLOBS)
4140
add_library(${lib_name} STATIC IMPORTED GLOBAL)

soc/silabs/silabs_s0/efm32hg/Kconfig.soc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,3 @@ config SOC_SERIES
1616

1717
config SOC
1818
default "efm32hg322f64" if SOC_PART_NUMBER_EFM32HG322F64
19-
20-
config SOC_PART_NUMBER
21-
default "EFM32HG322F64" if SOC_PART_NUMBER_EFM32HG322F64

soc/silabs/silabs_s0/efm32wg/Kconfig.soc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,3 @@ config SOC_SERIES
1616

1717
config SOC
1818
default "efm32wg990f256" if SOC_PART_NUMBER_EFM32WG990F256
19-
20-
config SOC_PART_NUMBER
21-
default "EFM32WG990F256" if SOC_PART_NUMBER_EFM32WG990F256

soc/silabs/silabs_s1/efm32gg11b/Kconfig.soc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,3 @@ config SOC_SERIES
2222
config SOC
2323
default "efm32gg11b820f2048gl192" if SOC_PART_NUMBER_EFM32GG11B820F2048GL192
2424
default "efm32gg11b820f2048gm64" if SOC_PART_NUMBER_EFM32GG11B820F2048GM64
25-
26-
config SOC_PART_NUMBER
27-
default "EFM32GG11B820F2048GL192" if SOC_PART_NUMBER_EFM32GG11B820F2048GL192
28-
default "EFM32GG11B820F2048GM64" if SOC_PART_NUMBER_EFM32GG11B820F2048GM64

soc/silabs/silabs_s1/efm32gg12b/Kconfig.soc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,3 @@ config SOC_SERIES
1616

1717
config SOC
1818
default "efm32gg12b810f1024gm64" if SOC_PART_NUMBER_EFM32GG12B810F1024GM64
19-
20-
config SOC_PART_NUMBER
21-
default "EFM32GG12B810F1024GM64" if SOC_PART_NUMBER_EFM32GG12B810F1024GM64

soc/silabs/silabs_s1/efm32jg12b/Kconfig.soc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,3 @@ config SOC_SERIES
1616

1717
config SOC
1818
default "efm32jg12b500f1024gl125" if SOC_PART_NUMBER_EFM32JG12B500F1024GL125
19-
20-
config SOC_PART_NUMBER
21-
default "EFM32JG12B500F1024GL125" if SOC_PART_NUMBER_EFM32JG12B500F1024GL125

soc/silabs/silabs_s1/efm32pg12b/Kconfig.soc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,3 @@ config SOC_SERIES
1616

1717
config SOC
1818
default "efm32pg12b500f1024gl125" if SOC_PART_NUMBER_EFM32PG12B500F1024GL125
19-
20-
config SOC_PART_NUMBER
21-
default "EFM32PG12B500F1024GL125" if SOC_PART_NUMBER_EFM32PG12B500F1024GL125

soc/silabs/silabs_s1/efm32pg1b/Kconfig.soc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,3 @@ config SOC_SERIES
1616

1717
config SOC
1818
default "efm32pg1b200f256gm48" if SOC_PART_NUMBER_EFM32PG1B200F256GM48
19-
20-
config SOC_PART_NUMBER
21-
default "EFM32PG1B200F256GM48" if SOC_PART_NUMBER_EFM32PG1B200F256GM48

soc/silabs/silabs_s1/efr32bg13p/Kconfig.soc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,3 @@ config SOC_SERIES
1616

1717
config SOC
1818
default "efr32bg13p632f512gm48" if SOC_PART_NUMBER_EFR32BG13P632F512GM48
19-
20-
config SOC_PART_NUMBER
21-
default "EFR32BG13P632F512GM48" if SOC_PART_NUMBER_EFR32BG13P632F512GM48

0 commit comments

Comments
 (0)