From a6e49285437fd792de8cf006ebcf47868898a411 Mon Sep 17 00:00:00 2001 From: Guillaume Gautier Date: Fri, 16 Feb 2024 08:38:34 +0100 Subject: [PATCH] soc: st: stm32: Migrate STM32H5 series Port STM32H5 series to HW model v2 Signed-off-by: Guillaume Gautier --- .../arm/st_stm32/stm32h5/Kconfig.soc | 22 ------------- soc/st/stm32/soc.yml | 6 ++++ .../stm32}/stm32h5/CMakeLists.txt | 2 ++ .../stm32/stm32h5/Kconfig} | 4 --- .../stm32/stm32h5/Kconfig.defconfig} | 5 +-- .../stm32h5/Kconfig.defconfig.stm32h503xx | 3 -- .../stm32h5/Kconfig.defconfig.stm32h562xx | 3 -- .../stm32h5/Kconfig.defconfig.stm32h563xx | 3 -- .../stm32h5/Kconfig.defconfig.stm32h573xx | 3 -- soc/st/stm32/stm32h5/Kconfig.soc | 33 +++++++++++++++++++ .../arm/st_stm32 => st/stm32}/stm32h5/soc.c | 0 .../arm/st_stm32 => st/stm32}/stm32h5/soc.h | 0 12 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.soc rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h5/CMakeLists.txt (87%) rename soc/{soc_legacy/arm/st_stm32/stm32h5/Kconfig.series => st/stm32/stm32h5/Kconfig} (80%) rename soc/{soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.series => st/stm32/stm32h5/Kconfig.defconfig} (68%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h5/Kconfig.defconfig.stm32h503xx (84%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h5/Kconfig.defconfig.stm32h562xx (84%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h5/Kconfig.defconfig.stm32h563xx (84%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h5/Kconfig.defconfig.stm32h573xx (84%) create mode 100644 soc/st/stm32/stm32h5/Kconfig.soc rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h5/soc.c (100%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h5/soc.h (100%) diff --git a/soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.soc b/soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.soc deleted file mode 100644 index 3bf6a3605c0..00000000000 --- a/soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.soc +++ /dev/null @@ -1,22 +0,0 @@ -# ST Microelectronics STM32H5 MCU line - -# Copyright (c) 2023 STMicroelectronics -# SPDX-License-Identifier: Apache-2.0 - -choice -prompt "STM32H5x MCU Selection" -depends on SOC_SERIES_STM32H5X - -config SOC_STM32H503XX - bool "STM32H503XX" - -config SOC_STM32H562XX - bool "STM32H562XX" - -config SOC_STM32H563XX - bool "STM32H563XX" - -config SOC_STM32H573XX - bool "STM32H573XX" - -endchoice diff --git a/soc/st/stm32/soc.yml b/soc/st/stm32/soc.yml index 0f94176d9fa..76b317b52b2 100644 --- a/soc/st/stm32/soc.yml +++ b/soc/st/stm32/soc.yml @@ -90,6 +90,12 @@ family: - name: stm32g484xx - name: stm32g491xx - name: stm32g4a1xx + - name: stm32h5x + socs: + - name: stm32h503xx + - name: stm32h562xx + - name: stm32h563xx + - name: stm32h573xx - name: stm32h7x socs: - name: stm32h7a3xx diff --git a/soc/soc_legacy/arm/st_stm32/stm32h5/CMakeLists.txt b/soc/st/stm32/stm32h5/CMakeLists.txt similarity index 87% rename from soc/soc_legacy/arm/st_stm32/stm32h5/CMakeLists.txt rename to soc/st/stm32/stm32h5/CMakeLists.txt index e02052e3946..eebd281cd96 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h5/CMakeLists.txt +++ b/soc/st/stm32/stm32h5/CMakeLists.txt @@ -5,4 +5,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/stm32h5/Kconfig.series b/soc/st/stm32/stm32h5/Kconfig similarity index 80% rename from soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.series rename to soc/st/stm32/stm32h5/Kconfig index cb84b08b250..9ff02424ebd 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.series +++ b/soc/st/stm32/stm32h5/Kconfig @@ -4,10 +4,8 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_STM32H5X - bool "STM32H5x Series MCU" select ARM select CPU_CORTEX_M33 - select SOC_FAMILY_STM32 select ARM_TRUSTZONE_M if !SOC_STM32H503XX select CPU_HAS_ARM_SAU if !SOC_STM32H503XX select CPU_HAS_ARM_MPU @@ -16,5 +14,3 @@ config SOC_SERIES_STM32H5X select CPU_CORTEX_M_HAS_DWT select HAS_STM32CUBE select HAS_SWO - help - Enable support for STM32H5 MCU series diff --git a/soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.series b/soc/st/stm32/stm32h5/Kconfig.defconfig similarity index 68% rename from soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.series rename to soc/st/stm32/stm32h5/Kconfig.defconfig index 9db481b43b5..f8167440f33 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.series +++ b/soc/st/stm32/stm32h5/Kconfig.defconfig @@ -5,10 +5,7 @@ if SOC_SERIES_STM32H5X -source "soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.stm32h5*" - -config SOC_SERIES - default "stm32h5" +rsource "Kconfig.defconfig.stm32h5*" config ROM_START_OFFSET default 0x400 if BOOTLOADER_MCUBOOT diff --git a/soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.stm32h503xx b/soc/st/stm32/stm32h5/Kconfig.defconfig.stm32h503xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.stm32h503xx rename to soc/st/stm32/stm32h5/Kconfig.defconfig.stm32h503xx index e7d7b508baa..fb6e125f87f 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.stm32h503xx +++ b/soc/st/stm32/stm32h5/Kconfig.defconfig.stm32h503xx @@ -5,9 +5,6 @@ if SOC_STM32H503XX -config SOC - default "stm32h503xx" - config NUM_IRQS default 134 diff --git a/soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.stm32h562xx b/soc/st/stm32/stm32h5/Kconfig.defconfig.stm32h562xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.stm32h562xx rename to soc/st/stm32/stm32h5/Kconfig.defconfig.stm32h562xx index eb76a2d7989..f7dc9451df0 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.stm32h562xx +++ b/soc/st/stm32/stm32h5/Kconfig.defconfig.stm32h562xx @@ -5,9 +5,6 @@ if SOC_STM32H562XX -config SOC - default "stm32h562xx" - config NUM_IRQS default 131 diff --git a/soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.stm32h563xx b/soc/st/stm32/stm32h5/Kconfig.defconfig.stm32h563xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.stm32h563xx rename to soc/st/stm32/stm32h5/Kconfig.defconfig.stm32h563xx index 94994a7d060..1a36a617e53 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.stm32h563xx +++ b/soc/st/stm32/stm32h5/Kconfig.defconfig.stm32h563xx @@ -5,9 +5,6 @@ if SOC_STM32H563XX -config SOC - default "stm32h563xx" - config NUM_IRQS default 131 diff --git a/soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.stm32h573xx b/soc/st/stm32/stm32h5/Kconfig.defconfig.stm32h573xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.stm32h573xx rename to soc/st/stm32/stm32h5/Kconfig.defconfig.stm32h573xx index d6641c126ec..af698c3e81c 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h5/Kconfig.defconfig.stm32h573xx +++ b/soc/st/stm32/stm32h5/Kconfig.defconfig.stm32h573xx @@ -5,9 +5,6 @@ if SOC_STM32H573XX -config SOC - default "stm32h573xx" - config NUM_IRQS default 131 diff --git a/soc/st/stm32/stm32h5/Kconfig.soc b/soc/st/stm32/stm32h5/Kconfig.soc new file mode 100644 index 00000000000..f8a54a4f959 --- /dev/null +++ b/soc/st/stm32/stm32h5/Kconfig.soc @@ -0,0 +1,33 @@ +# ST Microelectronics STM32H5 MCU line + +# Copyright (c) 2023 STMicroelectronics +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_STM32H5X + bool + select SOC_FAMILY_STM32 + +config SOC_SERIES + default "stm32h5" if SOC_SERIES_STM32H5X + +config SOC_STM32H503XX + bool + select SOC_SERIES_STM32H5X + +config SOC_STM32H562XX + bool + select SOC_SERIES_STM32H5X + +config SOC_STM32H563XX + bool + select SOC_SERIES_STM32H5X + +config SOC_STM32H573XX + bool + select SOC_SERIES_STM32H5X + +config SOC + default "stm32h503xx" if SOC_STM32H503XX + default "stm32h562xx" if SOC_STM32H562XX + default "stm32h563xx" if SOC_STM32H563XX + default "stm32h573xx" if SOC_STM32H573XX diff --git a/soc/soc_legacy/arm/st_stm32/stm32h5/soc.c b/soc/st/stm32/stm32h5/soc.c similarity index 100% rename from soc/soc_legacy/arm/st_stm32/stm32h5/soc.c rename to soc/st/stm32/stm32h5/soc.c diff --git a/soc/soc_legacy/arm/st_stm32/stm32h5/soc.h b/soc/st/stm32/stm32h5/soc.h similarity index 100% rename from soc/soc_legacy/arm/st_stm32/stm32h5/soc.h rename to soc/st/stm32/stm32h5/soc.h