diff --git a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151x8a b/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151x8a deleted file mode 100644 index cebe7f6b32c..00000000000 --- a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151x8a +++ /dev/null @@ -1,14 +0,0 @@ -# ST Microelectronics STM32L151X8-A MCU - -# Copyright (c) 2019 eTactica ehf -# SPDX-License-Identifier: Apache-2.0 - -if SOC_STM32L151X8A - -config SOC - default "stm32l151x8a" - -config NUM_IRQS - default 45 - -endif # SOC_STM32L151X8A diff --git a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.soc b/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.soc deleted file mode 100644 index 07cffb5b3b0..00000000000 --- a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.soc +++ /dev/null @@ -1,28 +0,0 @@ -# ST Microelectronics STM32L1 MCU line - -# Copyright (c) 2019 Linaro Ltd. -# SPDX-License-Identifier: Apache-2.0 - -choice - prompt "STM32L1x MCU Selection" - depends on SOC_SERIES_STM32L1X - -config SOC_STM32L151X8A - bool "STM32L151X8A" - -config SOC_STM32L151XB - bool "STM32L151XB" - -config SOC_STM32L151XBA - bool "STM32L151XBA" - -config SOC_STM32L151XC - bool "STM32L151XC" - -config SOC_STM32L152XC - bool "STM32L152XC" - -config SOC_STM32L152XE - bool "STM32L152XE" - -endchoice diff --git a/soc/st/stm32/soc.yml b/soc/st/stm32/soc.yml index f302607d0ab..446aac35f45 100644 --- a/soc/st/stm32/soc.yml +++ b/soc/st/stm32/soc.yml @@ -53,3 +53,10 @@ family: - name: stm32f765xx - name: stm32f767xx - name: stm32f769xx + - name: stm32l1x + socs: + - name: stm32l151xb + - name: stm32l151xba + - name: stm32l151xc + - name: stm32l152xc + - name: stm32l152xe diff --git a/soc/soc_legacy/arm/st_stm32/stm32l1/CMakeLists.txt b/soc/st/stm32/stm32l1/CMakeLists.txt similarity index 85% rename from soc/soc_legacy/arm/st_stm32/stm32l1/CMakeLists.txt rename to soc/st/stm32/stm32l1/CMakeLists.txt index 68bf00e81c1..3e033529043 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l1/CMakeLists.txt +++ b/soc/st/stm32/stm32l1/CMakeLists.txt @@ -3,4 +3,6 @@ zephyr_sources( soc.c ) +zephyr_include_directories(.) + set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "") diff --git a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.series b/soc/st/stm32/stm32l1/Kconfig similarity index 61% rename from soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.series rename to soc/st/stm32/stm32l1/Kconfig index d21881d6128..db21b1d0bde 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.series +++ b/soc/st/stm32/stm32l1/Kconfig @@ -1,16 +1,12 @@ -# ST Microelectronics STM32L1 MCU series +# STMicroelectronics STM32L1 MCU series # Copyright (c) 2019 Linaro Ltd. # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32L1X - bool "STM32L1x Series MCU" select ARM select CPU_CORTEX_M3 select CPU_CORTEX_M_HAS_DWT - select SOC_FAMILY_STM32 select HAS_STM32CUBE select HAS_SWO select CPU_HAS_ARM_MPU - help - Enable support for STM32L1 MCU series diff --git a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.series b/soc/st/stm32/stm32l1/Kconfig.defconfig similarity index 64% rename from soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.series rename to soc/st/stm32/stm32l1/Kconfig.defconfig index 6360e1746eb..e04f33b22dd 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.series +++ b/soc/st/stm32/stm32l1/Kconfig.defconfig @@ -1,14 +1,11 @@ -# ST Microelectronics STM32L1 MCU line +# STMicroelectronics STM32L1 MCU line # Copyright (c) 2019 Linaro Ltd. # SPDX-License-Identifier: Apache-2.0 if SOC_SERIES_STM32L1X -source "soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l1*" - -config SOC_SERIES - default "stm32l1" +rsource "Kconfig.defconfig.stm32l1*" # adjust the fallback because of the LSI oscaillator characteristics config TASK_WDT_HW_FALLBACK_DELAY diff --git a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xb b/soc/st/stm32/stm32l1/Kconfig.defconfig.stm32l151xb similarity index 66% rename from soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xb rename to soc/st/stm32/stm32l1/Kconfig.defconfig.stm32l151xb index f86cb99e14b..dc9c04cda24 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xb +++ b/soc/st/stm32/stm32l1/Kconfig.defconfig.stm32l151xb @@ -1,13 +1,10 @@ -# ST Microelectronics STM32L151XB MCU +# STMicroelectronics STM32L151XB MCU # Copyright (c) 2019 Linaro Ltd. # SPDX-License-Identifier: Apache-2.0 if SOC_STM32L151XB -config SOC - default "stm32l151xb" - config NUM_IRQS default 45 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xba b/soc/st/stm32/stm32l1/Kconfig.defconfig.stm32l151xba similarity index 66% rename from soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xba rename to soc/st/stm32/stm32l1/Kconfig.defconfig.stm32l151xba index b93b1e9dd28..f28ad427628 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xba +++ b/soc/st/stm32/stm32l1/Kconfig.defconfig.stm32l151xba @@ -1,13 +1,10 @@ -# ST Microelectronics STM32L151XB-A MCU +# STMicroelectronics STM32L151XB-A MCU # Copyright (c) 2019 Linaro Ltd. # SPDX-License-Identifier: Apache-2.0 if SOC_STM32L151XBA -config SOC - default "stm32l151xba" - config NUM_IRQS default 45 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xc b/soc/st/stm32/stm32l1/Kconfig.defconfig.stm32l151xc similarity index 73% rename from soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xc rename to soc/st/stm32/stm32l1/Kconfig.defconfig.stm32l151xc index af0ce69ba01..ba82596f38f 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xc +++ b/soc/st/stm32/stm32l1/Kconfig.defconfig.stm32l151xc @@ -1,13 +1,10 @@ -# ST Microelectronics STM32L151XC MCU +# STMicroelectronics STM32L151XC MCU # Copyright (c) 2020 Abel Sensors # SPDX-License-Identifier: Apache-2.0 if SOC_STM32L151XC -config SOC - default "stm32l151xc" - # Based on stm32cube number of interrupts+1, not datasheet config NUM_IRQS default 57 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l152xc b/soc/st/stm32/stm32l1/Kconfig.defconfig.stm32l152xc similarity index 65% rename from soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l152xc rename to soc/st/stm32/stm32l1/Kconfig.defconfig.stm32l152xc index c0f87fe11ff..661ce869a45 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l152xc +++ b/soc/st/stm32/stm32l1/Kconfig.defconfig.stm32l152xc @@ -1,14 +1,10 @@ -# ST Microelectronics STM32L152XC MCU +# STMicroelectronics STM32L152XC MCU # Copyright (c) 2020 Abel Sensors # SPDX-License-Identifier: Apache-2.0 if SOC_STM32L152XC -config SOC - string - default "stm32l152xc" - config NUM_IRQS int default 57 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l152xe b/soc/st/stm32/stm32l1/Kconfig.defconfig.stm32l152xe similarity index 83% rename from soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l152xe rename to soc/st/stm32/stm32l1/Kconfig.defconfig.stm32l152xe index 9a979aa8094..604cad7aaf5 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l152xe +++ b/soc/st/stm32/stm32l1/Kconfig.defconfig.stm32l152xe @@ -5,10 +5,6 @@ if SOC_STM32L152XE -config SOC - string - default "stm32l152xe" - config NUM_IRQS int default 57 diff --git a/soc/st/stm32/stm32l1/Kconfig.soc b/soc/st/stm32/stm32l1/Kconfig.soc new file mode 100644 index 00000000000..5f420d696e1 --- /dev/null +++ b/soc/st/stm32/stm32l1/Kconfig.soc @@ -0,0 +1,38 @@ +# STMicroelectronics STM32L1 MCU line + +# Copyright (c) 2019 Linaro Ltd. +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_STM32L1X + bool + select SOC_FAMILY_STM32 + +config SOC_SERIES + default "stm32l1" if SOC_SERIES_STM32L1X + +config SOC_STM32L151XB + bool + select SOC_SERIES_STM32L1X + +config SOC_STM32L151XBA + bool + select SOC_SERIES_STM32L1X + +config SOC_STM32L151XC + bool + select SOC_SERIES_STM32L1X + +config SOC_STM32L152XC + bool + select SOC_SERIES_STM32L1X + +config SOC_STM32L152XE + bool + select SOC_SERIES_STM32L1X + +config SOC + default "stm32l151xb" if SOC_STM32L151XB + default "stm32l151xba" if SOC_STM32L151XBA + default "stm32l151xc" if SOC_STM32L151XC + default "stm32l152xc" if SOC_STM32L152XC + default "stm32l152xe" if SOC_STM32L152XE diff --git a/soc/soc_legacy/arm/st_stm32/stm32l1/soc.c b/soc/st/stm32/stm32l1/soc.c similarity index 100% rename from soc/soc_legacy/arm/st_stm32/stm32l1/soc.c rename to soc/st/stm32/stm32l1/soc.c diff --git a/soc/soc_legacy/arm/st_stm32/stm32l1/soc.h b/soc/st/stm32/stm32l1/soc.h similarity index 100% rename from soc/soc_legacy/arm/st_stm32/stm32l1/soc.h rename to soc/st/stm32/stm32l1/soc.h