From d15144f5823a38e7dac7b623865a3dd9eaa0805c Mon Sep 17 00:00:00 2001 From: Guillaume Gautier Date: Fri, 9 Feb 2024 09:07:08 +0100 Subject: [PATCH] soc: st: stm32: Migrate STM32L4 series Port STM32L4 series to HW model v2 Signed-off-by: Guillaume Gautier --- .../arm/st_stm32/stm32l4/Kconfig.soc | 70 ----------- soc/st/stm32/soc.yml | 21 ++++ .../stm32}/stm32l4/CMakeLists.txt | 2 + .../stm32/stm32l4/Kconfig} | 4 - .../stm32/stm32l4/Kconfig.defconfig} | 2 +- .../stm32l4/Kconfig.defconfig.stm32l412xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l422xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l431xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l432xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l433xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l451xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l452xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l462xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l471xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l475xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l476xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l486xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l496xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l4a6xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l4p5xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l4q5xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l4r5xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l4r9xx | 3 - .../stm32l4/Kconfig.defconfig.stm32l4s5xx | 3 - soc/st/stm32/stm32l4/Kconfig.soc | 111 ++++++++++++++++++ .../arm/st_stm32 => st/stm32}/stm32l4/power.c | 0 .../st_stm32 => st/stm32}/stm32l4/poweroff.c | 0 .../arm/st_stm32 => st/stm32}/stm32l4/soc.c | 0 .../arm/st_stm32 => st/stm32}/stm32l4/soc.h | 0 29 files changed, 135 insertions(+), 132 deletions(-) delete mode 100644 soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.soc rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/CMakeLists.txt (91%) rename soc/{soc_legacy/arm/st_stm32/stm32l4/Kconfig.series => st/stm32/stm32l4/Kconfig} (78%) rename soc/{soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.series => st/stm32/stm32l4/Kconfig.defconfig} (80%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l412xx (84%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l422xx (84%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l431xx (83%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l432xx (86%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l433xx (84%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l451xx (85%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l452xx (84%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l462xx (84%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l471xx (84%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l475xx (84%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l476xx (86%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l486xx (88%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l496xx (88%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l4a6xx (89%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l4p5xx (84%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l4q5xx (84%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l4r5xx (84%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l4r9xx (84%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/Kconfig.defconfig.stm32l4s5xx (84%) create mode 100644 soc/st/stm32/stm32l4/Kconfig.soc rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/power.c (100%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/poweroff.c (100%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/soc.c (100%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32l4/soc.h (100%) diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.soc b/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.soc deleted file mode 100644 index 9719ff4b73d..00000000000 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.soc +++ /dev/null @@ -1,70 +0,0 @@ -# ST Microelectronics STM32L4 MCU line - -# Copyright (c) 2016 Open-RnD Sp. z o.o. -# Copyright (c) 2016 BayLibre, SAS -# Copyright (c) 2019 Centaur Analytics, Inc -# Copyright (c) 2019 STMicroelectronics -# SPDX-License-Identifier: Apache-2.0 - -choice - prompt "STM32L4x MCU Selection" - depends on SOC_SERIES_STM32L4X - -config SOC_STM32L476XX - bool "STM32L476XX" - -config SOC_STM32L486XX - bool "STM32L486XX" - -config SOC_STM32L496XX - bool "STM32L496XX" - -config SOC_STM32L4A6XX - bool "STM32L4A6XX" - -config SOC_STM32L412XX - bool "STM32L412XX" - -config SOC_STM32L422XX - bool "STM32L422XX" - -config SOC_STM32L431XX - bool "STM32L431XX" - -config SOC_STM32L432XX - bool "STM32L432XX" - -config SOC_STM32L433XX - bool "STM32L433XX" - -config SOC_STM32L451XX - bool "STM32L451XX" - -config SOC_STM32L452XX - bool "STM32L452XX" - -config SOC_STM32L462XX - bool "STM32L462XX" - -config SOC_STM32L475XX - bool "STM32L475XX" - -config SOC_STM32L4P5XX - bool "STM32L4P5XX" - -config SOC_STM32L4Q5XX - bool "STM32L4Q5XX" - -config SOC_STM32L4S5XX - bool "STM32L4S5XX" - -config SOC_STM32L4R5XX - bool "STM32L4R5XX" - -config SOC_STM32L4R9XX - bool "STM32L4R9XX" - -config SOC_STM32L471XX - bool "STM32L471XX" - -endchoice diff --git a/soc/st/stm32/soc.yml b/soc/st/stm32/soc.yml index 3f3293ca16a..75bc2b130ed 100644 --- a/soc/st/stm32/soc.yml +++ b/soc/st/stm32/soc.yml @@ -137,6 +137,27 @@ family: - name: stm32l151xc - name: stm32l152xc - name: stm32l152xe + - name: stm32l4x + socs: + - name: stm32l412xx + - name: stm32l422xx + - name: stm32l431xx + - name: stm32l432xx + - name: stm32l433xx + - name: stm32l451xx + - name: stm32l452xx + - name: stm32l462xx + - name: stm32l471xx + - name: stm32l475xx + - name: stm32l476xx + - name: stm32l486xx + - name: stm32l496xx + - name: stm32l4a6xx + - name: stm32l4p5xx + - name: stm32l4q5xx + - name: stm32l4s5xx + - name: stm32l4r5xx + - name: stm32l4r9xx - name: stm32l5x socs: - name: stm32l552xx diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/CMakeLists.txt b/soc/st/stm32/stm32l4/CMakeLists.txt similarity index 91% rename from soc/soc_legacy/arm/st_stm32/stm32l4/CMakeLists.txt rename to soc/st/stm32/stm32l4/CMakeLists.txt index 94edc262274..2a910ba7512 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/CMakeLists.txt +++ b/soc/st/stm32/stm32l4/CMakeLists.txt @@ -11,4 +11,6 @@ zephyr_sources_ifdef(CONFIG_PM zephyr_sources_ifdef(CONFIG_POWEROFF poweroff.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/stm32l4/Kconfig.series b/soc/st/stm32/stm32l4/Kconfig similarity index 78% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.series rename to soc/st/stm32/stm32l4/Kconfig index 6ac4f1e704c..80bc62075c3 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.series +++ b/soc/st/stm32/stm32l4/Kconfig @@ -5,16 +5,12 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32L4X - bool "STM32L4x Series MCU" select ARM select CPU_CORTEX_M4 select CPU_CORTEX_M_HAS_DWT select CPU_HAS_FPU - select SOC_FAMILY_STM32 select HAS_STM32CUBE select CPU_HAS_ARM_MPU select HAS_SWO select HAS_PM select HAS_POWEROFF - help - Enable support for STM32L4 MCU series diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.series b/soc/st/stm32/stm32l4/Kconfig.defconfig similarity index 80% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.series rename to soc/st/stm32/stm32l4/Kconfig.defconfig index d0761404eb5..7dcb3ff506c 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.series +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig @@ -8,7 +8,7 @@ if SOC_SERIES_STM32L4X -source "soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4*" +rsource "Kconfig.defconfig.stm32l4*" config SOC_SERIES default "stm32l4" diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l412xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l412xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l412xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l412xx index 2918e3d3dd2..eb73f26dc4d 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l412xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l412xx @@ -5,9 +5,6 @@ if SOC_STM32L412XX -config SOC - default "stm32l412xx" - config NUM_IRQS default 83 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l422xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l422xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l422xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l422xx index f6be07396ba..24143f8ede9 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l422xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l422xx @@ -5,9 +5,6 @@ if SOC_STM32L422XX -config SOC - default "stm32l422xx" - config NUM_IRQS default 83 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l431xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l431xx similarity index 83% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l431xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l431xx index d21a2bd58f9..65b11365368 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l431xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l431xx @@ -5,9 +5,6 @@ if SOC_STM32L431XX -config SOC - default "stm32l431xx" - config NUM_IRQS default 83 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l432xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l432xx similarity index 86% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l432xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l432xx index d6ed27b7b44..b16bdfd5090 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l432xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l432xx @@ -6,9 +6,6 @@ if SOC_STM32L432XX -config SOC - default "stm32l432xx" - config NUM_IRQS default 83 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l433xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l433xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l433xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l433xx index d10133eb1a8..2cb0b3162a0 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l433xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l433xx @@ -5,9 +5,6 @@ if SOC_STM32L433XX -config SOC - default "stm32l433xx" - config NUM_IRQS default 83 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l451xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l451xx similarity index 85% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l451xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l451xx index d3f5867a8dc..36350d41b5e 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l451xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l451xx @@ -5,9 +5,6 @@ if SOC_STM32L451XX -config SOC - default "stm32l451xx" - config NUM_IRQS default 85 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l452xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l452xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l452xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l452xx index 0c6cc32f1f8..c1564d0513d 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l452xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l452xx @@ -5,9 +5,6 @@ if SOC_STM32L452XX -config SOC - default "stm32l452xx" - config NUM_IRQS default 85 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l462xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l462xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l462xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l462xx index 1c3575884b2..57d136e67c5 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l462xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l462xx @@ -5,9 +5,6 @@ if SOC_STM32L462XX -config SOC - default "stm32l462xx" - config NUM_IRQS default 85 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l471xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l471xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l471xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l471xx index afb35990bee..22e8dd61d44 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l471xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l471xx @@ -5,9 +5,6 @@ if SOC_STM32L471XX -config SOC - default "stm32l471xx" - config NUM_IRQS default 82 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l475xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l475xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l475xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l475xx index 25e11c3bcec..0e3e1d231e6 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l475xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l475xx @@ -5,9 +5,6 @@ if SOC_STM32L475XX -config SOC - default "stm32l475xx" - config NUM_IRQS default 82 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l476xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l476xx similarity index 86% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l476xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l476xx index d2f70cd6c66..bd53c4066cc 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l476xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l476xx @@ -6,9 +6,6 @@ if SOC_STM32L476XX -config SOC - default "stm32l476xx" - config NUM_IRQS default 82 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l486xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l486xx similarity index 88% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l486xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l486xx index 600948c5ffa..4e5cbd8b581 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l486xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l486xx @@ -7,9 +7,6 @@ if SOC_STM32L486XX -config SOC - default "stm32l486xx" - config NUM_IRQS default 82 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l496xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l496xx similarity index 88% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l496xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l496xx index 6d5dcb62bad..d7100e5c9ca 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l496xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l496xx @@ -7,9 +7,6 @@ if SOC_STM32L496XX -config SOC - default "stm32l496xx" - config NUM_IRQS default 91 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4a6xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4a6xx similarity index 89% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4a6xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4a6xx index 12a88ee608f..7cfcecfe204 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4a6xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4a6xx @@ -8,9 +8,6 @@ if SOC_STM32L4A6XX -config SOC - default "stm32l4a6xx" - config NUM_IRQS default 91 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4p5xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4p5xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4p5xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4p5xx index 605264f36a0..2c55c2d0113 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4p5xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4p5xx @@ -5,9 +5,6 @@ if SOC_STM32L4P5XX -config SOC - default "stm32l4p5xx" - config NUM_IRQS default 95 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4q5xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4q5xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4q5xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4q5xx index 964cd4ad9ad..779d194eb4c 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4q5xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4q5xx @@ -5,9 +5,6 @@ if SOC_STM32L4Q5XX -config SOC - default "stm32l4q5xx" - config NUM_IRQS default 95 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r5xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4r5xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r5xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4r5xx index 3a221310774..301004d3a84 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r5xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4r5xx @@ -5,9 +5,6 @@ if SOC_STM32L4R5XX -config SOC - default "stm32l4r5xx" - config NUM_IRQS default 95 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r9xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4r9xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r9xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4r9xx index fd39575c550..150a22332b7 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r9xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4r9xx @@ -5,9 +5,6 @@ if SOC_STM32L4R9XX -config SOC - default "stm32l4r9xx" - config NUM_IRQS default 95 diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4s5xx b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4s5xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4s5xx rename to soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4s5xx index 79d97dbe083..85ab309e848 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4s5xx +++ b/soc/st/stm32/stm32l4/Kconfig.defconfig.stm32l4s5xx @@ -5,9 +5,6 @@ if SOC_STM32L4S5XX -config SOC - default "stm32l4s5xx" - config NUM_IRQS default 95 diff --git a/soc/st/stm32/stm32l4/Kconfig.soc b/soc/st/stm32/stm32l4/Kconfig.soc new file mode 100644 index 00000000000..352b7048a30 --- /dev/null +++ b/soc/st/stm32/stm32l4/Kconfig.soc @@ -0,0 +1,111 @@ +# ST Microelectronics STM32L4 MCU line + +# Copyright (c) 2016 Open-RnD Sp. z o.o. +# Copyright (c) 2016 BayLibre, SAS +# Copyright (c) 2019 Centaur Analytics, Inc +# Copyright (c) 2019 STMicroelectronics +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_STM32L4X + bool + select SOC_FAMILY_STM32 + +config SOC_SERIES + default "stm32l4" if SOC_SERIES_STM32L4X + +config SOC_STM32L412XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L422XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L431XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L432XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L433XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L451XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L452XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L462XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L471XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L475XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L476XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L486XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L496XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L4A6XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L4P5XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L4Q5XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L4S5XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L4R5XX + bool + select SOC_SERIES_STM32L4X + +config SOC_STM32L4R9XX + bool + select SOC_SERIES_STM32L4X + +config SOC + default "stm32l412xx" if SOC_STM32L412XX + default "stm32l422xx" if SOC_STM32L422XX + default "stm32l431xx" if SOC_STM32L431XX + default "stm32l432xx" if SOC_STM32L432XX + default "stm32l433xx" if SOC_STM32L433XX + default "stm32l451xx" if SOC_STM32L451XX + default "stm32l452xx" if SOC_STM32L452XX + default "stm32l462xx" if SOC_STM32L462XX + default "stm32l471xx" if SOC_STM32L471XX + default "stm32l475xx" if SOC_STM32L475XX + default "stm32l476xx" if SOC_STM32L476XX + default "stm32l486xx" if SOC_STM32L486XX + default "stm32l496xx" if SOC_STM32L496XX + default "stm32l4a6xx" if SOC_STM32L4A6XX + default "stm32l4p5xx" if SOC_STM32L4P5XX + default "stm32l4q5xx" if SOC_STM32L4Q5XX + default "stm32l4s5xx" if SOC_STM32L4S5XX + default "stm32l4r5xx" if SOC_STM32L4R5XX + default "stm32l4r9xx" if SOC_STM32L4R9XX diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/power.c b/soc/st/stm32/stm32l4/power.c similarity index 100% rename from soc/soc_legacy/arm/st_stm32/stm32l4/power.c rename to soc/st/stm32/stm32l4/power.c diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/poweroff.c b/soc/st/stm32/stm32l4/poweroff.c similarity index 100% rename from soc/soc_legacy/arm/st_stm32/stm32l4/poweroff.c rename to soc/st/stm32/stm32l4/poweroff.c diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/soc.c b/soc/st/stm32/stm32l4/soc.c similarity index 100% rename from soc/soc_legacy/arm/st_stm32/stm32l4/soc.c rename to soc/st/stm32/stm32l4/soc.c diff --git a/soc/soc_legacy/arm/st_stm32/stm32l4/soc.h b/soc/st/stm32/stm32l4/soc.h similarity index 100% rename from soc/soc_legacy/arm/st_stm32/stm32l4/soc.h rename to soc/st/stm32/stm32l4/soc.h