From 4b98865ec33af334d9948896190e94714efb07f1 Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 5 Feb 2024 17:52:04 +0100 Subject: [PATCH 01/15] soc: st: Migrate stm32h7 series to new hw model Migrate STM2H7 series to new HW model. Signed-off-by: Erwan Gouriou --- drivers/clock_control/clock_stm32_ll_h7.c | 4 +- .../arm/st_stm32/stm32h7/Kconfig.series | 18 --- .../arm/st_stm32/stm32h7/Kconfig.soc | 132 ------------------ soc/st/stm32/Kconfig | 34 +++++ soc/st/stm32/soc.yml | 20 +++ .../stm32}/stm32h7/CMakeLists.txt | 2 + soc/st/stm32/stm32h7/Kconfig | 82 +++++++++++ .../stm32/stm32h7/Kconfig.defconfig} | 5 +- .../stm32h7/Kconfig.defconfig.stm32h723xx | 3 - .../stm32h7/Kconfig.defconfig.stm32h725xx | 3 - .../stm32h7/Kconfig.defconfig.stm32h730xx | 4 - .../stm32h7/Kconfig.defconfig.stm32h735xx | 3 - .../stm32h7/Kconfig.defconfig.stm32h743xx | 3 - .../stm32h7/Kconfig.defconfig.stm32h745xx | 8 +- .../stm32h7/Kconfig.defconfig.stm32h747xx | 8 +- .../stm32h7/Kconfig.defconfig.stm32h750xx | 3 - .../stm32h7/Kconfig.defconfig.stm32h753xx | 3 - .../stm32h7/Kconfig.defconfig.stm32h7a3xx | 4 - .../stm32h7/Kconfig.defconfig.stm32h7b0xx | 4 - .../stm32h7/Kconfig.defconfig.stm32h7b3xx | 4 - soc/st/stm32/stm32h7/Kconfig.soc | 103 ++++++++++++++ .../stm32}/stm32h7/mpu_regions.c | 0 .../st_stm32 => st/stm32}/stm32h7/sections.ld | 0 .../arm/st_stm32 => st/stm32}/stm32h7/soc.h | 0 .../st_stm32 => st/stm32}/stm32h7/soc_m4.c | 0 .../st_stm32 => st/stm32}/stm32h7/soc_m7.c | 0 26 files changed, 252 insertions(+), 198 deletions(-) delete mode 100644 soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.series delete mode 100644 soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.soc rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/CMakeLists.txt (92%) create mode 100644 soc/st/stm32/stm32h7/Kconfig rename soc/{soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.series => st/stm32/stm32h7/Kconfig.defconfig} (78%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/Kconfig.defconfig.stm32h723xx (86%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/Kconfig.defconfig.stm32h725xx (84%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/Kconfig.defconfig.stm32h730xx (75%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/Kconfig.defconfig.stm32h735xx (85%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/Kconfig.defconfig.stm32h743xx (85%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/Kconfig.defconfig.stm32h745xx (58%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/Kconfig.defconfig.stm32h747xx (53%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/Kconfig.defconfig.stm32h750xx (85%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/Kconfig.defconfig.stm32h753xx (85%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/Kconfig.defconfig.stm32h7a3xx (71%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/Kconfig.defconfig.stm32h7b0xx (72%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/Kconfig.defconfig.stm32h7b3xx (71%) create mode 100644 soc/st/stm32/stm32h7/Kconfig.soc rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/mpu_regions.c (100%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/sections.ld (100%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/soc.h (100%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/soc_m4.c (100%) rename soc/{soc_legacy/arm/st_stm32 => st/stm32}/stm32h7/soc_m7.c (100%) diff --git a/drivers/clock_control/clock_stm32_ll_h7.c b/drivers/clock_control/clock_stm32_ll_h7.c index 9d76004c92f..871b1d50a3a 100644 --- a/drivers/clock_control/clock_stm32_ll_h7.c +++ b/drivers/clock_control/clock_stm32_ll_h7.c @@ -90,8 +90,8 @@ /* Datasheet maximum frequency definitions */ #if defined(CONFIG_SOC_STM32H743XX) ||\ - defined(CONFIG_SOC_STM32H745XX) ||\ - defined(CONFIG_SOC_STM32H747XX) ||\ + defined(CONFIG_SOC_STM32H745XX_M7) || defined(CONFIG_SOC_STM32H745XX_M4) ||\ + defined(CONFIG_SOC_STM32H747XX_M7) || defined(CONFIG_SOC_STM32H747XX_M4) ||\ defined(CONFIG_SOC_STM32H750XX) ||\ defined(CONFIG_SOC_STM32H753XX) /* All h7 SoC with maximum 480MHz SYSCLK */ diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.series b/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.series deleted file mode 100644 index 061a23856c2..00000000000 --- a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.series +++ /dev/null @@ -1,18 +0,0 @@ -# ST Microelectronics STM32H7 MCU series - -# Copyright (c) 2019 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config SOC_SERIES_STM32H7X - bool "STM32H7x Series MCU" - select ARM - 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 USE_STM32_HAL_CORTEX - select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS - help - Enable support for STM32H7 MCU series diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.soc b/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.soc deleted file mode 100644 index 4f7441a6fdc..00000000000 --- a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.soc +++ /dev/null @@ -1,132 +0,0 @@ -# ST Microelectronics STM32H7 MCU line - -# Copyright (c) 2019 Linaro Limited -# Copyright (c) 2020 Teslabs Engineering S.L. -# Copyright (c) 2021 Electrolance Solutions -# SPDX-License-Identifier: Apache-2.0 - -config STM32H7_DUAL_CORE - bool "Dual Core" - depends on SOC_SERIES_STM32H7X - -choice - prompt "STM32H7x MCU Selection" - depends on SOC_SERIES_STM32H7X - -config SOC_STM32H723XX - bool "STM32H723XX" - select CPU_CORTEX_M7 - select CPU_HAS_ICACHE - select CPU_HAS_DCACHE - select CPU_HAS_FPU_DOUBLE_PRECISION - -config SOC_STM32H725XX - bool "STM32H725XX" - select CPU_CORTEX_M7 - select CPU_HAS_ICACHE - select CPU_HAS_DCACHE - select CPU_HAS_FPU_DOUBLE_PRECISION - -config SOC_STM32H730XX - bool "STM32H730XX" - select CPU_CORTEX_M7 - select CPU_HAS_ICACHE - select CPU_HAS_DCACHE - select CPU_HAS_FPU_DOUBLE_PRECISION - -config SOC_STM32H730XXQ - bool "STM32H730XXQ" - select CPU_CORTEX_M7 - select CPU_HAS_ICACHE - select CPU_HAS_DCACHE - select CPU_HAS_FPU_DOUBLE_PRECISION - -config SOC_STM32H735XX - bool "STM32H735XX" - select CPU_CORTEX_M7 - select CPU_HAS_ICACHE - select CPU_HAS_DCACHE - select CPU_HAS_FPU_DOUBLE_PRECISION - -config SOC_STM32H743XX - bool "STM32H743XX" - select CPU_CORTEX_M7 - select CPU_HAS_ICACHE - select CPU_HAS_DCACHE - select CPU_HAS_FPU_DOUBLE_PRECISION - -config SOC_STM32H745XX - bool "STM32H745XX" - select CPU_HAS_FPU_DOUBLE_PRECISION if CPU_CORTEX_M7 - select CPU_HAS_ICACHE if CPU_CORTEX_M7 - select CPU_HAS_DCACHE if CPU_CORTEX_M7 - select STM32H7_DUAL_CORE - -config SOC_STM32H747XX - bool "STM32H747XX" - select CPU_HAS_FPU_DOUBLE_PRECISION if CPU_CORTEX_M7 - select CPU_HAS_ICACHE if CPU_CORTEX_M7 - select CPU_HAS_DCACHE if CPU_CORTEX_M7 - select STM32H7_DUAL_CORE - -config SOC_STM32H750XX - bool "STM32H750XX" - select CPU_CORTEX_M7 - select CPU_HAS_ICACHE - select CPU_HAS_DCACHE - select CPU_HAS_FPU_DOUBLE_PRECISION - -config SOC_STM32H753XX - bool "STM32H753XX" - select CPU_CORTEX_M7 - select CPU_HAS_ICACHE - select CPU_HAS_DCACHE - select CPU_HAS_FPU_DOUBLE_PRECISION - -config SOC_STM32H7A3XX - bool "STM32H7A3XX" - select CPU_CORTEX_M7 - select CPU_HAS_ICACHE - select CPU_HAS_DCACHE - select CPU_HAS_FPU_DOUBLE_PRECISION - -config SOC_STM32H7A3XXQ - bool "STM32H7A3XXQ" - select CPU_CORTEX_M7 - select CPU_HAS_ICACHE - select CPU_HAS_DCACHE - select CPU_HAS_FPU_DOUBLE_PRECISION - -config SOC_STM32H7B0XX - bool "STM32H7B0XX" - select CPU_CORTEX_M7 - select CPU_HAS_ICACHE - select CPU_HAS_DCACHE - select CPU_HAS_FPU_DOUBLE_PRECISION - -config SOC_STM32H7B0XXQ - bool "STM32H7B0XXQ" - select CPU_CORTEX_M7 - select CPU_HAS_ICACHE - select CPU_HAS_DCACHE - select CPU_HAS_FPU_DOUBLE_PRECISION - -config SOC_STM32H7B3XX - bool "STM32H7B3XX" - select CPU_CORTEX_M7 - select CPU_HAS_ICACHE - select CPU_HAS_DCACHE - select CPU_HAS_FPU_DOUBLE_PRECISION - -config SOC_STM32H7B3XXQ - bool "STM32H7B3XXQ" - select CPU_CORTEX_M7 - select CPU_HAS_ICACHE - select CPU_HAS_DCACHE - select CPU_HAS_FPU_DOUBLE_PRECISION - -endchoice - -config STM32H7_BOOT_M4_AT_INIT - bool "Boot M4 core during M7 init independent of option byte BCM4." - default y diff --git a/soc/st/stm32/Kconfig b/soc/st/stm32/Kconfig index 27f4e7edcaf..6b80a285183 100644 --- a/soc/st/stm32/Kconfig +++ b/soc/st/stm32/Kconfig @@ -39,4 +39,38 @@ config STM32_ENABLE_DEBUG_SLEEP_STOP effectivly destroys the use-case of `west attach`. Also SEGGER RTT and similar technologies need this. +choice POWER_SUPPLY_CHOICE + prompt "STM32 power supply configuration" + default POWER_SUPPLY_LDO + depends on SOC_SERIES_STM32H7X + +config POWER_SUPPLY_LDO + bool "LDO supply" + +config POWER_SUPPLY_DIRECT_SMPS + bool "Direct SMPS supply" + +config POWER_SUPPLY_SMPS_1V8_SUPPLIES_LDO + bool "SMPS 1.8V supplies LDO (no external supply)" + +config POWER_SUPPLY_SMPS_2V5_SUPPLIES_LDO + bool "SMPS 2.5V supplies LDO (no external supply)" + +config POWER_SUPPLY_SMPS_1V8_SUPPLIES_EXT_AND_LDO + bool "External SMPS 1.8V supply, supplies LDO" + +config POWER_SUPPLY_SMPS_2V5_SUPPLIES_EXT_AND_LDO + bool "External SMPS 2.5V supply, supplies LDO" + +config POWER_SUPPLY_SMPS_1V8_SUPPLIES_EXT + bool "External SMPS 1.8V supply and bypass" + +config POWER_SUPPLY_SMPS_2V5_SUPPLIES_EXT + bool "External SMPS 2.5V supply and bypass" + +config POWER_SUPPLY_EXTERNAL_SOURCE + bool "Bypass" + +endchoice + endif # SOC_FAMILY_STM32 diff --git a/soc/st/stm32/soc.yml b/soc/st/stm32/soc.yml index 123b2b88dfe..a4671b2bf45 100644 --- a/soc/st/stm32/soc.yml +++ b/soc/st/stm32/soc.yml @@ -90,6 +90,26 @@ family: - name: stm32g484xx - name: stm32g491xx - name: stm32g4a1xx + - name: stm32h7x + socs: + - name: stm32h7a3xx + - name: stm32h7b0xx + - name: stm32h7b3xx + - name: stm32h723xx + - name: stm32h725xx + - name: stm32h730xx + - name: stm32h735xx + - name: stm32h743xx + - name: stm32h745xx + cpuclusters: + - name: m7 + - name: m4 + - name: stm32h747xx + cpuclusters: + - name: m7 + - name: m4 + - name: stm32h750xx + - name: stm32h753xx - name: stm32l1x socs: - name: stm32l151xb diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/CMakeLists.txt b/soc/st/stm32/stm32h7/CMakeLists.txt similarity index 92% rename from soc/soc_legacy/arm/st_stm32/stm32h7/CMakeLists.txt rename to soc/st/stm32/stm32h7/CMakeLists.txt index d1ae6c3325d..b4ea68f3c47 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h7/CMakeLists.txt +++ b/soc/st/stm32/stm32h7/CMakeLists.txt @@ -8,4 +8,6 @@ zephyr_sources_ifdef(CONFIG_CPU_CORTEX_M4 soc_m4.c) zephyr_sources(mpu_regions.c) zephyr_linker_sources(SECTIONS sections.ld) +zephyr_include_directories(.) + set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "") diff --git a/soc/st/stm32/stm32h7/Kconfig b/soc/st/stm32/stm32h7/Kconfig new file mode 100644 index 00000000000..f72707ae006 --- /dev/null +++ b/soc/st/stm32/stm32h7/Kconfig @@ -0,0 +1,82 @@ +# ST Microelectronics STM32H7 MCU series + +# Copyright (c) 2019 Linaro Limited +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_STM32H7X + select ARM + select CPU_CORTEX_M_HAS_DWT + select CPU_HAS_FPU + select HAS_STM32CUBE + select CPU_HAS_ARM_MPU + select HAS_SWO + select USE_STM32_HAL_CORTEX + select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS + select CPU_HAS_FPU_DOUBLE_PRECISION if CPU_CORTEX_M7 + select CPU_HAS_ICACHE if CPU_CORTEX_M7 + select CPU_HAS_DCACHE if CPU_CORTEX_M7 + +config SOC_STM32H723XX + select CPU_CORTEX_M7 + +config SOC_STM32H725XX + select CPU_CORTEX_M7 + +config SOC_STM32H730XX + select CPU_CORTEX_M7 + +config SOC_STM32H730XXQ + select CPU_CORTEX_M7 + +config SOC_STM32H735XX + select CPU_CORTEX_M7 + +config SOC_STM32H743XX + select CPU_CORTEX_M7 + +config SOC_STM32H745XX_M7 + select CPU_CORTEX_M7 + +config SOC_STM32H745XX_M4 + select CPU_CORTEX_M4 + +config SOC_STM32H747XX_M7 + select CPU_CORTEX_M7 + +config SOC_STM32H747XX_M4 + select CPU_CORTEX_M4 + +config SOC_STM32H750XX + select CPU_CORTEX_M7 + +config SOC_STM32H753XX + select CPU_CORTEX_M7 + +config SOC_STM32H7A3XX + select CPU_CORTEX_M7 + +config SOC_STM32H7A3XXQ + select CPU_CORTEX_M7 + +config SOC_STM32H7B0XX + select CPU_CORTEX_M7 + +config SOC_STM32H7B0XXQ + select CPU_CORTEX_M7 + +config SOC_STM32H7B3XX + select CPU_CORTEX_M7 + +config SOC_STM32H7B3XXQ + select CPU_CORTEX_M7 + +if SOC_SERIES_STM32H7X + +config STM32H7_DUAL_CORE + bool "Dual Core" + +config STM32H7_BOOT_M4_AT_INIT + bool "Boot M4 core during M7 init independent of option byte BCM4." + default y + +endif # SOC_SERIES_STM32H7X diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.series b/soc/st/stm32/stm32h7/Kconfig.defconfig similarity index 78% rename from soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.series rename to soc/st/stm32/stm32h7/Kconfig.defconfig index 45e4716025c..790b1659c05 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.series +++ b/soc/st/stm32/stm32h7/Kconfig.defconfig @@ -8,10 +8,7 @@ if SOC_SERIES_STM32H7X -source "soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h7*" - -config SOC_SERIES - default "stm32h7" +rsource "Kconfig.defconfig.stm32h7*" config ROM_START_OFFSET default 0x400 if BOOTLOADER_MCUBOOT diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h723xx b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h723xx similarity index 86% rename from soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h723xx rename to soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h723xx index b640a00eeef..53acf7448b9 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h723xx +++ b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h723xx @@ -5,9 +5,6 @@ if SOC_STM32H723XX -config SOC - default "stm32h723xx" - config NUM_IRQS default 163 diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h725xx b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h725xx similarity index 84% rename from soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h725xx rename to soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h725xx index b5e50ed4fa1..061ea62a2a3 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h725xx +++ b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h725xx @@ -5,9 +5,6 @@ if SOC_STM32H725XX -config SOC - default "stm32h725xx" - config NUM_IRQS default 163 diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h730xx b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h730xx similarity index 75% rename from soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h730xx rename to soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h730xx index 51b110dbc9f..93befd25a9c 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h730xx +++ b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h730xx @@ -6,10 +6,6 @@ if SOC_STM32H730XX || SOC_STM32H730XXQ -config SOC - default "stm32h730xxQ" if SOC_STM32H730XXQ - default "stm32h730xx" if SOC_STM32H730XX - config NUM_IRQS default 163 diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h735xx b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h735xx similarity index 85% rename from soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h735xx rename to soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h735xx index fec1b04d46e..33d0a741f89 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h735xx +++ b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h735xx @@ -5,9 +5,6 @@ if SOC_STM32H735XX -config SOC - default "stm32h735xx" - config NUM_IRQS default 163 diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h743xx b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h743xx similarity index 85% rename from soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h743xx rename to soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h743xx index 3774f4f8a93..d54e5b0d6d5 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h743xx +++ b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h743xx @@ -5,9 +5,6 @@ if SOC_STM32H743XX -config SOC - default "stm32h743xx" - config NUM_IRQS default 150 diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h745xx b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h745xx similarity index 58% rename from soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h745xx rename to soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h745xx index c6279b99028..feeba8cff1e 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h745xx +++ b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h745xx @@ -3,12 +3,12 @@ # Copyright (c) 2020 Alexander Kozhinov # SPDX-License-Identifier: Apache-2.0 -if SOC_STM32H745XX +if SOC_STM32H745XX_M7 || SOC_STM32H745XX_M4 -config SOC - default "stm32h745xx" +config STM32H7_DUAL_CORE + default y config NUM_IRQS default 150 -endif # SOC_STM32H745XX +endif # SOC_STM32H745XX_M7 || SOC_STM32H745XX_M4 diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h747xx b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h747xx similarity index 53% rename from soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h747xx rename to soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h747xx index 73b7c9ea7ce..32496e0711e 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h747xx +++ b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h747xx @@ -3,12 +3,12 @@ # Copyright (c) 2019 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -if SOC_STM32H747XX +if SOC_STM32H747XX_M7 || SOC_STM32H747XX_M4 -config SOC - default "stm32h747xx" +config STM32H7_DUAL_CORE + default y config NUM_IRQS default 150 -endif # SOC_STM32H747XX +endif # SOC_STM32H747XX_M7 || SOC_STM32H747XX_M7 diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h750xx b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h750xx similarity index 85% rename from soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h750xx rename to soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h750xx index 13d859aa53e..1d00fdc403b 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h750xx +++ b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h750xx @@ -5,9 +5,6 @@ if SOC_STM32H750XX -config SOC - default "stm32h750xx" - config NUM_IRQS default 150 diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h753xx b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h753xx similarity index 85% rename from soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h753xx rename to soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h753xx index 20253b33784..06b08dfcdc2 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h753xx +++ b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h753xx @@ -5,9 +5,6 @@ if SOC_STM32H753XX -config SOC - default "stm32h753xx" - config NUM_IRQS default 150 diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h7a3xx b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h7a3xx similarity index 71% rename from soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h7a3xx rename to soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h7a3xx index e82faa90bda..ab1ff87833b 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h7a3xx +++ b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h7a3xx @@ -5,10 +5,6 @@ if SOC_STM32H7A3XX || SOC_STM32H7A3XXQ -config SOC - default "stm32h7a3xxQ" if SOC_STM32H7A3XXQ - default "stm32h7a3xx" if SOC_STM32H7A3XX - config NUM_IRQS default 155 diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h7b0xx b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h7b0xx similarity index 72% rename from soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h7b0xx rename to soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h7b0xx index 10502135014..0cb129871b6 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h7b0xx +++ b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h7b0xx @@ -5,10 +5,6 @@ if SOC_STM32H7B0XX || SOC_STM32H7B0XXQ -config SOC - default "stm32h7b0xxQ" if SOC_STM32H7B0XXQ - default "stm32h7b0xx" if SOC_STM32H7B0XX - config NUM_IRQS default 155 diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h7b3xx b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h7b3xx similarity index 71% rename from soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h7b3xx rename to soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h7b3xx index 941c6ad5e50..92de5028545 100644 --- a/soc/soc_legacy/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h7b3xx +++ b/soc/st/stm32/stm32h7/Kconfig.defconfig.stm32h7b3xx @@ -5,10 +5,6 @@ if SOC_STM32H7B3XX || SOC_STM32H7B3XXQ -config SOC - default "stm32h7b3xxQ" if SOC_STM32H7B3XXQ - default "stm32h7b3xx" if SOC_STM32H7B3XX - config NUM_IRQS default 155 diff --git a/soc/st/stm32/stm32h7/Kconfig.soc b/soc/st/stm32/stm32h7/Kconfig.soc new file mode 100644 index 00000000000..d0c78914c2e --- /dev/null +++ b/soc/st/stm32/stm32h7/Kconfig.soc @@ -0,0 +1,103 @@ +# ST Microelectronics STM32H7 MCU line + +# Copyright (c) 2019 Linaro Limited +# Copyright (c) 2020 Teslabs Engineering S.L. +# Copyright (c) 2021 Electrolance Solutions +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_STM32H7X + bool + select SOC_FAMILY_STM32 + +config SOC_SERIES + default "stm32h7" if SOC_SERIES_STM32H7X + +config SOC_STM32H723XX + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H725XX + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H730XX + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H730XXQ + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H735XX + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H743XX + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H745XX_M7 + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H745XX_M4 + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H747XX_M7 + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H747XX_M4 + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H750XX + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H753XX + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H7A3XX + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H7A3XXQ + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H7B0XX + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H7B0XXQ + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H7B3XX + bool + select SOC_SERIES_STM32H7X + +config SOC_STM32H7B3XXQ + bool + select SOC_SERIES_STM32H7X + +config SOC + default "stm32h7a3xx" if SOC_STM32H7A3XX + default "stm32h7a3xxq" if SOC_STM32H7A3XXQ + default "stm32h7b0xx" if SOC_STM32H7B0XX + default "stm32h7b0xxq" if SOC_STM32H7B0XXQ + default "stm32h7b3xx" if SOC_STM32H7B3XX + default "stm32h7b3xxq"if SOC_STM32H7B3XXQ + default "stm32h723xx" if SOC_STM32H723XX + default "stm32h725xx" if SOC_STM32H725XX + default "stm32h730xx" if SOC_STM32H730XX + default "stm32h730xxq" if SOC_STM32H730XXQ + default "stm32h735xx" if SOC_STM32H735XX + default "stm32h743xx" if SOC_STM32H743XX + default "stm32h745xx" if SOC_STM32H745XX_M7 || SOC_STM32H745XX_M4 + default "stm32h747xx" if SOC_STM32H747XX_M7 || SOC_STM32H747XX_M4 + default "stm32h750xx" if SOC_STM32H750XX + default "stm32h753xx" if SOC_STM32H753XX diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/mpu_regions.c b/soc/st/stm32/stm32h7/mpu_regions.c similarity index 100% rename from soc/soc_legacy/arm/st_stm32/stm32h7/mpu_regions.c rename to soc/st/stm32/stm32h7/mpu_regions.c diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/sections.ld b/soc/st/stm32/stm32h7/sections.ld similarity index 100% rename from soc/soc_legacy/arm/st_stm32/stm32h7/sections.ld rename to soc/st/stm32/stm32h7/sections.ld diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/soc.h b/soc/st/stm32/stm32h7/soc.h similarity index 100% rename from soc/soc_legacy/arm/st_stm32/stm32h7/soc.h rename to soc/st/stm32/stm32h7/soc.h diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/soc_m4.c b/soc/st/stm32/stm32h7/soc_m4.c similarity index 100% rename from soc/soc_legacy/arm/st_stm32/stm32h7/soc_m4.c rename to soc/st/stm32/stm32h7/soc_m4.c diff --git a/soc/soc_legacy/arm/st_stm32/stm32h7/soc_m7.c b/soc/st/stm32/stm32h7/soc_m7.c similarity index 100% rename from soc/soc_legacy/arm/st_stm32/stm32h7/soc_m7.c rename to soc/st/stm32/stm32h7/soc_m7.c From ad218e7b2176f073803fde2da2f491328d1713bd Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 5 Feb 2024 17:52:44 +0100 Subject: [PATCH 02/15] boards: Convert arduino_giga_r1 to HWM v2 Port the board to HWMv2. Signed-off-by: Erwan Gouriou --- .../arduino_giga_r1/Kconfig.arduino_giga_r1 | 6 +++++ .../arduino/arduino_giga_r1/Kconfig.defconfig | 18 ++++++++++++++ .../arduino_giga_r1/arduino_giga_r1.dtsi | 0 .../arduino_giga_r1_stm32h747xx_m4.dts} | 0 .../arduino_giga_r1_stm32h747xx_m4.yaml} | 2 +- .../arduino_giga_r1_stm32h747xx_m4_defconfig} | 6 ----- .../arduino_giga_r1_stm32h747xx_m7.dts} | 0 .../arduino_giga_r1_stm32h747xx_m7.yaml} | 2 +- .../arduino_giga_r1_stm32h747xx_m7_defconfig} | 6 ----- .../arduino_giga_r1/arduino_r3_connector.dtsi | 0 .../arduino_giga_r1/board.cmake | 4 ++-- boards/arduino/arduino_giga_r1/board.yml | 5 ++++ .../doc/img/arduino_giga_r1.jpg | Bin .../arduino_giga_r1/doc/index.rst | 8 +++---- .../support/openocd_arduino_giga_r1_m4.cfg | 0 .../support/openocd_arduino_giga_r1_m7.cfg | 0 .../arm/arduino_giga_r1/Kconfig.board | 12 ---------- .../arm/arduino_giga_r1/Kconfig.defconfig | 22 ------------------ 18 files changed, 37 insertions(+), 54 deletions(-) create mode 100644 boards/arduino/arduino_giga_r1/Kconfig.arduino_giga_r1 create mode 100644 boards/arduino/arduino_giga_r1/Kconfig.defconfig rename boards/{boards_legacy/arm => arduino}/arduino_giga_r1/arduino_giga_r1.dtsi (100%) rename boards/{boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4.dts => arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4.dts} (100%) rename boards/{boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4.yaml => arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4.yaml} (84%) rename boards/{boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4_defconfig => arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4_defconfig} (69%) rename boards/{boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7.dts => arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7.dts} (100%) rename boards/{boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7.yaml => arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7.yaml} (84%) rename boards/{boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7_defconfig => arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7_defconfig} (75%) rename boards/{boards_legacy/arm => arduino}/arduino_giga_r1/arduino_r3_connector.dtsi (100%) rename boards/{boards_legacy/arm => arduino}/arduino_giga_r1/board.cmake (89%) create mode 100644 boards/arduino/arduino_giga_r1/board.yml rename boards/{boards_legacy/arm => arduino}/arduino_giga_r1/doc/img/arduino_giga_r1.jpg (100%) rename boards/{boards_legacy/arm => arduino}/arduino_giga_r1/doc/index.rst (96%) rename boards/{boards_legacy/arm => arduino}/arduino_giga_r1/support/openocd_arduino_giga_r1_m4.cfg (100%) rename boards/{boards_legacy/arm => arduino}/arduino_giga_r1/support/openocd_arduino_giga_r1_m7.cfg (100%) delete mode 100644 boards/boards_legacy/arm/arduino_giga_r1/Kconfig.board delete mode 100644 boards/boards_legacy/arm/arduino_giga_r1/Kconfig.defconfig diff --git a/boards/arduino/arduino_giga_r1/Kconfig.arduino_giga_r1 b/boards/arduino/arduino_giga_r1/Kconfig.arduino_giga_r1 new file mode 100644 index 00000000000..6eb5d937b84 --- /dev/null +++ b/boards/arduino/arduino_giga_r1/Kconfig.arduino_giga_r1 @@ -0,0 +1,6 @@ +# Copyright 2023 Google LLC +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ARDUINO_GIGA_R1 + select SOC_STM32H747XX_M7 if BOARD_ARDUINO_GIGA_R1_STM32H747XX_M7 + select SOC_STM32H747XX_M4 if BOARD_ARDUINO_GIGA_R1_STM32H747XX_M4 diff --git a/boards/arduino/arduino_giga_r1/Kconfig.defconfig b/boards/arduino/arduino_giga_r1/Kconfig.defconfig new file mode 100644 index 00000000000..0d20cf3c341 --- /dev/null +++ b/boards/arduino/arduino_giga_r1/Kconfig.defconfig @@ -0,0 +1,18 @@ +# Copyright 2023 Google LLC +# SPDX-License-Identifier: Apache-2.0 + +if BOARD_ARDUINO_GIGA_R1 + +if BT + +choice AIROC_PART + default CYW4343W +endchoice + +choice CYW4343W_MODULE + default CYW4343W_MURATA_1DX +endchoice + +endif # BT + +endif # BOARD_ARDUINO_GIGA_R1 diff --git a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1.dtsi b/boards/arduino/arduino_giga_r1/arduino_giga_r1.dtsi similarity index 100% rename from boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1.dtsi rename to boards/arduino/arduino_giga_r1/arduino_giga_r1.dtsi diff --git a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4.dts b/boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4.dts similarity index 100% rename from boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4.dts rename to boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4.dts diff --git a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4.yaml b/boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4.yaml similarity index 84% rename from boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4.yaml rename to boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4.yaml index 58b71369e12..3917682bd21 100644 --- a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4.yaml +++ b/boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4.yaml @@ -1,4 +1,4 @@ -identifier: arduino_giga_r1_m4 +identifier: arduino_giga_r1/stm32h747xx/m4 name: Arduino GIGA R1 WiFi (M4) type: mcu arch: arm diff --git a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4_defconfig b/boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4_defconfig similarity index 69% rename from boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4_defconfig rename to boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4_defconfig index 1ab438cb15a..c7a9e88969b 100644 --- a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m4_defconfig +++ b/boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m4_defconfig @@ -1,12 +1,6 @@ # Copyright 2023 Google LLC # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H747XX=y - -# Board config should be specified since there are 2 possible targets -CONFIG_BOARD_ARDUINO_GIGA_R1_M4=y - # Enable GPIO CONFIG_GPIO=y diff --git a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7.dts b/boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7.dts similarity index 100% rename from boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7.dts rename to boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7.dts diff --git a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7.yaml b/boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7.yaml similarity index 84% rename from boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7.yaml rename to boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7.yaml index 2e844a14804..cdcaeba7c77 100644 --- a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7.yaml +++ b/boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7.yaml @@ -1,4 +1,4 @@ -identifier: arduino_giga_r1_m7 +identifier: arduino_giga_r1/stm32h747xx/m7 name: Arduino GIGA R1 WiFi (M7) type: mcu arch: arm diff --git a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7_defconfig b/boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7_defconfig similarity index 75% rename from boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7_defconfig rename to boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7_defconfig index 8f4491908e6..0bd7546e26a 100644 --- a/boards/boards_legacy/arm/arduino_giga_r1/arduino_giga_r1_m7_defconfig +++ b/boards/arduino/arduino_giga_r1/arduino_giga_r1_stm32h747xx_m7_defconfig @@ -1,12 +1,6 @@ # Copyright 2023 Google LLC # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H747XX=y - -# Board config should be specified since there are 2 possible targets -CONFIG_BOARD_ARDUINO_GIGA_R1_M7=y - # Disable the internal SMPS regulator CONFIG_POWER_SUPPLY_DIRECT_SMPS=n diff --git a/boards/boards_legacy/arm/arduino_giga_r1/arduino_r3_connector.dtsi b/boards/arduino/arduino_giga_r1/arduino_r3_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/arduino_giga_r1/arduino_r3_connector.dtsi rename to boards/arduino/arduino_giga_r1/arduino_r3_connector.dtsi diff --git a/boards/boards_legacy/arm/arduino_giga_r1/board.cmake b/boards/arduino/arduino_giga_r1/board.cmake similarity index 89% rename from boards/boards_legacy/arm/arduino_giga_r1/board.cmake rename to boards/arduino/arduino_giga_r1/board.cmake index 849f9f933f1..f02ceaf2c3d 100644 --- a/boards/boards_legacy/arm/arduino_giga_r1/board.cmake +++ b/boards/arduino/arduino_giga_r1/board.cmake @@ -1,10 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 -if(CONFIG_BOARD_ARDUINO_GIGA_R1_M7) +if(CONFIG_BOARD_ARDUINO_GIGA_R1_STM32H747XX_M7) board_runner_args(jlink "--device=STM32H747XI_M7" "--speed=4000") board_runner_args(openocd "--config=${BOARD_DIR}/support/openocd_arduino_giga_r1_m7.cfg") board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) -elseif(CONFIG_BOARD_ARDUINO_GIGA_R1_M4) +elseif(CONFIG_BOARD_ARDUINO_GIGA_R1_STM32H747XX_M4) board_runner_args(jlink "--device=STM32H747XI_M4" "--speed=4000") board_runner_args(openocd "--config=${BOARD_DIR}/support/openocd_arduino_giga_r1_m4.cfg") board_runner_args(openocd --target-handle=_CHIPNAME.cpu1) diff --git a/boards/arduino/arduino_giga_r1/board.yml b/boards/arduino/arduino_giga_r1/board.yml new file mode 100644 index 00000000000..3079c2f0d5c --- /dev/null +++ b/boards/arduino/arduino_giga_r1/board.yml @@ -0,0 +1,5 @@ +board: + name: arduino_giga_r1 + vendor: arduino + socs: + - name: stm32h747xx diff --git a/boards/boards_legacy/arm/arduino_giga_r1/doc/img/arduino_giga_r1.jpg b/boards/arduino/arduino_giga_r1/doc/img/arduino_giga_r1.jpg similarity index 100% rename from boards/boards_legacy/arm/arduino_giga_r1/doc/img/arduino_giga_r1.jpg rename to boards/arduino/arduino_giga_r1/doc/img/arduino_giga_r1.jpg diff --git a/boards/boards_legacy/arm/arduino_giga_r1/doc/index.rst b/boards/arduino/arduino_giga_r1/doc/index.rst similarity index 96% rename from boards/boards_legacy/arm/arduino_giga_r1/doc/index.rst rename to boards/arduino/arduino_giga_r1/doc/index.rst index 2e2b03917cc..0e95653edfa 100644 --- a/boards/boards_legacy/arm/arduino_giga_r1/doc/index.rst +++ b/boards/arduino/arduino_giga_r1/doc/index.rst @@ -103,7 +103,7 @@ Programming and Debugging ************************* Applications for the ``arduino_giga_r1`` board should be built per core target, -using either ``arduino_giga_r1_m7`` or ``arduino_giga_r1_m4`` as the target. +using either ``arduino_giga_r1/stm32h747xx/m7`` or ``arduino_giga_r1/stm32h747xx/m4`` as the target. See :ref:`build_an_application` for more information about application builds. @@ -134,7 +134,7 @@ Here is an example for the :ref:`hello_world` application. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: arduino_giga_r1_m7 + :board: arduino_giga_r1/stm32h747xx/m7 :goals: build flash Run a serial host program to connect with your board: @@ -147,7 +147,7 @@ You should see the following message on the console: .. code-block:: console - Hello World! arduino_giga_r1_m7 + Hello World! arduino_giga_r1 Similarly, you can build and flash samples on the M4 target. @@ -155,7 +155,7 @@ Here is an example for the :zephyr:code-sample:`blinky` application on M4 core. .. zephyr-app-commands:: :zephyr-app: samples/basic/blinky - :board: arduino_giga_r1_m4 + :board: arduino_giga_r1/stm32h747xx/m4 :goals: build flash Debugging diff --git a/boards/boards_legacy/arm/arduino_giga_r1/support/openocd_arduino_giga_r1_m4.cfg b/boards/arduino/arduino_giga_r1/support/openocd_arduino_giga_r1_m4.cfg similarity index 100% rename from boards/boards_legacy/arm/arduino_giga_r1/support/openocd_arduino_giga_r1_m4.cfg rename to boards/arduino/arduino_giga_r1/support/openocd_arduino_giga_r1_m4.cfg diff --git a/boards/boards_legacy/arm/arduino_giga_r1/support/openocd_arduino_giga_r1_m7.cfg b/boards/arduino/arduino_giga_r1/support/openocd_arduino_giga_r1_m7.cfg similarity index 100% rename from boards/boards_legacy/arm/arduino_giga_r1/support/openocd_arduino_giga_r1_m7.cfg rename to boards/arduino/arduino_giga_r1/support/openocd_arduino_giga_r1_m7.cfg diff --git a/boards/boards_legacy/arm/arduino_giga_r1/Kconfig.board b/boards/boards_legacy/arm/arduino_giga_r1/Kconfig.board deleted file mode 100644 index c810f6f31fc..00000000000 --- a/boards/boards_legacy/arm/arduino_giga_r1/Kconfig.board +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2023 Google LLC -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ARDUINO_GIGA_R1_M7 - bool "Arduino GIGA R1 WiFi Board (M7)" - depends on SOC_STM32H747XX - select CPU_CORTEX_M7 - -config BOARD_ARDUINO_GIGA_R1_M4 - bool "Arduino GIGA R1 WiFi Board (M4)" - depends on SOC_STM32H747XX - select CPU_CORTEX_M4 diff --git a/boards/boards_legacy/arm/arduino_giga_r1/Kconfig.defconfig b/boards/boards_legacy/arm/arduino_giga_r1/Kconfig.defconfig deleted file mode 100644 index e72fb499055..00000000000 --- a/boards/boards_legacy/arm/arduino_giga_r1/Kconfig.defconfig +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2023 Google LLC -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_ARDUINO_GIGA_R1_M7 || BOARD_ARDUINO_GIGA_R1_M4 - -config BOARD - default "arduino_giga_r1_m7" if BOARD_ARDUINO_GIGA_R1_M7 - default "arduino_giga_r1_m4" if BOARD_ARDUINO_GIGA_R1_M4 - -if BT - -choice AIROC_PART - default CYW4343W -endchoice - -choice CYW4343W_MODULE - default CYW4343W_MURATA_1DX -endchoice - -endif # BT - -endif # BOARD_ARDUINO_GIGA_R1_M7 || BOARD_ARDUINO_GIGA_R1_M4 From 9b91eb550913a4df8c7f2a60d4bacd401c1fceac Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 5 Feb 2024 17:53:06 +0100 Subject: [PATCH 03/15] boards: Convert arduino_opta_m4 to HWM v2 Port the board to HWMv2. Additionally, change the board name to arduino_opta as the compilation target is now fully explicit on the core in use. Besides, it will ease a potential addition of the m7 core. Signed-off-by: Erwan Gouriou --- boards/arduino/arduino_opta/Kconfig.arduino_opta | 5 +++++ .../arduino_opta/arduino_opta_stm32h747xx_m4.dts} | 0 .../arduino_opta/arduino_opta_stm32h747xx_m4.yaml} | 2 +- .../arduino_opta_stm32h747xx_m4_defconfig} | 5 ----- .../arduino_opta}/board.cmake | 0 boards/arduino/arduino_opta/board.yml | 5 +++++ .../arduino_opta}/doc/img/arduino_opta.jpeg | Bin .../arduino_opta}/doc/index.rst | 8 ++++---- .../boards_legacy/arm/arduino_opta_m4/Kconfig.board | 7 ------- .../arm/arduino_opta_m4/Kconfig.defconfig | 9 --------- 10 files changed, 15 insertions(+), 26 deletions(-) create mode 100644 boards/arduino/arduino_opta/Kconfig.arduino_opta rename boards/{boards_legacy/arm/arduino_opta_m4/arduino_opta_m4.dts => arduino/arduino_opta/arduino_opta_stm32h747xx_m4.dts} (100%) rename boards/{boards_legacy/arm/arduino_opta_m4/arduino_opta_m4.yaml => arduino/arduino_opta/arduino_opta_stm32h747xx_m4.yaml} (85%) rename boards/{boards_legacy/arm/arduino_opta_m4/arduino_opta_m4_defconfig => arduino/arduino_opta/arduino_opta_stm32h747xx_m4_defconfig} (80%) rename boards/{boards_legacy/arm/arduino_opta_m4 => arduino/arduino_opta}/board.cmake (100%) create mode 100644 boards/arduino/arduino_opta/board.yml rename boards/{boards_legacy/arm/arduino_opta_m4 => arduino/arduino_opta}/doc/img/arduino_opta.jpeg (100%) rename boards/{boards_legacy/arm/arduino_opta_m4 => arduino/arduino_opta}/doc/index.rst (96%) delete mode 100644 boards/boards_legacy/arm/arduino_opta_m4/Kconfig.board delete mode 100644 boards/boards_legacy/arm/arduino_opta_m4/Kconfig.defconfig diff --git a/boards/arduino/arduino_opta/Kconfig.arduino_opta b/boards/arduino/arduino_opta/Kconfig.arduino_opta new file mode 100644 index 00000000000..d591283a6ff --- /dev/null +++ b/boards/arduino/arduino_opta/Kconfig.arduino_opta @@ -0,0 +1,5 @@ +# Copyright (c) 2023 Felipe Neves +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ARDUINO_OPTA + select SOC_STM32H747XX_M4 diff --git a/boards/boards_legacy/arm/arduino_opta_m4/arduino_opta_m4.dts b/boards/arduino/arduino_opta/arduino_opta_stm32h747xx_m4.dts similarity index 100% rename from boards/boards_legacy/arm/arduino_opta_m4/arduino_opta_m4.dts rename to boards/arduino/arduino_opta/arduino_opta_stm32h747xx_m4.dts diff --git a/boards/boards_legacy/arm/arduino_opta_m4/arduino_opta_m4.yaml b/boards/arduino/arduino_opta/arduino_opta_stm32h747xx_m4.yaml similarity index 85% rename from boards/boards_legacy/arm/arduino_opta_m4/arduino_opta_m4.yaml rename to boards/arduino/arduino_opta/arduino_opta_stm32h747xx_m4.yaml index 4030cb402f6..e7495a72ea1 100644 --- a/boards/boards_legacy/arm/arduino_opta_m4/arduino_opta_m4.yaml +++ b/boards/arduino/arduino_opta/arduino_opta_stm32h747xx_m4.yaml @@ -1,4 +1,4 @@ -identifier: arduino_opta_m4 +identifier: arduino_opta/stm32h747xx/m4 name: ARDUINO OPTA (M4) type: mcu arch: arm diff --git a/boards/boards_legacy/arm/arduino_opta_m4/arduino_opta_m4_defconfig b/boards/arduino/arduino_opta/arduino_opta_stm32h747xx_m4_defconfig similarity index 80% rename from boards/boards_legacy/arm/arduino_opta_m4/arduino_opta_m4_defconfig rename to boards/arduino/arduino_opta/arduino_opta_stm32h747xx_m4_defconfig index bcf01ccabfb..f9f3e39d9c7 100644 --- a/boards/boards_legacy/arm/arduino_opta_m4/arduino_opta_m4_defconfig +++ b/boards/arduino/arduino_opta/arduino_opta_stm32h747xx_m4_defconfig @@ -1,11 +1,6 @@ # Copyright (c) 2023 Felipe Neves # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H747XX=y - -CONFIG_BOARD_ARDUINO_OPTA_M4=y - # enable GPIO CONFIG_GPIO=y diff --git a/boards/boards_legacy/arm/arduino_opta_m4/board.cmake b/boards/arduino/arduino_opta/board.cmake similarity index 100% rename from boards/boards_legacy/arm/arduino_opta_m4/board.cmake rename to boards/arduino/arduino_opta/board.cmake diff --git a/boards/arduino/arduino_opta/board.yml b/boards/arduino/arduino_opta/board.yml new file mode 100644 index 00000000000..c572627b348 --- /dev/null +++ b/boards/arduino/arduino_opta/board.yml @@ -0,0 +1,5 @@ +board: + name: arduino_opta + vendor: arduino + socs: + - name: stm32h747xx diff --git a/boards/boards_legacy/arm/arduino_opta_m4/doc/img/arduino_opta.jpeg b/boards/arduino/arduino_opta/doc/img/arduino_opta.jpeg similarity index 100% rename from boards/boards_legacy/arm/arduino_opta_m4/doc/img/arduino_opta.jpeg rename to boards/arduino/arduino_opta/doc/img/arduino_opta.jpeg diff --git a/boards/boards_legacy/arm/arduino_opta_m4/doc/index.rst b/boards/arduino/arduino_opta/doc/index.rst similarity index 96% rename from boards/boards_legacy/arm/arduino_opta_m4/doc/index.rst rename to boards/arduino/arduino_opta/doc/index.rst index 90f9497db33..db9a23e2d0f 100644 --- a/boards/boards_legacy/arm/arduino_opta_m4/doc/index.rst +++ b/boards/arduino/arduino_opta/doc/index.rst @@ -1,7 +1,7 @@ .. _arduino_opta_m4_board: Arduino OPTA M4-Core -####################### +#################### Overview ******** @@ -63,7 +63,7 @@ The current Zephyr arduino_opta_m4 board configuration supports the following ha Other hardware features are not yet supported on Zephyr porting. The default configuration per core can be found in the defconfig files: -``boards/arm/arduino_opta_m4/arduino_opta_m4_defconfig`` +:zephyr_file:`boards/arduino/arduino_opta/arduino_opta_m4_defconfig` Pin Mapping =========== @@ -107,7 +107,7 @@ two cores. This is done in 3 ways: Programming and Debugging ************************* -Applications for the ``arduino_opta_m4`` use the regular Zephyr build commands. +Applications for the ``arduino_opta`` use the regular Zephyr build commands. See :ref:`build_an_application` for more information about application builds. Flashing @@ -135,7 +135,7 @@ Here is an example for the :zephyr:code-sample:`blinky` application on M4 core. .. zephyr-app-commands:: :zephyr-app: samples/basic/blinky - :board: arduino_opta_m4 + :board: arduino_opta/stm32h747xx/m4 :goals: build flash Starting the application on the ARDUINO OPTA M4 diff --git a/boards/boards_legacy/arm/arduino_opta_m4/Kconfig.board b/boards/boards_legacy/arm/arduino_opta_m4/Kconfig.board deleted file mode 100644 index cce1cd6337a..00000000000 --- a/boards/boards_legacy/arm/arduino_opta_m4/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2023 Felipe Neves -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ARDUINO_OPTA_M4 - bool "Arduino OPTA Programmable Logic Controller M4 Core" - depends on SOC_STM32H747XX - select CPU_CORTEX_M4 diff --git a/boards/boards_legacy/arm/arduino_opta_m4/Kconfig.defconfig b/boards/boards_legacy/arm/arduino_opta_m4/Kconfig.defconfig deleted file mode 100644 index be17c009555..00000000000 --- a/boards/boards_legacy/arm/arduino_opta_m4/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2023 Felipe Neves -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_ARDUINO_OPTA_M4 - -config BOARD - default "arduino_opta_m4" - -endif # BOARD_ARDUINO_OPTA_M4 From ed1fe03b80ab4a693b22fac5236f3252fc4c34fd Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 5 Feb 2024 17:53:28 +0100 Subject: [PATCH 04/15] boards: Convert arduino_portenta_h7 to HWM v2 Port the board to HWMv2. Signed-off-by: Erwan Gouriou --- .../arduino_portenta_h7/CMakeLists.txt | 2 +- .../Kconfig.arduino_portenta_h7 | 8 ++++++++ .../arduino_portenta_h7-common.dtsi | 0 .../arduino_portenta_h7_stm32h747xx_m4.dts} | 0 .../arduino_portenta_h7_stm32h747xx_m4.yaml} | 2 +- .../arduino_portenta_h7_stm32h747xx_m4_defconfig} | 6 ------ .../arduino_portenta_h7_stm32h747xx_m7.dts} | 0 .../arduino_portenta_h7_stm32h747xx_m7.yaml} | 2 +- .../arduino_portenta_h7_stm32h747xx_m7_defconfig} | 6 ------ .../arm => arduino}/arduino_portenta_h7/board.c | 0 .../arduino_portenta_h7/board.cmake | 0 boards/arduino/arduino_portenta_h7/board.yml | 5 +++++ .../doc/img/arduino_portenta_h7.jpeg | Bin .../arduino_portenta_h7/doc/index.rst | 8 ++++---- .../arm/arduino_portenta_h7/Kconfig.board | 14 -------------- .../arm/arduino_portenta_h7/Kconfig.defconfig | 12 ------------ 16 files changed, 20 insertions(+), 45 deletions(-) rename boards/{boards_legacy/arm => arduino}/arduino_portenta_h7/CMakeLists.txt (76%) create mode 100644 boards/arduino/arduino_portenta_h7/Kconfig.arduino_portenta_h7 rename boards/{boards_legacy/arm => arduino}/arduino_portenta_h7/arduino_portenta_h7-common.dtsi (100%) rename boards/{boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m4.dts => arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m4.dts} (100%) rename boards/{boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m4.yaml => arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m4.yaml} (80%) rename boards/{boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m4_defconfig => arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m4_defconfig} (72%) rename boards/{boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m7.dts => arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m7.dts} (100%) rename boards/{boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m7.yaml => arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m7.yaml} (76%) rename boards/{boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m7_defconfig => arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m7_defconfig} (80%) rename boards/{boards_legacy/arm => arduino}/arduino_portenta_h7/board.c (100%) rename boards/{boards_legacy/arm => arduino}/arduino_portenta_h7/board.cmake (100%) create mode 100644 boards/arduino/arduino_portenta_h7/board.yml rename boards/{boards_legacy/arm => arduino}/arduino_portenta_h7/doc/img/arduino_portenta_h7.jpeg (100%) rename boards/{boards_legacy/arm => arduino}/arduino_portenta_h7/doc/index.rst (97%) delete mode 100644 boards/boards_legacy/arm/arduino_portenta_h7/Kconfig.board delete mode 100644 boards/boards_legacy/arm/arduino_portenta_h7/Kconfig.defconfig diff --git a/boards/boards_legacy/arm/arduino_portenta_h7/CMakeLists.txt b/boards/arduino/arduino_portenta_h7/CMakeLists.txt similarity index 76% rename from boards/boards_legacy/arm/arduino_portenta_h7/CMakeLists.txt rename to boards/arduino/arduino_portenta_h7/CMakeLists.txt index 6aaa80fcf41..526629d7110 100644 --- a/boards/boards_legacy/arm/arduino_portenta_h7/CMakeLists.txt +++ b/boards/arduino/arduino_portenta_h7/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (c) 2022 Benjamin Björnsson . # SPDX-License-Identifier: Apache-2.0 -if(CONFIG_BOARD_ARDUINO_PORTENTA_H7_M7) +if(CONFIG_BOARD_ARDUINO_PORTENTA_H7_STM32H747XX_M7) zephyr_library() zephyr_library_sources(board.c) diff --git a/boards/arduino/arduino_portenta_h7/Kconfig.arduino_portenta_h7 b/boards/arduino/arduino_portenta_h7/Kconfig.arduino_portenta_h7 new file mode 100644 index 00000000000..fa3b247b922 --- /dev/null +++ b/boards/arduino/arduino_portenta_h7/Kconfig.arduino_portenta_h7 @@ -0,0 +1,8 @@ +# Arduino Portenta H7 board configuration + +# Copyright (c) 2022 Benjamin Björnsson . +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ARDUINO_PORTENTA_H7 + select SOC_STM32H747XX_M7 if BOARD_ARDUINO_PORTENTA_H7_STM32H747XX_M7 + select SOC_STM32H747XX_M4 if BOARD_ARDUINO_PORTENTA_H7_STM32H747XX_M4 diff --git a/boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7-common.dtsi b/boards/arduino/arduino_portenta_h7/arduino_portenta_h7-common.dtsi similarity index 100% rename from boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7-common.dtsi rename to boards/arduino/arduino_portenta_h7/arduino_portenta_h7-common.dtsi diff --git a/boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m4.dts b/boards/arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m4.dts similarity index 100% rename from boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m4.dts rename to boards/arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m4.dts diff --git a/boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m4.yaml b/boards/arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m4.yaml similarity index 80% rename from boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m4.yaml rename to boards/arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m4.yaml index b84e35835c6..afbca313573 100644 --- a/boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m4.yaml +++ b/boards/arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m4.yaml @@ -1,4 +1,4 @@ -identifier: arduino_portenta_h7_m4 +identifier: arduino_portenta_h7/stm32h747xx/m4 name: Arduino Portenta H7 (M4) type: mcu arch: arm diff --git a/boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m4_defconfig b/boards/arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m4_defconfig similarity index 72% rename from boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m4_defconfig rename to boards/arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m4_defconfig index bb6c8c99951..4929eecabb7 100644 --- a/boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m4_defconfig +++ b/boards/arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m4_defconfig @@ -1,12 +1,6 @@ # Copyright (c) 2022 Benjamin Björnsson . # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H747XX=y - -# Board config should be specified since there are 2 possible targets -CONFIG_BOARD_ARDUINO_PORTENTA_H7_M4=y - # Enable GPIO CONFIG_GPIO=y diff --git a/boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m7.dts b/boards/arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m7.dts similarity index 100% rename from boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m7.dts rename to boards/arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m7.dts diff --git a/boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m7.yaml b/boards/arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m7.yaml similarity index 76% rename from boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m7.yaml rename to boards/arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m7.yaml index af23aee83d4..ee73966dbfe 100644 --- a/boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m7.yaml +++ b/boards/arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m7.yaml @@ -1,4 +1,4 @@ -identifier: arduino_portenta_h7_m7 +identifier: arduino_portenta_h7/stm32h747xx/m7 name: Arduino Portenta H7 (M7) type: mcu arch: arm diff --git a/boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m7_defconfig b/boards/arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m7_defconfig similarity index 80% rename from boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m7_defconfig rename to boards/arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m7_defconfig index f7e1a108631..18f533bf91d 100644 --- a/boards/boards_legacy/arm/arduino_portenta_h7/arduino_portenta_h7_m7_defconfig +++ b/boards/arduino/arduino_portenta_h7/arduino_portenta_h7_stm32h747xx_m7_defconfig @@ -1,12 +1,6 @@ # Copyright (c) 2022 Benjamin Björnsson . # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H747XX=y - -# Board config should be specified since there are 2 possible targets -CONFIG_BOARD_ARDUINO_PORTENTA_H7_M7=y - # Enable the internal SMPS regulator CONFIG_POWER_SUPPLY_DIRECT_SMPS=y diff --git a/boards/boards_legacy/arm/arduino_portenta_h7/board.c b/boards/arduino/arduino_portenta_h7/board.c similarity index 100% rename from boards/boards_legacy/arm/arduino_portenta_h7/board.c rename to boards/arduino/arduino_portenta_h7/board.c diff --git a/boards/boards_legacy/arm/arduino_portenta_h7/board.cmake b/boards/arduino/arduino_portenta_h7/board.cmake similarity index 100% rename from boards/boards_legacy/arm/arduino_portenta_h7/board.cmake rename to boards/arduino/arduino_portenta_h7/board.cmake diff --git a/boards/arduino/arduino_portenta_h7/board.yml b/boards/arduino/arduino_portenta_h7/board.yml new file mode 100644 index 00000000000..be2ba58da96 --- /dev/null +++ b/boards/arduino/arduino_portenta_h7/board.yml @@ -0,0 +1,5 @@ +board: + name: arduino_portenta_h7 + vendor: arduino + socs: + - name: stm32h747xx diff --git a/boards/boards_legacy/arm/arduino_portenta_h7/doc/img/arduino_portenta_h7.jpeg b/boards/arduino/arduino_portenta_h7/doc/img/arduino_portenta_h7.jpeg similarity index 100% rename from boards/boards_legacy/arm/arduino_portenta_h7/doc/img/arduino_portenta_h7.jpeg rename to boards/arduino/arduino_portenta_h7/doc/img/arduino_portenta_h7.jpeg diff --git a/boards/boards_legacy/arm/arduino_portenta_h7/doc/index.rst b/boards/arduino/arduino_portenta_h7/doc/index.rst similarity index 97% rename from boards/boards_legacy/arm/arduino_portenta_h7/doc/index.rst rename to boards/arduino/arduino_portenta_h7/doc/index.rst index 999a659f773..87b7aefdfe5 100644 --- a/boards/boards_legacy/arm/arduino_portenta_h7/doc/index.rst +++ b/boards/arduino/arduino_portenta_h7/doc/index.rst @@ -1,7 +1,7 @@ .. _arduino_portenta_h7_board: Arduino Portenta H7 -####################### +################### Overview ******** @@ -103,7 +103,7 @@ Here is an example for the :ref:`hello_world` application. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: arduino_portenta_h7_m7 + :board: arduino_portenta_h7/stm32h747xx/m7 :goals: build flash Run a serial host program to connect with your board: @@ -116,7 +116,7 @@ You should see the following message on the console: .. code-block:: console - Hello World! arduino_portenta_m7 + Hello World! arduino_portenta_h7 Similarly, you can build and flash samples on the M4 target. For this, please take care of the resource sharing (UART port used for console for instance). @@ -125,7 +125,7 @@ Here is an example for the :zephyr:code-sample:`blinky` application on M4 core. .. zephyr-app-commands:: :zephyr-app: samples/basic/blinky - :board: arduino_portenta_h7_m4 + :board: arduino_portenta_h7/stm32h747xx/m4 :goals: build flash .. _ARDUINO_PORTENTA_H7 website: diff --git a/boards/boards_legacy/arm/arduino_portenta_h7/Kconfig.board b/boards/boards_legacy/arm/arduino_portenta_h7/Kconfig.board deleted file mode 100644 index 75e401c5d4b..00000000000 --- a/boards/boards_legacy/arm/arduino_portenta_h7/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# Arduino Portenta H7 board configuration - -# Copyright (c) 2022 Benjamin Björnsson . -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ARDUINO_PORTENTA_H7_M7 - bool "Arduino Portenta H7 Board" - depends on SOC_STM32H747XX - select CPU_CORTEX_M7 - -config BOARD_ARDUINO_PORTENTA_H7_M4 - bool "Arduino Portenta H7 Board" - depends on SOC_STM32H747XX - select CPU_CORTEX_M4 diff --git a/boards/boards_legacy/arm/arduino_portenta_h7/Kconfig.defconfig b/boards/boards_legacy/arm/arduino_portenta_h7/Kconfig.defconfig deleted file mode 100644 index 7b537a6e466..00000000000 --- a/boards/boards_legacy/arm/arduino_portenta_h7/Kconfig.defconfig +++ /dev/null @@ -1,12 +0,0 @@ -# Arduino Portenta H7 board configuration - -# Copyright (c) 2022 Benjamin Björnsson . -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_ARDUINO_PORTENTA_H7_M7 || BOARD_ARDUINO_PORTENTA_H7_M4 - -config BOARD - default "arduino_portenta_h7_m7" if BOARD_ARDUINO_PORTENTA_H7_M7 - default "arduino_portenta_h7_m4" if BOARD_ARDUINO_PORTENTA_H7_M4 - -endif # BOARD_ARDUINO_PORTENTA_H7_M7 || BOARD_ARDUINO_PORTENTA_H7_M4 From a693af566b555a9c3658e7492269b05bb01d75e6 Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 5 Feb 2024 17:53:54 +0100 Subject: [PATCH 05/15] boards: Convert fk7b0m1_vbt6 to HWM v2 Port the board to HWMv2. Signed-off-by: Erwan Gouriou --- .../arm/fk7b0m1_vbt6/Kconfig.defconfig | 11 ----------- .../fk7b0m1_vbt6/Kconfig.fk7b0m1_vbt6} | 5 +---- .../arm => fanke}/fk7b0m1_vbt6/board.cmake | 0 boards/fanke/fk7b0m1_vbt6/board.yml | 5 +++++ .../fk7b0m1_vbt6/doc/img/fk7b0m1_vbt6.webp | Bin .../fk7b0m1_vbt6/doc/img/fk7b0m1_vbt6_pins.webp | Bin .../arm => fanke}/fk7b0m1_vbt6/doc/index.rst | 0 .../arm => fanke}/fk7b0m1_vbt6/fk7b0m1_vbt6.dts | 0 .../arm => fanke}/fk7b0m1_vbt6/fk7b0m1_vbt6.yaml | 0 .../fk7b0m1_vbt6/fk7b0m1_vbt6_defconfig | 3 --- .../arm => fanke}/fk7b0m1_vbt6/support/openocd.cfg | 0 boards/fanke/index.rst | 10 ++++++++++ 12 files changed, 16 insertions(+), 18 deletions(-) delete mode 100644 boards/boards_legacy/arm/fk7b0m1_vbt6/Kconfig.defconfig rename boards/{boards_legacy/arm/fk7b0m1_vbt6/Kconfig.board => fanke/fk7b0m1_vbt6/Kconfig.fk7b0m1_vbt6} (57%) rename boards/{boards_legacy/arm => fanke}/fk7b0m1_vbt6/board.cmake (100%) create mode 100644 boards/fanke/fk7b0m1_vbt6/board.yml rename boards/{boards_legacy/arm => fanke}/fk7b0m1_vbt6/doc/img/fk7b0m1_vbt6.webp (100%) rename boards/{boards_legacy/arm => fanke}/fk7b0m1_vbt6/doc/img/fk7b0m1_vbt6_pins.webp (100%) rename boards/{boards_legacy/arm => fanke}/fk7b0m1_vbt6/doc/index.rst (100%) rename boards/{boards_legacy/arm => fanke}/fk7b0m1_vbt6/fk7b0m1_vbt6.dts (100%) rename boards/{boards_legacy/arm => fanke}/fk7b0m1_vbt6/fk7b0m1_vbt6.yaml (100%) rename boards/{boards_legacy/arm => fanke}/fk7b0m1_vbt6/fk7b0m1_vbt6_defconfig (87%) rename boards/{boards_legacy/arm => fanke}/fk7b0m1_vbt6/support/openocd.cfg (100%) create mode 100644 boards/fanke/index.rst diff --git a/boards/boards_legacy/arm/fk7b0m1_vbt6/Kconfig.defconfig b/boards/boards_legacy/arm/fk7b0m1_vbt6/Kconfig.defconfig deleted file mode 100644 index 39de99eb5f8..00000000000 --- a/boards/boards_legacy/arm/fk7b0m1_vbt6/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32H7B0VBT board configuration - -# Copyright (c) Charles Dias -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_FK7B0M1_VBT6 - -config BOARD - default "fk7b0m1_vbt6" - -endif # BOARD_FK7B0M1_VBT6 diff --git a/boards/boards_legacy/arm/fk7b0m1_vbt6/Kconfig.board b/boards/fanke/fk7b0m1_vbt6/Kconfig.fk7b0m1_vbt6 similarity index 57% rename from boards/boards_legacy/arm/fk7b0m1_vbt6/Kconfig.board rename to boards/fanke/fk7b0m1_vbt6/Kconfig.fk7b0m1_vbt6 index 0b46551e95e..3f87d271463 100644 --- a/boards/boards_legacy/arm/fk7b0m1_vbt6/Kconfig.board +++ b/boards/fanke/fk7b0m1_vbt6/Kconfig.fk7b0m1_vbt6 @@ -1,8 +1,5 @@ -# STM32H7B0VBT FK7B0M1_VBT6 board - # Copyright (c) 2023 Charles Dias # SPDX-License-Identifier: Apache-2.0 config BOARD_FK7B0M1_VBT6 - bool "FANKE FK7B0M1-VBT6 board" - depends on SOC_STM32H7B0XX + select SOC_STM32H7B0XX diff --git a/boards/boards_legacy/arm/fk7b0m1_vbt6/board.cmake b/boards/fanke/fk7b0m1_vbt6/board.cmake similarity index 100% rename from boards/boards_legacy/arm/fk7b0m1_vbt6/board.cmake rename to boards/fanke/fk7b0m1_vbt6/board.cmake diff --git a/boards/fanke/fk7b0m1_vbt6/board.yml b/boards/fanke/fk7b0m1_vbt6/board.yml new file mode 100644 index 00000000000..204e3538a93 --- /dev/null +++ b/boards/fanke/fk7b0m1_vbt6/board.yml @@ -0,0 +1,5 @@ +board: + name: fk7b0m1_vbt6 + vendor: fanke + socs: + - name: stm32h7b0xx diff --git a/boards/boards_legacy/arm/fk7b0m1_vbt6/doc/img/fk7b0m1_vbt6.webp b/boards/fanke/fk7b0m1_vbt6/doc/img/fk7b0m1_vbt6.webp similarity index 100% rename from boards/boards_legacy/arm/fk7b0m1_vbt6/doc/img/fk7b0m1_vbt6.webp rename to boards/fanke/fk7b0m1_vbt6/doc/img/fk7b0m1_vbt6.webp diff --git a/boards/boards_legacy/arm/fk7b0m1_vbt6/doc/img/fk7b0m1_vbt6_pins.webp b/boards/fanke/fk7b0m1_vbt6/doc/img/fk7b0m1_vbt6_pins.webp similarity index 100% rename from boards/boards_legacy/arm/fk7b0m1_vbt6/doc/img/fk7b0m1_vbt6_pins.webp rename to boards/fanke/fk7b0m1_vbt6/doc/img/fk7b0m1_vbt6_pins.webp diff --git a/boards/boards_legacy/arm/fk7b0m1_vbt6/doc/index.rst b/boards/fanke/fk7b0m1_vbt6/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/fk7b0m1_vbt6/doc/index.rst rename to boards/fanke/fk7b0m1_vbt6/doc/index.rst diff --git a/boards/boards_legacy/arm/fk7b0m1_vbt6/fk7b0m1_vbt6.dts b/boards/fanke/fk7b0m1_vbt6/fk7b0m1_vbt6.dts similarity index 100% rename from boards/boards_legacy/arm/fk7b0m1_vbt6/fk7b0m1_vbt6.dts rename to boards/fanke/fk7b0m1_vbt6/fk7b0m1_vbt6.dts diff --git a/boards/boards_legacy/arm/fk7b0m1_vbt6/fk7b0m1_vbt6.yaml b/boards/fanke/fk7b0m1_vbt6/fk7b0m1_vbt6.yaml similarity index 100% rename from boards/boards_legacy/arm/fk7b0m1_vbt6/fk7b0m1_vbt6.yaml rename to boards/fanke/fk7b0m1_vbt6/fk7b0m1_vbt6.yaml diff --git a/boards/boards_legacy/arm/fk7b0m1_vbt6/fk7b0m1_vbt6_defconfig b/boards/fanke/fk7b0m1_vbt6/fk7b0m1_vbt6_defconfig similarity index 87% rename from boards/boards_legacy/arm/fk7b0m1_vbt6/fk7b0m1_vbt6_defconfig rename to boards/fanke/fk7b0m1_vbt6/fk7b0m1_vbt6_defconfig index 72587a3a897..dd4c5e18475 100644 --- a/boards/boards_legacy/arm/fk7b0m1_vbt6/fk7b0m1_vbt6_defconfig +++ b/boards/fanke/fk7b0m1_vbt6/fk7b0m1_vbt6_defconfig @@ -1,9 +1,6 @@ # Copyright (c) Charles Dias # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H7B0XX=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/fk7b0m1_vbt6/support/openocd.cfg b/boards/fanke/fk7b0m1_vbt6/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/fk7b0m1_vbt6/support/openocd.cfg rename to boards/fanke/fk7b0m1_vbt6/support/openocd.cfg diff --git a/boards/fanke/index.rst b/boards/fanke/index.rst new file mode 100644 index 00000000000..2c9434547ae --- /dev/null +++ b/boards/fanke/index.rst @@ -0,0 +1,10 @@ +.. _boards-fanke: + +Fanke +##### + +.. toctree:: + :maxdepth: 1 + :glob: + + **/* From e4f1f46960f1e0f9d0e179c44ca159b771a7eb9b Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 5 Feb 2024 17:54:09 +0100 Subject: [PATCH 06/15] boards: Convert nucleo_h723zg to HWM v2 Port the board to HWMv2. Signed-off-by: Erwan Gouriou --- .../arm => st}/nucleo_h723zg/Kconfig.defconfig | 3 --- .../nucleo_h723zg/Kconfig.nucleo_h723zg} | 5 +---- .../nucleo_h723zg/arduino_r3_connector.dtsi | 0 .../arm => st}/nucleo_h723zg/board.cmake | 0 boards/st/nucleo_h723zg/board.yml | 5 +++++ .../nucleo_h723zg/doc/img/nucleo_h723zg.jpg | Bin .../arm => st}/nucleo_h723zg/doc/index.rst | 4 ++-- .../arm => st}/nucleo_h723zg/nucleo_h723zg.dts | 0 .../arm => st}/nucleo_h723zg/nucleo_h723zg.yaml | 0 .../nucleo_h723zg/nucleo_h723zg_defconfig | 5 ----- .../arm => st}/nucleo_h723zg/support/openocd.cfg | 0 11 files changed, 8 insertions(+), 14 deletions(-) rename boards/{boards_legacy/arm => st}/nucleo_h723zg/Kconfig.defconfig (89%) rename boards/{boards_legacy/arm/nucleo_h723zg/Kconfig.board => st/nucleo_h723zg/Kconfig.nucleo_h723zg} (55%) rename boards/{boards_legacy/arm => st}/nucleo_h723zg/arduino_r3_connector.dtsi (100%) rename boards/{boards_legacy/arm => st}/nucleo_h723zg/board.cmake (100%) create mode 100644 boards/st/nucleo_h723zg/board.yml rename boards/{boards_legacy/arm => st}/nucleo_h723zg/doc/img/nucleo_h723zg.jpg (100%) rename boards/{boards_legacy/arm => st}/nucleo_h723zg/doc/index.rst (98%) rename boards/{boards_legacy/arm => st}/nucleo_h723zg/nucleo_h723zg.dts (100%) rename boards/{boards_legacy/arm => st}/nucleo_h723zg/nucleo_h723zg.yaml (100%) rename boards/{boards_legacy/arm => st}/nucleo_h723zg/nucleo_h723zg_defconfig (78%) rename boards/{boards_legacy/arm => st}/nucleo_h723zg/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/nucleo_h723zg/Kconfig.defconfig b/boards/st/nucleo_h723zg/Kconfig.defconfig similarity index 89% rename from boards/boards_legacy/arm/nucleo_h723zg/Kconfig.defconfig rename to boards/st/nucleo_h723zg/Kconfig.defconfig index 26f4491a7ad..2e205cf96c4 100644 --- a/boards/boards_legacy/arm/nucleo_h723zg/Kconfig.defconfig +++ b/boards/st/nucleo_h723zg/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_NUCLEO_H723ZG -config BOARD - default "nucleo_h723zg" - if NETWORKING config NET_L2_ETHERNET diff --git a/boards/boards_legacy/arm/nucleo_h723zg/Kconfig.board b/boards/st/nucleo_h723zg/Kconfig.nucleo_h723zg similarity index 55% rename from boards/boards_legacy/arm/nucleo_h723zg/Kconfig.board rename to boards/st/nucleo_h723zg/Kconfig.nucleo_h723zg index da658f90c6d..a8ff99320e6 100644 --- a/boards/boards_legacy/arm/nucleo_h723zg/Kconfig.board +++ b/boards/st/nucleo_h723zg/Kconfig.nucleo_h723zg @@ -1,8 +1,5 @@ -# STM32H723ZG Nucleo board configuration - # Copyright (c) 2020 Alexander Kozhinov # SPDX-License-Identifier: Apache-2.0 config BOARD_NUCLEO_H723ZG - bool "NUCLEO-H723ZG Development Board" - depends on SOC_STM32H723XX + select SOC_STM32H723XX diff --git a/boards/boards_legacy/arm/nucleo_h723zg/arduino_r3_connector.dtsi b/boards/st/nucleo_h723zg/arduino_r3_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/nucleo_h723zg/arduino_r3_connector.dtsi rename to boards/st/nucleo_h723zg/arduino_r3_connector.dtsi diff --git a/boards/boards_legacy/arm/nucleo_h723zg/board.cmake b/boards/st/nucleo_h723zg/board.cmake similarity index 100% rename from boards/boards_legacy/arm/nucleo_h723zg/board.cmake rename to boards/st/nucleo_h723zg/board.cmake diff --git a/boards/st/nucleo_h723zg/board.yml b/boards/st/nucleo_h723zg/board.yml new file mode 100644 index 00000000000..56a6d5cfb52 --- /dev/null +++ b/boards/st/nucleo_h723zg/board.yml @@ -0,0 +1,5 @@ +board: + name: nucleo_h723zg + vendor: st + socs: + - name: stm32h723xx diff --git a/boards/boards_legacy/arm/nucleo_h723zg/doc/img/nucleo_h723zg.jpg b/boards/st/nucleo_h723zg/doc/img/nucleo_h723zg.jpg similarity index 100% rename from boards/boards_legacy/arm/nucleo_h723zg/doc/img/nucleo_h723zg.jpg rename to boards/st/nucleo_h723zg/doc/img/nucleo_h723zg.jpg diff --git a/boards/boards_legacy/arm/nucleo_h723zg/doc/index.rst b/boards/st/nucleo_h723zg/doc/index.rst similarity index 98% rename from boards/boards_legacy/arm/nucleo_h723zg/doc/index.rst rename to boards/st/nucleo_h723zg/doc/index.rst index 44a87bb5129..cce94294255 100644 --- a/boards/boards_legacy/arm/nucleo_h723zg/doc/index.rst +++ b/boards/st/nucleo_h723zg/doc/index.rst @@ -118,8 +118,8 @@ features: Other hardware features are not yet supported on this Zephyr port. -The default configuration per core can be found in the defconfig files: -``boards/arm/nucleo_h723zg/nucleo_h723zg_defconfig`` +The default configuration can be found in the defconfig files: +:zephyr_file:`boards/st/nucleo_h723zg/nucleo_h723zg_defconfig`` For more details please refer to `STM32 Nucleo-144 board User Manual`_. diff --git a/boards/boards_legacy/arm/nucleo_h723zg/nucleo_h723zg.dts b/boards/st/nucleo_h723zg/nucleo_h723zg.dts similarity index 100% rename from boards/boards_legacy/arm/nucleo_h723zg/nucleo_h723zg.dts rename to boards/st/nucleo_h723zg/nucleo_h723zg.dts diff --git a/boards/boards_legacy/arm/nucleo_h723zg/nucleo_h723zg.yaml b/boards/st/nucleo_h723zg/nucleo_h723zg.yaml similarity index 100% rename from boards/boards_legacy/arm/nucleo_h723zg/nucleo_h723zg.yaml rename to boards/st/nucleo_h723zg/nucleo_h723zg.yaml diff --git a/boards/boards_legacy/arm/nucleo_h723zg/nucleo_h723zg_defconfig b/boards/st/nucleo_h723zg/nucleo_h723zg_defconfig similarity index 78% rename from boards/boards_legacy/arm/nucleo_h723zg/nucleo_h723zg_defconfig rename to boards/st/nucleo_h723zg/nucleo_h723zg_defconfig index 676bfa4533f..96a37909f6b 100644 --- a/boards/boards_legacy/arm/nucleo_h723zg/nucleo_h723zg_defconfig +++ b/boards/st/nucleo_h723zg/nucleo_h723zg_defconfig @@ -1,10 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H723XX=y - -CONFIG_BOARD_NUCLEO_H723ZG=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/nucleo_h723zg/support/openocd.cfg b/boards/st/nucleo_h723zg/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/nucleo_h723zg/support/openocd.cfg rename to boards/st/nucleo_h723zg/support/openocd.cfg From c14e8d746a5b8b30af43df2113bd34e1235d3ca9 Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 5 Feb 2024 17:54:15 +0100 Subject: [PATCH 07/15] boards: Convert nucleo_h743zi to HWM v2 Port the board to HWMv2. Signed-off-by: Erwan Gouriou --- .../arm => st}/nucleo_h743zi/Kconfig.defconfig | 3 --- .../nucleo_h743zi/Kconfig.nucleo_h743zi} | 5 +---- .../nucleo_h743zi/arduino_r3_connector.dtsi | 0 .../arm => st}/nucleo_h743zi/board.cmake | 0 boards/st/nucleo_h743zi/board.yml | 5 +++++ .../nucleo_h743zi/doc/img/nucleo_h743zi.jpg | Bin .../arm => st}/nucleo_h743zi/doc/index.rst | 2 +- .../arm => st}/nucleo_h743zi/nucleo_h743zi.dts | 0 .../arm => st}/nucleo_h743zi/nucleo_h743zi.yaml | 0 .../nucleo_h743zi/nucleo_h743zi_defconfig | 3 --- .../arm => st}/nucleo_h743zi/support/openocd.cfg | 0 11 files changed, 7 insertions(+), 11 deletions(-) rename boards/{boards_legacy/arm => st}/nucleo_h743zi/Kconfig.defconfig (86%) rename boards/{boards_legacy/arm/nucleo_h743zi/Kconfig.board => st/nucleo_h743zi/Kconfig.nucleo_h743zi} (50%) rename boards/{boards_legacy/arm => st}/nucleo_h743zi/arduino_r3_connector.dtsi (100%) rename boards/{boards_legacy/arm => st}/nucleo_h743zi/board.cmake (100%) create mode 100644 boards/st/nucleo_h743zi/board.yml rename boards/{boards_legacy/arm => st}/nucleo_h743zi/doc/img/nucleo_h743zi.jpg (100%) rename boards/{boards_legacy/arm => st}/nucleo_h743zi/doc/index.rst (99%) rename boards/{boards_legacy/arm => st}/nucleo_h743zi/nucleo_h743zi.dts (100%) rename boards/{boards_legacy/arm => st}/nucleo_h743zi/nucleo_h743zi.yaml (100%) rename boards/{boards_legacy/arm => st}/nucleo_h743zi/nucleo_h743zi_defconfig (85%) rename boards/{boards_legacy/arm => st}/nucleo_h743zi/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/nucleo_h743zi/Kconfig.defconfig b/boards/st/nucleo_h743zi/Kconfig.defconfig similarity index 86% rename from boards/boards_legacy/arm/nucleo_h743zi/Kconfig.defconfig rename to boards/st/nucleo_h743zi/Kconfig.defconfig index e426be48d7f..b893c798c11 100644 --- a/boards/boards_legacy/arm/nucleo_h743zi/Kconfig.defconfig +++ b/boards/st/nucleo_h743zi/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_NUCLEO_H743ZI -config BOARD - default "nucleo_h743zi" - if NETWORKING config NET_L2_ETHERNET diff --git a/boards/boards_legacy/arm/nucleo_h743zi/Kconfig.board b/boards/st/nucleo_h743zi/Kconfig.nucleo_h743zi similarity index 50% rename from boards/boards_legacy/arm/nucleo_h743zi/Kconfig.board rename to boards/st/nucleo_h743zi/Kconfig.nucleo_h743zi index 9417b98e670..f1f89927f01 100644 --- a/boards/boards_legacy/arm/nucleo_h743zi/Kconfig.board +++ b/boards/st/nucleo_h743zi/Kconfig.nucleo_h743zi @@ -1,8 +1,5 @@ -# STM32H743ZI Nucleo board configuration - # Copyright (c) 2020 Teslabs Engineering S.L. # SPDX-License-Identifier: Apache-2.0 config BOARD_NUCLEO_H743ZI - bool "Nucleo H743ZI Development Board" - depends on SOC_STM32H743XX + select SOC_STM32H743XX diff --git a/boards/boards_legacy/arm/nucleo_h743zi/arduino_r3_connector.dtsi b/boards/st/nucleo_h743zi/arduino_r3_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/nucleo_h743zi/arduino_r3_connector.dtsi rename to boards/st/nucleo_h743zi/arduino_r3_connector.dtsi diff --git a/boards/boards_legacy/arm/nucleo_h743zi/board.cmake b/boards/st/nucleo_h743zi/board.cmake similarity index 100% rename from boards/boards_legacy/arm/nucleo_h743zi/board.cmake rename to boards/st/nucleo_h743zi/board.cmake diff --git a/boards/st/nucleo_h743zi/board.yml b/boards/st/nucleo_h743zi/board.yml new file mode 100644 index 00000000000..e133a6fc034 --- /dev/null +++ b/boards/st/nucleo_h743zi/board.yml @@ -0,0 +1,5 @@ +board: + name: nucleo_h743zi + vendor: st + socs: + - name: stm32h743xx diff --git a/boards/boards_legacy/arm/nucleo_h743zi/doc/img/nucleo_h743zi.jpg b/boards/st/nucleo_h743zi/doc/img/nucleo_h743zi.jpg similarity index 100% rename from boards/boards_legacy/arm/nucleo_h743zi/doc/img/nucleo_h743zi.jpg rename to boards/st/nucleo_h743zi/doc/img/nucleo_h743zi.jpg diff --git a/boards/boards_legacy/arm/nucleo_h743zi/doc/index.rst b/boards/st/nucleo_h743zi/doc/index.rst similarity index 99% rename from boards/boards_legacy/arm/nucleo_h743zi/doc/index.rst rename to boards/st/nucleo_h743zi/doc/index.rst index e6cb6e242cd..d5d1ee596b6 100644 --- a/boards/boards_legacy/arm/nucleo_h743zi/doc/index.rst +++ b/boards/st/nucleo_h743zi/doc/index.rst @@ -133,7 +133,7 @@ features: Other hardware features are not yet supported on this Zephyr port. The default configuration can be found in the defconfig file: -``boards/arm/nucleo_h743zi/nucleo_h743zi_defconfig`` +:zephyr_file:`boards/st/nucleo_h743zi/nucleo_h743zi_defconfig` For more details please refer to `STM32 Nucleo-144 board User Manual`_. diff --git a/boards/boards_legacy/arm/nucleo_h743zi/nucleo_h743zi.dts b/boards/st/nucleo_h743zi/nucleo_h743zi.dts similarity index 100% rename from boards/boards_legacy/arm/nucleo_h743zi/nucleo_h743zi.dts rename to boards/st/nucleo_h743zi/nucleo_h743zi.dts diff --git a/boards/boards_legacy/arm/nucleo_h743zi/nucleo_h743zi.yaml b/boards/st/nucleo_h743zi/nucleo_h743zi.yaml similarity index 100% rename from boards/boards_legacy/arm/nucleo_h743zi/nucleo_h743zi.yaml rename to boards/st/nucleo_h743zi/nucleo_h743zi.yaml diff --git a/boards/boards_legacy/arm/nucleo_h743zi/nucleo_h743zi_defconfig b/boards/st/nucleo_h743zi/nucleo_h743zi_defconfig similarity index 85% rename from boards/boards_legacy/arm/nucleo_h743zi/nucleo_h743zi_defconfig rename to boards/st/nucleo_h743zi/nucleo_h743zi_defconfig index c06c8d34406..8dcaab60f61 100644 --- a/boards/boards_legacy/arm/nucleo_h743zi/nucleo_h743zi_defconfig +++ b/boards/st/nucleo_h743zi/nucleo_h743zi_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H743XX=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/nucleo_h743zi/support/openocd.cfg b/boards/st/nucleo_h743zi/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/nucleo_h743zi/support/openocd.cfg rename to boards/st/nucleo_h743zi/support/openocd.cfg From 89288c3b5067b0f1af0802b64a5f685721da5dd3 Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 5 Feb 2024 17:54:26 +0100 Subject: [PATCH 08/15] boards: Convert nucleo_h745zi_q to HWM v2 Port the board to HWMv2. Signed-off-by: Erwan Gouriou --- .../arm/nucleo_h745zi_q/Kconfig.board | 14 ------------- .../arm/nucleo_h745zi_q/Kconfig.defconfig | 19 ------------------ boards/st/nucleo_h745zi_q/Kconfig.defconfig | 15 ++++++++++++++ .../nucleo_h745zi_q/Kconfig.nucleo_h745zi_q | 8 ++++++++ .../nucleo_h745zi_q/arduino_r3_connector.dtsi | 0 .../arm => st}/nucleo_h745zi_q/board.cmake | 4 ++-- boards/st/nucleo_h745zi_q/board.yml | 5 +++++ .../doc/img/nucleo_h745zi_q.jpg | Bin .../arm => st}/nucleo_h745zi_q/doc/index.rst | 4 ++-- .../nucleo_h745zi_q/nucleo_h745zi_q.dtsi | 0 .../nucleo_h745zi_q_stm32h745xx_m4.dts} | 0 .../nucleo_h745zi_q_stm32h745xx_m4.yaml} | 2 +- .../nucleo_h745zi_q_stm32h745xx_m4_defconfig} | 6 ------ .../nucleo_h745zi_q_stm32h745xx_m7.dts} | 0 .../nucleo_h745zi_q_stm32h745xx_m7.yaml} | 2 +- .../nucleo_h745zi_q_stm32h745xx_m7_defconfig} | 6 ------ .../nucleo_h745zi_q/support/openocd.cfg | 0 17 files changed, 34 insertions(+), 51 deletions(-) delete mode 100644 boards/boards_legacy/arm/nucleo_h745zi_q/Kconfig.board delete mode 100644 boards/boards_legacy/arm/nucleo_h745zi_q/Kconfig.defconfig create mode 100644 boards/st/nucleo_h745zi_q/Kconfig.defconfig create mode 100644 boards/st/nucleo_h745zi_q/Kconfig.nucleo_h745zi_q rename boards/{boards_legacy/arm => st}/nucleo_h745zi_q/arduino_r3_connector.dtsi (100%) rename boards/{boards_legacy/arm => st}/nucleo_h745zi_q/board.cmake (77%) create mode 100644 boards/st/nucleo_h745zi_q/board.yml rename boards/{boards_legacy/arm => st}/nucleo_h745zi_q/doc/img/nucleo_h745zi_q.jpg (100%) rename boards/{boards_legacy/arm => st}/nucleo_h745zi_q/doc/index.rst (98%) rename boards/{boards_legacy/arm => st}/nucleo_h745zi_q/nucleo_h745zi_q.dtsi (100%) rename boards/{boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m4.dts => st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m4.dts} (100%) rename boards/{boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m4.yaml => st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m4.yaml} (83%) rename boards/{boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m4_defconfig => st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m4_defconfig} (64%) rename boards/{boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m7.dts => st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7.dts} (100%) rename boards/{boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m7.yaml => st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7.yaml} (84%) rename boards/{boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m7_defconfig => st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7_defconfig} (73%) rename boards/{boards_legacy/arm => st}/nucleo_h745zi_q/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/nucleo_h745zi_q/Kconfig.board b/boards/boards_legacy/arm/nucleo_h745zi_q/Kconfig.board deleted file mode 100644 index 0b5c5728610..00000000000 --- a/boards/boards_legacy/arm/nucleo_h745zi_q/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# STM32H745ZI Nucleo board configuration - -# Copyright (c) 2020 Alexander Kozhinov -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_H745ZI_Q_M7 - bool "NUCLEO-H745ZI-Q Development Board" - depends on SOC_STM32H745XX - select CPU_CORTEX_M7 - -config BOARD_NUCLEO_H745ZI_Q_M4 - bool "NUCLEO-H745ZI-Q Development Board" - depends on SOC_STM32H745XX - select CPU_CORTEX_M4 diff --git a/boards/boards_legacy/arm/nucleo_h745zi_q/Kconfig.defconfig b/boards/boards_legacy/arm/nucleo_h745zi_q/Kconfig.defconfig deleted file mode 100644 index 0d7f628f8ac..00000000000 --- a/boards/boards_legacy/arm/nucleo_h745zi_q/Kconfig.defconfig +++ /dev/null @@ -1,19 +0,0 @@ -# STM32H745ZI Nucleo board configuration - -# Copyright (c) 2020 Alexander Kozhinov -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NUCLEO_H745ZI_Q_M7 || BOARD_NUCLEO_H745ZI_Q_M4 - -config BOARD - default "nucleo_h745zi_q_m7" if BOARD_NUCLEO_H745ZI_Q_M7 - default "nucleo_h745zi_q_m4" if BOARD_NUCLEO_H745ZI_Q_M4 - -if NETWORKING - -config NET_L2_ETHERNET - default y - -endif # NETWORKING - -endif # BOARD_NUCLEO_H745ZI_Q_M7 or BOARD_NUCLEO_H745ZI_Q_M4 diff --git a/boards/st/nucleo_h745zi_q/Kconfig.defconfig b/boards/st/nucleo_h745zi_q/Kconfig.defconfig new file mode 100644 index 00000000000..9ad83aa96d1 --- /dev/null +++ b/boards/st/nucleo_h745zi_q/Kconfig.defconfig @@ -0,0 +1,15 @@ +# STM32H745ZI Nucleo board configuration + +# Copyright (c) 2020 Alexander Kozhinov +# SPDX-License-Identifier: Apache-2.0 + +if BOARD_NUCLEO_H745ZI_Q + +if NETWORKING + +config NET_L2_ETHERNET + default y + +endif # NETWORKING + +endif # BOARD_NUCLEO_H745ZI_Q diff --git a/boards/st/nucleo_h745zi_q/Kconfig.nucleo_h745zi_q b/boards/st/nucleo_h745zi_q/Kconfig.nucleo_h745zi_q new file mode 100644 index 00000000000..6d19d1592ae --- /dev/null +++ b/boards/st/nucleo_h745zi_q/Kconfig.nucleo_h745zi_q @@ -0,0 +1,8 @@ +# STM32H745ZI Nucleo board configuration + +# Copyright (c) 2020 Alexander Kozhinov +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_H745ZI_Q + select SOC_STM32H745XX_M7 if BOARD_NUCLEO_H745ZI_Q_STM32H745XX_M7 + select SOC_STM32H745XX_M4 if BOARD_NUCLEO_H745ZI_Q_STM32H745XX_M4 diff --git a/boards/boards_legacy/arm/nucleo_h745zi_q/arduino_r3_connector.dtsi b/boards/st/nucleo_h745zi_q/arduino_r3_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/nucleo_h745zi_q/arduino_r3_connector.dtsi rename to boards/st/nucleo_h745zi_q/arduino_r3_connector.dtsi diff --git a/boards/boards_legacy/arm/nucleo_h745zi_q/board.cmake b/boards/st/nucleo_h745zi_q/board.cmake similarity index 77% rename from boards/boards_legacy/arm/nucleo_h745zi_q/board.cmake rename to boards/st/nucleo_h745zi_q/board.cmake index b5ca36713e8..5e91bde5d6e 100644 --- a/boards/boards_legacy/arm/nucleo_h745zi_q/board.cmake +++ b/boards/st/nucleo_h745zi_q/board.cmake @@ -1,9 +1,9 @@ # SPDX-License-Identifier: Apache-2.0 board_runner_args(jlink "--device=STM32H745ZI" "--speed=4000") -if(CONFIG_BOARD_NUCLEO_H745ZI_Q_M7) +if(CONFIG_BOARD_NUCLEO_H745ZI_Q_STM32H745XX_M7) board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) -elseif(CONFIG_BOARD_NUCLEO_H745ZI_Q_M4) +elseif(CONFIG_BOARD_NUCLEO_H745ZI_Q_STM32H745XX_M4) board_runner_args(openocd --target-handle=_CHIPNAME.cpu1) endif() diff --git a/boards/st/nucleo_h745zi_q/board.yml b/boards/st/nucleo_h745zi_q/board.yml new file mode 100644 index 00000000000..7ba025f5bb7 --- /dev/null +++ b/boards/st/nucleo_h745zi_q/board.yml @@ -0,0 +1,5 @@ +board: + name: nucleo_h745zi_q + vendor: st + socs: + - name: stm32h745xx diff --git a/boards/boards_legacy/arm/nucleo_h745zi_q/doc/img/nucleo_h745zi_q.jpg b/boards/st/nucleo_h745zi_q/doc/img/nucleo_h745zi_q.jpg similarity index 100% rename from boards/boards_legacy/arm/nucleo_h745zi_q/doc/img/nucleo_h745zi_q.jpg rename to boards/st/nucleo_h745zi_q/doc/img/nucleo_h745zi_q.jpg diff --git a/boards/boards_legacy/arm/nucleo_h745zi_q/doc/index.rst b/boards/st/nucleo_h745zi_q/doc/index.rst similarity index 98% rename from boards/boards_legacy/arm/nucleo_h745zi_q/doc/index.rst rename to boards/st/nucleo_h745zi_q/doc/index.rst index 36c4b80bc58..265d3385be8 100644 --- a/boards/boards_legacy/arm/nucleo_h745zi_q/doc/index.rst +++ b/boards/st/nucleo_h745zi_q/doc/index.rst @@ -119,8 +119,8 @@ features: Other hardware features are not yet supported on this Zephyr port. The default configuration per core can be found in the defconfig files: -``boards/arm/nucleo_h745zi_q/nucleo_h745zi_q_m7_defconfig`` and -``boards/arm/nucleo_h745zi_q/nucleo_h745zi_q_m4_defconfig`` +:zephyr_file:`boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7_defconfig`` and +:zephyr_file:`boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m4_defconfig` For more details please refer to `STM32 Nucleo-144 board User Manual`_. diff --git a/boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q.dtsi b/boards/st/nucleo_h745zi_q/nucleo_h745zi_q.dtsi similarity index 100% rename from boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q.dtsi rename to boards/st/nucleo_h745zi_q/nucleo_h745zi_q.dtsi diff --git a/boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m4.dts b/boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m4.dts similarity index 100% rename from boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m4.dts rename to boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m4.dts diff --git a/boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m4.yaml b/boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m4.yaml similarity index 83% rename from boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m4.yaml rename to boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m4.yaml index 3299fb78496..19c2a5a1f1c 100644 --- a/boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m4.yaml +++ b/boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m4.yaml @@ -1,4 +1,4 @@ -identifier: nucleo_h745zi_q_m4 +identifier: nucleo_h745zi_q/stm32h745xx/m4 name: ST Nucleo H745ZI-Q (M4) type: mcu arch: arm diff --git a/boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m4_defconfig b/boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m4_defconfig similarity index 64% rename from boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m4_defconfig rename to boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m4_defconfig index b6233762bbd..5940e47563d 100644 --- a/boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m4_defconfig +++ b/boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m4_defconfig @@ -1,11 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H745XX=y - -# Board config should be specified since there are 2 possible targets -CONFIG_BOARD_NUCLEO_H745ZI_Q_M4=y - # Enable GPIO CONFIG_GPIO=y diff --git a/boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m7.dts b/boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7.dts similarity index 100% rename from boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m7.dts rename to boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7.dts diff --git a/boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m7.yaml b/boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7.yaml similarity index 84% rename from boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m7.yaml rename to boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7.yaml index 8c124a0a906..c480b150189 100644 --- a/boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m7.yaml +++ b/boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7.yaml @@ -1,4 +1,4 @@ -identifier: nucleo_h745zi_q_m7 +identifier: nucleo_h745zi_q/stm32h745xx/m7 name: ST Nucleo H745ZI-Q (M7) type: mcu arch: arm diff --git a/boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m7_defconfig b/boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7_defconfig similarity index 73% rename from boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m7_defconfig rename to boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7_defconfig index d57388f06ad..2ebc95e11f7 100644 --- a/boards/boards_legacy/arm/nucleo_h745zi_q/nucleo_h745zi_q_m7_defconfig +++ b/boards/st/nucleo_h745zi_q/nucleo_h745zi_q_stm32h745xx_m7_defconfig @@ -1,11 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H745XX=y - -# Board config should be specified since there are 2 possible targets -CONFIG_BOARD_NUCLEO_H745ZI_Q_M7=y - # Enable the internal SMPS regulator CONFIG_POWER_SUPPLY_DIRECT_SMPS=y diff --git a/boards/boards_legacy/arm/nucleo_h745zi_q/support/openocd.cfg b/boards/st/nucleo_h745zi_q/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/nucleo_h745zi_q/support/openocd.cfg rename to boards/st/nucleo_h745zi_q/support/openocd.cfg From 5d58ae16c20be225b7d83bdaef038b73cff5e8bf Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 5 Feb 2024 17:54:53 +0100 Subject: [PATCH 09/15] boards: Convert nucleo_h753zi to HWM v2 Port the board to HWMv2. Signed-off-by: Erwan Gouriou --- .../boards_legacy/arm/nucleo_h753zi/Kconfig.board | 8 -------- .../arm => st}/nucleo_h753zi/Kconfig.defconfig | 3 --- boards/st/nucleo_h753zi/Kconfig.nucleo_h753zi | 5 +++++ .../nucleo_h753zi/arduino_r3_connector.dtsi | 0 .../arm => st}/nucleo_h753zi/board.cmake | 0 boards/st/nucleo_h753zi/board.yml | 5 +++++ .../nucleo_h753zi/doc/img/nucleo_h753zi.jpg | Bin .../arm => st}/nucleo_h753zi/doc/index.rst | 2 +- .../arm => st}/nucleo_h753zi/nucleo_h753zi.dts | 0 .../arm => st}/nucleo_h753zi/nucleo_h753zi.yaml | 0 .../nucleo_h753zi/nucleo_h753zi_defconfig | 3 --- .../arm => st}/nucleo_h753zi/support/openocd.cfg | 0 12 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 boards/boards_legacy/arm/nucleo_h753zi/Kconfig.board rename boards/{boards_legacy/arm => st}/nucleo_h753zi/Kconfig.defconfig (86%) create mode 100644 boards/st/nucleo_h753zi/Kconfig.nucleo_h753zi rename boards/{boards_legacy/arm => st}/nucleo_h753zi/arduino_r3_connector.dtsi (100%) rename boards/{boards_legacy/arm => st}/nucleo_h753zi/board.cmake (100%) create mode 100644 boards/st/nucleo_h753zi/board.yml rename boards/{boards_legacy/arm => st}/nucleo_h753zi/doc/img/nucleo_h753zi.jpg (100%) rename boards/{boards_legacy/arm => st}/nucleo_h753zi/doc/index.rst (99%) rename boards/{boards_legacy/arm => st}/nucleo_h753zi/nucleo_h753zi.dts (100%) rename boards/{boards_legacy/arm => st}/nucleo_h753zi/nucleo_h753zi.yaml (100%) rename boards/{boards_legacy/arm => st}/nucleo_h753zi/nucleo_h753zi_defconfig (85%) rename boards/{boards_legacy/arm => st}/nucleo_h753zi/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/nucleo_h753zi/Kconfig.board b/boards/boards_legacy/arm/nucleo_h753zi/Kconfig.board deleted file mode 100644 index 15d573da300..00000000000 --- a/boards/boards_legacy/arm/nucleo_h753zi/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32H753ZI Nucleo board configuration - -# Copyright (c) 2021 Blue Clover Devices -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_H753ZI - bool "Nucleo H753ZI Development Board" - depends on SOC_STM32H753XX diff --git a/boards/boards_legacy/arm/nucleo_h753zi/Kconfig.defconfig b/boards/st/nucleo_h753zi/Kconfig.defconfig similarity index 86% rename from boards/boards_legacy/arm/nucleo_h753zi/Kconfig.defconfig rename to boards/st/nucleo_h753zi/Kconfig.defconfig index 60abed56e42..57c83698109 100644 --- a/boards/boards_legacy/arm/nucleo_h753zi/Kconfig.defconfig +++ b/boards/st/nucleo_h753zi/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_NUCLEO_H753ZI -config BOARD - default "nucleo_h753zi" - if NETWORKING config NET_L2_ETHERNET diff --git a/boards/st/nucleo_h753zi/Kconfig.nucleo_h753zi b/boards/st/nucleo_h753zi/Kconfig.nucleo_h753zi new file mode 100644 index 00000000000..2ca1de7fd93 --- /dev/null +++ b/boards/st/nucleo_h753zi/Kconfig.nucleo_h753zi @@ -0,0 +1,5 @@ +# Copyright (c) 2021 Blue Clover Devices +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_H753ZI + select SOC_STM32H753XX diff --git a/boards/boards_legacy/arm/nucleo_h753zi/arduino_r3_connector.dtsi b/boards/st/nucleo_h753zi/arduino_r3_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/nucleo_h753zi/arduino_r3_connector.dtsi rename to boards/st/nucleo_h753zi/arduino_r3_connector.dtsi diff --git a/boards/boards_legacy/arm/nucleo_h753zi/board.cmake b/boards/st/nucleo_h753zi/board.cmake similarity index 100% rename from boards/boards_legacy/arm/nucleo_h753zi/board.cmake rename to boards/st/nucleo_h753zi/board.cmake diff --git a/boards/st/nucleo_h753zi/board.yml b/boards/st/nucleo_h753zi/board.yml new file mode 100644 index 00000000000..12dc4b5a501 --- /dev/null +++ b/boards/st/nucleo_h753zi/board.yml @@ -0,0 +1,5 @@ +board: + name: nucleo_h753zi + vendor: st + socs: + - name: stm32h753xx diff --git a/boards/boards_legacy/arm/nucleo_h753zi/doc/img/nucleo_h753zi.jpg b/boards/st/nucleo_h753zi/doc/img/nucleo_h753zi.jpg similarity index 100% rename from boards/boards_legacy/arm/nucleo_h753zi/doc/img/nucleo_h753zi.jpg rename to boards/st/nucleo_h753zi/doc/img/nucleo_h753zi.jpg diff --git a/boards/boards_legacy/arm/nucleo_h753zi/doc/index.rst b/boards/st/nucleo_h753zi/doc/index.rst similarity index 99% rename from boards/boards_legacy/arm/nucleo_h753zi/doc/index.rst rename to boards/st/nucleo_h753zi/doc/index.rst index eab88c9952a..536d90d6310 100644 --- a/boards/boards_legacy/arm/nucleo_h753zi/doc/index.rst +++ b/boards/st/nucleo_h753zi/doc/index.rst @@ -127,7 +127,7 @@ features: Other hardware features are not yet supported on this Zephyr port. The default configuration can be found in the defconfig file: -``boards/arm/nucleo_h753zi/nucleo_h753zi_defconfig`` +:zephyr_file:`boards/st/nucleo_h753zi/nucleo_h753zi_defconfig` For more details please refer to `STM32 Nucleo-144 board User Manual`_. diff --git a/boards/boards_legacy/arm/nucleo_h753zi/nucleo_h753zi.dts b/boards/st/nucleo_h753zi/nucleo_h753zi.dts similarity index 100% rename from boards/boards_legacy/arm/nucleo_h753zi/nucleo_h753zi.dts rename to boards/st/nucleo_h753zi/nucleo_h753zi.dts diff --git a/boards/boards_legacy/arm/nucleo_h753zi/nucleo_h753zi.yaml b/boards/st/nucleo_h753zi/nucleo_h753zi.yaml similarity index 100% rename from boards/boards_legacy/arm/nucleo_h753zi/nucleo_h753zi.yaml rename to boards/st/nucleo_h753zi/nucleo_h753zi.yaml diff --git a/boards/boards_legacy/arm/nucleo_h753zi/nucleo_h753zi_defconfig b/boards/st/nucleo_h753zi/nucleo_h753zi_defconfig similarity index 85% rename from boards/boards_legacy/arm/nucleo_h753zi/nucleo_h753zi_defconfig rename to boards/st/nucleo_h753zi/nucleo_h753zi_defconfig index 42eb8fd0f12..8dcaab60f61 100644 --- a/boards/boards_legacy/arm/nucleo_h753zi/nucleo_h753zi_defconfig +++ b/boards/st/nucleo_h753zi/nucleo_h753zi_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H753XX=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/nucleo_h753zi/support/openocd.cfg b/boards/st/nucleo_h753zi/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/nucleo_h753zi/support/openocd.cfg rename to boards/st/nucleo_h753zi/support/openocd.cfg From a775d599f39cfbf3346f40a91171ec92bc73fe6b Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 5 Feb 2024 17:54:59 +0100 Subject: [PATCH 10/15] boards: Convert nucleo_h7a3zi_q to HWM v2 Port the board to HWMv2. Signed-off-by: Erwan Gouriou --- .../boards_legacy/arm/nucleo_h7a3zi_q/Kconfig.board | 8 -------- .../arm => st}/nucleo_h7a3zi_q/Kconfig.defconfig | 3 --- boards/st/nucleo_h7a3zi_q/Kconfig.nucleo_h7a3zi_q | 5 +++++ .../nucleo_h7a3zi_q/arduino_r3_connector.dtsi | 0 .../arm => st}/nucleo_h7a3zi_q/board.cmake | 0 boards/st/nucleo_h7a3zi_q/board.yml | 5 +++++ .../nucleo_h7a3zi_q/doc/img/nucleo_h7a3zi_q.jpg | Bin .../arm => st}/nucleo_h7a3zi_q/doc/index.rst | 2 +- .../arm => st}/nucleo_h7a3zi_q/nucleo_h7a3zi_q.dts | 0 .../arm => st}/nucleo_h7a3zi_q/nucleo_h7a3zi_q.yaml | 0 .../nucleo_h7a3zi_q/nucleo_h7a3zi_q_defconfig | 3 --- .../arm => st}/nucleo_h7a3zi_q/support/openocd.cfg | 0 12 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 boards/boards_legacy/arm/nucleo_h7a3zi_q/Kconfig.board rename boards/{boards_legacy/arm => st}/nucleo_h7a3zi_q/Kconfig.defconfig (85%) create mode 100644 boards/st/nucleo_h7a3zi_q/Kconfig.nucleo_h7a3zi_q rename boards/{boards_legacy/arm => st}/nucleo_h7a3zi_q/arduino_r3_connector.dtsi (100%) rename boards/{boards_legacy/arm => st}/nucleo_h7a3zi_q/board.cmake (100%) create mode 100644 boards/st/nucleo_h7a3zi_q/board.yml rename boards/{boards_legacy/arm => st}/nucleo_h7a3zi_q/doc/img/nucleo_h7a3zi_q.jpg (100%) rename boards/{boards_legacy/arm => st}/nucleo_h7a3zi_q/doc/index.rst (98%) rename boards/{boards_legacy/arm => st}/nucleo_h7a3zi_q/nucleo_h7a3zi_q.dts (100%) rename boards/{boards_legacy/arm => st}/nucleo_h7a3zi_q/nucleo_h7a3zi_q.yaml (100%) rename boards/{boards_legacy/arm => st}/nucleo_h7a3zi_q/nucleo_h7a3zi_q_defconfig (87%) rename boards/{boards_legacy/arm => st}/nucleo_h7a3zi_q/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/nucleo_h7a3zi_q/Kconfig.board b/boards/boards_legacy/arm/nucleo_h7a3zi_q/Kconfig.board deleted file mode 100644 index 3d8317ac286..00000000000 --- a/boards/boards_legacy/arm/nucleo_h7a3zi_q/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32H7A3ZI-Q Nucleo board configuration - -# Copyright (c) 2021 Electrolance Solutions -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NUCLEO_H7A3ZI_Q - bool "Nucleo H75A3ZI-Q Development Board" - depends on SOC_STM32H7A3XXQ diff --git a/boards/boards_legacy/arm/nucleo_h7a3zi_q/Kconfig.defconfig b/boards/st/nucleo_h7a3zi_q/Kconfig.defconfig similarity index 85% rename from boards/boards_legacy/arm/nucleo_h7a3zi_q/Kconfig.defconfig rename to boards/st/nucleo_h7a3zi_q/Kconfig.defconfig index ec43ace7dcb..e8fd3484ea7 100644 --- a/boards/boards_legacy/arm/nucleo_h7a3zi_q/Kconfig.defconfig +++ b/boards/st/nucleo_h7a3zi_q/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_NUCLEO_H7A3ZI_Q -config BOARD - default "nucleo_h7a3zi_q" - config USB_DC_HAS_HS_SUPPORT default y depends on USB_DC_STM32 diff --git a/boards/st/nucleo_h7a3zi_q/Kconfig.nucleo_h7a3zi_q b/boards/st/nucleo_h7a3zi_q/Kconfig.nucleo_h7a3zi_q new file mode 100644 index 00000000000..7a00b2bd8fe --- /dev/null +++ b/boards/st/nucleo_h7a3zi_q/Kconfig.nucleo_h7a3zi_q @@ -0,0 +1,5 @@ +# Copyright (c) 2021 Electrolance Solutions +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NUCLEO_H7A3ZI_Q + select SOC_STM32H7A3XXQ diff --git a/boards/boards_legacy/arm/nucleo_h7a3zi_q/arduino_r3_connector.dtsi b/boards/st/nucleo_h7a3zi_q/arduino_r3_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/nucleo_h7a3zi_q/arduino_r3_connector.dtsi rename to boards/st/nucleo_h7a3zi_q/arduino_r3_connector.dtsi diff --git a/boards/boards_legacy/arm/nucleo_h7a3zi_q/board.cmake b/boards/st/nucleo_h7a3zi_q/board.cmake similarity index 100% rename from boards/boards_legacy/arm/nucleo_h7a3zi_q/board.cmake rename to boards/st/nucleo_h7a3zi_q/board.cmake diff --git a/boards/st/nucleo_h7a3zi_q/board.yml b/boards/st/nucleo_h7a3zi_q/board.yml new file mode 100644 index 00000000000..0c64ac88228 --- /dev/null +++ b/boards/st/nucleo_h7a3zi_q/board.yml @@ -0,0 +1,5 @@ +board: + name: nucleo_h7a3zi_q + vendor: st + socs: + - name: stm32h7a3xx diff --git a/boards/boards_legacy/arm/nucleo_h7a3zi_q/doc/img/nucleo_h7a3zi_q.jpg b/boards/st/nucleo_h7a3zi_q/doc/img/nucleo_h7a3zi_q.jpg similarity index 100% rename from boards/boards_legacy/arm/nucleo_h7a3zi_q/doc/img/nucleo_h7a3zi_q.jpg rename to boards/st/nucleo_h7a3zi_q/doc/img/nucleo_h7a3zi_q.jpg diff --git a/boards/boards_legacy/arm/nucleo_h7a3zi_q/doc/index.rst b/boards/st/nucleo_h7a3zi_q/doc/index.rst similarity index 98% rename from boards/boards_legacy/arm/nucleo_h7a3zi_q/doc/index.rst rename to boards/st/nucleo_h7a3zi_q/doc/index.rst index 1144f13e731..484c7e82196 100644 --- a/boards/boards_legacy/arm/nucleo_h7a3zi_q/doc/index.rst +++ b/boards/st/nucleo_h7a3zi_q/doc/index.rst @@ -115,7 +115,7 @@ features: Other hardware features are not yet supported on this Zephyr port. The default configuration can be found in the defconfig file: -``boards/arm/nucleo_h7a3zi_q/nucleo_h7a3zi_q_defconfig`` +:zephyr_file:`boards/st/nucleo_h7a3zi_q/nucleo_h7a3zi_q_defconfig` For more details please refer to `STM32 Nucleo-144 board User Manual`_. diff --git a/boards/boards_legacy/arm/nucleo_h7a3zi_q/nucleo_h7a3zi_q.dts b/boards/st/nucleo_h7a3zi_q/nucleo_h7a3zi_q.dts similarity index 100% rename from boards/boards_legacy/arm/nucleo_h7a3zi_q/nucleo_h7a3zi_q.dts rename to boards/st/nucleo_h7a3zi_q/nucleo_h7a3zi_q.dts diff --git a/boards/boards_legacy/arm/nucleo_h7a3zi_q/nucleo_h7a3zi_q.yaml b/boards/st/nucleo_h7a3zi_q/nucleo_h7a3zi_q.yaml similarity index 100% rename from boards/boards_legacy/arm/nucleo_h7a3zi_q/nucleo_h7a3zi_q.yaml rename to boards/st/nucleo_h7a3zi_q/nucleo_h7a3zi_q.yaml diff --git a/boards/boards_legacy/arm/nucleo_h7a3zi_q/nucleo_h7a3zi_q_defconfig b/boards/st/nucleo_h7a3zi_q/nucleo_h7a3zi_q_defconfig similarity index 87% rename from boards/boards_legacy/arm/nucleo_h7a3zi_q/nucleo_h7a3zi_q_defconfig rename to boards/st/nucleo_h7a3zi_q/nucleo_h7a3zi_q_defconfig index 86ed02f8045..5490e9f1fc7 100644 --- a/boards/boards_legacy/arm/nucleo_h7a3zi_q/nucleo_h7a3zi_q_defconfig +++ b/boards/st/nucleo_h7a3zi_q/nucleo_h7a3zi_q_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2021 Electrolance Solutions # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H7A3XXQ=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/nucleo_h7a3zi_q/support/openocd.cfg b/boards/st/nucleo_h7a3zi_q/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/nucleo_h7a3zi_q/support/openocd.cfg rename to boards/st/nucleo_h7a3zi_q/support/openocd.cfg From 100b933fdeffa330e8834c06118bda7143070a15 Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 5 Feb 2024 17:55:04 +0100 Subject: [PATCH 11/15] boards: Convert stm32h735g_disco to HWM v2 Port the board to HWMv2. Signed-off-by: Erwan Gouriou --- .../arm => st}/stm32h735g_disco/Kconfig.defconfig | 3 --- .../stm32h735g_disco/Kconfig.stm32h735g_disco} | 5 +---- .../arm => st}/stm32h735g_disco/board.cmake | 0 boards/st/stm32h735g_disco/board.yml | 5 +++++ .../stm32h735g_disco/doc/img/stm32h735g_disco.jpg | Bin .../arm => st}/stm32h735g_disco/doc/index.rst | 4 ++-- .../arm => st}/stm32h735g_disco/pmod_connector.dtsi | 0 .../stm32h735g_disco/stm32h735g_disco.dts | 0 .../stm32h735g_disco/stm32h735g_disco.yaml | 0 .../stm32h735g_disco/stm32h735g_disco_defconfig | 3 --- .../arm => st}/stm32h735g_disco/support/openocd.cfg | 0 11 files changed, 8 insertions(+), 12 deletions(-) rename boards/{boards_legacy/arm => st}/stm32h735g_disco/Kconfig.defconfig (88%) rename boards/{boards_legacy/arm/stm32h735g_disco/Kconfig.board => st/stm32h735g_disco/Kconfig.stm32h735g_disco} (50%) rename boards/{boards_legacy/arm => st}/stm32h735g_disco/board.cmake (100%) create mode 100644 boards/st/stm32h735g_disco/board.yml rename boards/{boards_legacy/arm => st}/stm32h735g_disco/doc/img/stm32h735g_disco.jpg (100%) rename boards/{boards_legacy/arm => st}/stm32h735g_disco/doc/index.rst (97%) rename boards/{boards_legacy/arm => st}/stm32h735g_disco/pmod_connector.dtsi (100%) rename boards/{boards_legacy/arm => st}/stm32h735g_disco/stm32h735g_disco.dts (100%) rename boards/{boards_legacy/arm => st}/stm32h735g_disco/stm32h735g_disco.yaml (100%) rename boards/{boards_legacy/arm => st}/stm32h735g_disco/stm32h735g_disco_defconfig (87%) rename boards/{boards_legacy/arm => st}/stm32h735g_disco/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/stm32h735g_disco/Kconfig.defconfig b/boards/st/stm32h735g_disco/Kconfig.defconfig similarity index 88% rename from boards/boards_legacy/arm/stm32h735g_disco/Kconfig.defconfig rename to boards/st/stm32h735g_disco/Kconfig.defconfig index 72308958d7b..9c3777487a3 100644 --- a/boards/boards_legacy/arm/stm32h735g_disco/Kconfig.defconfig +++ b/boards/st/stm32h735g_disco/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_STM32H735G_DISCO -config BOARD - default "stm32h735g_disco" - if NETWORKING config NET_L2_ETHERNET diff --git a/boards/boards_legacy/arm/stm32h735g_disco/Kconfig.board b/boards/st/stm32h735g_disco/Kconfig.stm32h735g_disco similarity index 50% rename from boards/boards_legacy/arm/stm32h735g_disco/Kconfig.board rename to boards/st/stm32h735g_disco/Kconfig.stm32h735g_disco index 78a8af8bc01..f2284afee88 100644 --- a/boards/boards_legacy/arm/stm32h735g_disco/Kconfig.board +++ b/boards/st/stm32h735g_disco/Kconfig.stm32h735g_disco @@ -1,8 +1,5 @@ -# STM32H735G Discovery board configuration - # Copyright (c) 2021 SILA Embedded Solutions GmbH # SPDX-License-Identifier: Apache-2.0 config BOARD_STM32H735G_DISCO - bool "STM32H735G Discovery Development Board" - depends on SOC_STM32H735XX + select SOC_STM32H735XX diff --git a/boards/boards_legacy/arm/stm32h735g_disco/board.cmake b/boards/st/stm32h735g_disco/board.cmake similarity index 100% rename from boards/boards_legacy/arm/stm32h735g_disco/board.cmake rename to boards/st/stm32h735g_disco/board.cmake diff --git a/boards/st/stm32h735g_disco/board.yml b/boards/st/stm32h735g_disco/board.yml new file mode 100644 index 00000000000..146a622647e --- /dev/null +++ b/boards/st/stm32h735g_disco/board.yml @@ -0,0 +1,5 @@ +board: + name: stm32h735g_disco + vendor: st + socs: + - name: stm32h735xx diff --git a/boards/boards_legacy/arm/stm32h735g_disco/doc/img/stm32h735g_disco.jpg b/boards/st/stm32h735g_disco/doc/img/stm32h735g_disco.jpg similarity index 100% rename from boards/boards_legacy/arm/stm32h735g_disco/doc/img/stm32h735g_disco.jpg rename to boards/st/stm32h735g_disco/doc/img/stm32h735g_disco.jpg diff --git a/boards/boards_legacy/arm/stm32h735g_disco/doc/index.rst b/boards/st/stm32h735g_disco/doc/index.rst similarity index 97% rename from boards/boards_legacy/arm/stm32h735g_disco/doc/index.rst rename to boards/st/stm32h735g_disco/doc/index.rst index e4bf324650b..bf7605d7766 100644 --- a/boards/boards_legacy/arm/stm32h735g_disco/doc/index.rst +++ b/boards/st/stm32h735g_disco/doc/index.rst @@ -77,8 +77,8 @@ The current Zephyr stm32h735g_disco board configuration supports the following h Other hardware features are not yet supported on Zephyr porting. -The default configuration per core can be found in the defconfig file: -``boards/arm/stm32h735g_disco/stm32h735g_disco_defconfig`` +The default configuration can be found in the defconfig file: +:zephyr_file:`boards/st/stm32h735g_disco/stm32h735g_disco_defconfig` Pin Mapping =========== diff --git a/boards/boards_legacy/arm/stm32h735g_disco/pmod_connector.dtsi b/boards/st/stm32h735g_disco/pmod_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/stm32h735g_disco/pmod_connector.dtsi rename to boards/st/stm32h735g_disco/pmod_connector.dtsi diff --git a/boards/boards_legacy/arm/stm32h735g_disco/stm32h735g_disco.dts b/boards/st/stm32h735g_disco/stm32h735g_disco.dts similarity index 100% rename from boards/boards_legacy/arm/stm32h735g_disco/stm32h735g_disco.dts rename to boards/st/stm32h735g_disco/stm32h735g_disco.dts diff --git a/boards/boards_legacy/arm/stm32h735g_disco/stm32h735g_disco.yaml b/boards/st/stm32h735g_disco/stm32h735g_disco.yaml similarity index 100% rename from boards/boards_legacy/arm/stm32h735g_disco/stm32h735g_disco.yaml rename to boards/st/stm32h735g_disco/stm32h735g_disco.yaml diff --git a/boards/boards_legacy/arm/stm32h735g_disco/stm32h735g_disco_defconfig b/boards/st/stm32h735g_disco/stm32h735g_disco_defconfig similarity index 87% rename from boards/boards_legacy/arm/stm32h735g_disco/stm32h735g_disco_defconfig rename to boards/st/stm32h735g_disco/stm32h735g_disco_defconfig index d8c7d4e78d0..b47315cdfb9 100644 --- a/boards/boards_legacy/arm/stm32h735g_disco/stm32h735g_disco_defconfig +++ b/boards/st/stm32h735g_disco/stm32h735g_disco_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H735XX=y - # Enable the internal SMPS regulator CONFIG_POWER_SUPPLY_DIRECT_SMPS=y diff --git a/boards/boards_legacy/arm/stm32h735g_disco/support/openocd.cfg b/boards/st/stm32h735g_disco/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/stm32h735g_disco/support/openocd.cfg rename to boards/st/stm32h735g_disco/support/openocd.cfg From 35cc7a06af4b328f3e709e402b7970477fce976c Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 5 Feb 2024 17:55:14 +0100 Subject: [PATCH 12/15] boards: Convert stm32h747i_disco to HWM v2 Port the board to HWMv2. Signed-off-by: Erwan Gouriou --- .../arm/stm32h747i_disco/Kconfig.board | 14 ------------- ...f => stm32h747i_disco_stm32h747xx_m7.conf} | 0 ...> stm32h747i_disco_stm32h747xx_m7.overlay} | 0 .../stm32h747i_disco/CMakeLists.txt | 0 .../stm32h747i_disco/Kconfig.defconfig | 8 ++------ .../stm32h747i_disco/Kconfig.stm32h747i_disco | 8 ++++++++ .../arduino_r3_connector.dtsi | 0 .../arm => st}/stm32h747i_disco/board.cmake | 4 ++-- boards/st/stm32h747i_disco/board.yml | 5 +++++ .../arm => st}/stm32h747i_disco/dc_ram.ld | 0 .../disco_h747i_ethernet_modification_1.jpg | Bin .../disco_h747i_ethernet_modification_2.jpg | Bin .../doc/img/stm32h747i_disco.jpg | Bin .../arm => st}/stm32h747i_disco/doc/index.rst | 19 +++++++++--------- .../stm32h747i_disco/pmod_connector.dtsi | 0 .../stm32h747i_disco/stm32h747i_disco.dtsi | 0 .../stm32h747i_disco_stm32h747xx_m4.dts} | 0 .../stm32h747i_disco_stm32h747xx_m4.yaml} | 2 +- ...stm32h747i_disco_stm32h747xx_m4_defconfig} | 6 ------ .../stm32h747i_disco_stm32h747xx_m7.dts} | 0 .../stm32h747i_disco_stm32h747xx_m7.yaml} | 2 +- ...stm32h747i_disco_stm32h747xx_m7_defconfig} | 6 ------ .../support/openocd_stm32h747i_disco_m4.cfg | 0 .../support/openocd_stm32h747i_disco_m7.cfg | 0 24 files changed, 29 insertions(+), 45 deletions(-) delete mode 100644 boards/boards_legacy/arm/stm32h747i_disco/Kconfig.board rename boards/shields/st_b_lcd40_dsi1_mb1166/boards/{stm32h747i_disco_m7.conf => stm32h747i_disco_stm32h747xx_m7.conf} (100%) rename boards/shields/st_b_lcd40_dsi1_mb1166/boards/{stm32h747i_disco_m7.overlay => stm32h747i_disco_stm32h747xx_m7.overlay} (100%) rename boards/{boards_legacy/arm => st}/stm32h747i_disco/CMakeLists.txt (100%) rename boards/{boards_legacy/arm => st}/stm32h747i_disco/Kconfig.defconfig (51%) create mode 100644 boards/st/stm32h747i_disco/Kconfig.stm32h747i_disco rename boards/{boards_legacy/arm => st}/stm32h747i_disco/arduino_r3_connector.dtsi (100%) rename boards/{boards_legacy/arm => st}/stm32h747i_disco/board.cmake (87%) create mode 100644 boards/st/stm32h747i_disco/board.yml rename boards/{boards_legacy/arm => st}/stm32h747i_disco/dc_ram.ld (100%) rename boards/{boards_legacy/arm => st}/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_1.jpg (100%) rename boards/{boards_legacy/arm => st}/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_2.jpg (100%) rename boards/{boards_legacy/arm => st}/stm32h747i_disco/doc/img/stm32h747i_disco.jpg (100%) rename boards/{boards_legacy/arm => st}/stm32h747i_disco/doc/index.rst (95%) rename boards/{boards_legacy/arm => st}/stm32h747i_disco/pmod_connector.dtsi (100%) rename boards/{boards_legacy/arm => st}/stm32h747i_disco/stm32h747i_disco.dtsi (100%) rename boards/{boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m4.dts => st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m4.dts} (100%) rename boards/{boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m4.yaml => st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m4.yaml} (83%) rename boards/{boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m4_defconfig => st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m4_defconfig} (69%) rename boards/{boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m7.dts => st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7.dts} (100%) rename boards/{boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m7.yaml => st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7.yaml} (85%) rename boards/{boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m7_defconfig => st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7_defconfig} (73%) rename boards/{boards_legacy/arm => st}/stm32h747i_disco/support/openocd_stm32h747i_disco_m4.cfg (100%) rename boards/{boards_legacy/arm => st}/stm32h747i_disco/support/openocd_stm32h747i_disco_m7.cfg (100%) diff --git a/boards/boards_legacy/arm/stm32h747i_disco/Kconfig.board b/boards/boards_legacy/arm/stm32h747i_disco/Kconfig.board deleted file mode 100644 index 819e6f08a60..00000000000 --- a/boards/boards_legacy/arm/stm32h747i_disco/Kconfig.board +++ /dev/null @@ -1,14 +0,0 @@ -# STM32H747I Discovery board configuration - -# Copyright (c) 2019 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32H747I_DISCO_M7 - bool "STM32H747I Discovery Development Board" - depends on SOC_STM32H747XX - select CPU_CORTEX_M7 - -config BOARD_STM32H747I_DISCO_M4 - bool "STM32H747I Discovery Development Board" - depends on SOC_STM32H747XX - select CPU_CORTEX_M4 diff --git a/boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h747i_disco_m7.conf b/boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h747i_disco_stm32h747xx_m7.conf similarity index 100% rename from boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h747i_disco_m7.conf rename to boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h747i_disco_stm32h747xx_m7.conf diff --git a/boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h747i_disco_m7.overlay b/boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h747i_disco_stm32h747xx_m7.overlay similarity index 100% rename from boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h747i_disco_m7.overlay rename to boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h747i_disco_stm32h747xx_m7.overlay diff --git a/boards/boards_legacy/arm/stm32h747i_disco/CMakeLists.txt b/boards/st/stm32h747i_disco/CMakeLists.txt similarity index 100% rename from boards/boards_legacy/arm/stm32h747i_disco/CMakeLists.txt rename to boards/st/stm32h747i_disco/CMakeLists.txt diff --git a/boards/boards_legacy/arm/stm32h747i_disco/Kconfig.defconfig b/boards/st/stm32h747i_disco/Kconfig.defconfig similarity index 51% rename from boards/boards_legacy/arm/stm32h747i_disco/Kconfig.defconfig rename to boards/st/stm32h747i_disco/Kconfig.defconfig index b9c3ba7161a..68e0fc0b4a0 100644 --- a/boards/boards_legacy/arm/stm32h747i_disco/Kconfig.defconfig +++ b/boards/st/stm32h747i_disco/Kconfig.defconfig @@ -3,11 +3,7 @@ # Copyright (c) 2019 Linaro Limited # SPDX-License-Identifier: Apache-2.0 -if BOARD_STM32H747I_DISCO_M7 || BOARD_STM32H747I_DISCO_M4 - -config BOARD - default "stm32h747i_disco_m7" if BOARD_STM32H747I_DISCO_M7 - default "stm32h747i_disco_m4" if BOARD_STM32H747I_DISCO_M4 +if BOARD_STM32H747I_DISCO if NETWORKING @@ -19,4 +15,4 @@ endif # NETWORKING config DISK_DRIVER_SDMMC default y if DISK_DRIVERS -endif # BOARD_STM32H747I_DISCO_M7 +endif # BOARD_STM32H747I_DISCO diff --git a/boards/st/stm32h747i_disco/Kconfig.stm32h747i_disco b/boards/st/stm32h747i_disco/Kconfig.stm32h747i_disco new file mode 100644 index 00000000000..8c6309f909a --- /dev/null +++ b/boards/st/stm32h747i_disco/Kconfig.stm32h747i_disco @@ -0,0 +1,8 @@ +# STM32H747I DISCOVERY board configuration + +# Copyright (c) 2019 Linaro Limited +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32H747I_DISCO + select SOC_STM32H747XX_M7 if BOARD_STM32H747I_DISCO_STM32H747XX_M7 + select SOC_STM32H747XX_M4 if BOARD_STM32H747I_DISCO_STM32H747XX_M4 diff --git a/boards/boards_legacy/arm/stm32h747i_disco/arduino_r3_connector.dtsi b/boards/st/stm32h747i_disco/arduino_r3_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/stm32h747i_disco/arduino_r3_connector.dtsi rename to boards/st/stm32h747i_disco/arduino_r3_connector.dtsi diff --git a/boards/boards_legacy/arm/stm32h747i_disco/board.cmake b/boards/st/stm32h747i_disco/board.cmake similarity index 87% rename from boards/boards_legacy/arm/stm32h747i_disco/board.cmake rename to boards/st/stm32h747i_disco/board.cmake index 00da755afb0..2b031547819 100644 --- a/boards/boards_legacy/arm/stm32h747i_disco/board.cmake +++ b/boards/st/stm32h747i_disco/board.cmake @@ -1,10 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 -if(CONFIG_BOARD_STM32H747I_DISCO_M7) +if(CONFIG_BOARD_STM32H747I_DISCO_STM32H747XX_M7) board_runner_args(jlink "--device=STM32H747ZI_M7") board_runner_args(openocd "--config=${BOARD_DIR}/support/openocd_stm32h747i_disco_m7.cfg") board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) -elseif(CONFIG_BOARD_STM32H747I_DISCO_M4) +elseif(CONFIG_BOARD_STM32H747I_DISCO_STM32H747XX_M4) board_runner_args(jlink "--device=STM32H747ZI_M4") board_runner_args(openocd "--config=${BOARD_DIR}/support/openocd_stm32h747i_disco_m4.cfg") board_runner_args(openocd --target-handle=_CHIPNAME.cpu1) diff --git a/boards/st/stm32h747i_disco/board.yml b/boards/st/stm32h747i_disco/board.yml new file mode 100644 index 00000000000..431d3e4f486 --- /dev/null +++ b/boards/st/stm32h747i_disco/board.yml @@ -0,0 +1,5 @@ +board: + name: stm32h747i_disco + vendor: st + socs: + - name: stm32h747xx diff --git a/boards/boards_legacy/arm/stm32h747i_disco/dc_ram.ld b/boards/st/stm32h747i_disco/dc_ram.ld similarity index 100% rename from boards/boards_legacy/arm/stm32h747i_disco/dc_ram.ld rename to boards/st/stm32h747i_disco/dc_ram.ld diff --git a/boards/boards_legacy/arm/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_1.jpg b/boards/st/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_1.jpg similarity index 100% rename from boards/boards_legacy/arm/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_1.jpg rename to boards/st/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_1.jpg diff --git a/boards/boards_legacy/arm/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_2.jpg b/boards/st/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_2.jpg similarity index 100% rename from boards/boards_legacy/arm/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_2.jpg rename to boards/st/stm32h747i_disco/doc/img/disco_h747i_ethernet_modification_2.jpg diff --git a/boards/boards_legacy/arm/stm32h747i_disco/doc/img/stm32h747i_disco.jpg b/boards/st/stm32h747i_disco/doc/img/stm32h747i_disco.jpg similarity index 100% rename from boards/boards_legacy/arm/stm32h747i_disco/doc/img/stm32h747i_disco.jpg rename to boards/st/stm32h747i_disco/doc/img/stm32h747i_disco.jpg diff --git a/boards/boards_legacy/arm/stm32h747i_disco/doc/index.rst b/boards/st/stm32h747i_disco/doc/index.rst similarity index 95% rename from boards/boards_legacy/arm/stm32h747i_disco/doc/index.rst rename to boards/st/stm32h747i_disco/doc/index.rst index fa668e964c7..1f6846d6815 100644 --- a/boards/boards_legacy/arm/stm32h747i_disco/doc/index.rst +++ b/boards/st/stm32h747i_disco/doc/index.rst @@ -90,8 +90,8 @@ The current Zephyr stm32h747i_disco board configuration supports the following h Other hardware features are not yet supported on Zephyr porting. The default configuration per core can be found in the defconfig files: -``boards/arm/stm32h747i_disco/stm32h747i_disco_defconfig_m7`` and -``boards/arm/stm32h747i_disco/stm32h747i_disco_defconfig_m4`` +:zephyr_file:`boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7_defconfig` and +:zephyr_file:`boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m4_defconfig` Pin Mapping =========== @@ -168,7 +168,7 @@ command, for example: .. zephyr-app-commands:: :zephyr-app: samples/drivers/display - :board: stm32h747i_disco_m7 + :board: stm32h747i_disco/stm32h747xx/m7 :shield: st_b_lcd40_dsi1_mb1166 :goals: build flash @@ -195,7 +195,7 @@ Programming and Debugging ************************* Applications for the ``stm32h747i_disco`` board should be built per core target, -using either ``stm32h747i_disco_m7`` or ```stm32h747i_disco_m4`` as the target. +using either ``stm32h747i_disco/stm32h747xx/m7`` or ```stm32h747i_disco/stm32h747xx/m4`` as the target. See :ref:`build_an_application` for more information about application builds. .. note:: @@ -214,7 +214,8 @@ Flashing Flashing operation will depend on the target to be flashed and the SoC option bytes configuration. It is advised to use `STM32CubeProgrammer`_ to check and update option bytes -configuration and flash ``stm32h747i_disco_m7`` and ``stm32h747i_disco_m4`` targets. +configuration and flash ``stm32h747i_disco/stm32h747xx/m7`` and +``stm32h747i_disco/stm32h747xx/m7`` targets. By default: @@ -247,7 +248,7 @@ Here is an example for the :ref:`hello_world` application. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: stm32h747i_disco_m7 + :board: stm32h747i_disco/stm32h747xx/m7 :goals: build flash Run a serial host program to connect with your board: @@ -260,7 +261,7 @@ You should see the following message on the console: .. code-block:: console - Hello World! stm32h747i_disco_m7 + Hello World! stm32h747i_disco .. note:: Sometimes, flashing is not working. It is necessary to erase the flash @@ -273,7 +274,7 @@ Here is an example for the :zephyr:code-sample:`blinky` application on M4 core. .. zephyr-app-commands:: :zephyr-app: samples/basic/blinky - :board: stm32h747i_disco_m4 + :board: stm32h747i_disco/stm32h747xx/m7 :goals: build flash Debugging @@ -284,7 +285,7 @@ You can debug an application in the usual way. Here is an example for the .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: stm32h747i_disco_m7 + :board: stm32h747i_disco/stm32h747xx/m7 :goals: debug Debugging with west is currently not available on Cortex M4 side. diff --git a/boards/boards_legacy/arm/stm32h747i_disco/pmod_connector.dtsi b/boards/st/stm32h747i_disco/pmod_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/stm32h747i_disco/pmod_connector.dtsi rename to boards/st/stm32h747i_disco/pmod_connector.dtsi diff --git a/boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco.dtsi b/boards/st/stm32h747i_disco/stm32h747i_disco.dtsi similarity index 100% rename from boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco.dtsi rename to boards/st/stm32h747i_disco/stm32h747i_disco.dtsi diff --git a/boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m4.dts b/boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m4.dts similarity index 100% rename from boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m4.dts rename to boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m4.dts diff --git a/boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m4.yaml b/boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m4.yaml similarity index 83% rename from boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m4.yaml rename to boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m4.yaml index e167c87f64d..2a544e16701 100644 --- a/boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m4.yaml +++ b/boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m4.yaml @@ -1,4 +1,4 @@ -identifier: stm32h747i_disco_m4 +identifier: stm32h747i_disco/stm32h747xx/m4 name: ST STM32H747I Discovery (M4) type: mcu arch: arm diff --git a/boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m4_defconfig b/boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m4_defconfig similarity index 69% rename from boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m4_defconfig rename to boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m4_defconfig index 2f437301c85..95253e8627c 100644 --- a/boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m4_defconfig +++ b/boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m4_defconfig @@ -1,11 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H747XX=y - -# Board config should be specified since there are 2 possible targets -CONFIG_BOARD_STM32H747I_DISCO_M4=y - # enable GPIO CONFIG_GPIO=y diff --git a/boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m7.dts b/boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7.dts similarity index 100% rename from boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m7.dts rename to boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7.dts diff --git a/boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m7.yaml b/boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7.yaml similarity index 85% rename from boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m7.yaml rename to boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7.yaml index 52e516cda95..e4b7d1b3334 100644 --- a/boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m7.yaml +++ b/boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7.yaml @@ -1,4 +1,4 @@ -identifier: stm32h747i_disco_m7 +identifier: stm32h747i_disco/stm32h747xx/m7 name: ST STM32H747I Discovery (M7) type: mcu arch: arm diff --git a/boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m7_defconfig b/boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7_defconfig similarity index 73% rename from boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m7_defconfig rename to boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7_defconfig index c288ddfc5e4..afa2758e65d 100644 --- a/boards/boards_legacy/arm/stm32h747i_disco/stm32h747i_disco_m7_defconfig +++ b/boards/st/stm32h747i_disco/stm32h747i_disco_stm32h747xx_m7_defconfig @@ -1,11 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H747XX=y - -# Board config should be specified since there are 2 possible targets -CONFIG_BOARD_STM32H747I_DISCO_M7=y - # Enable the internal SMPS regulator CONFIG_POWER_SUPPLY_DIRECT_SMPS=y diff --git a/boards/boards_legacy/arm/stm32h747i_disco/support/openocd_stm32h747i_disco_m4.cfg b/boards/st/stm32h747i_disco/support/openocd_stm32h747i_disco_m4.cfg similarity index 100% rename from boards/boards_legacy/arm/stm32h747i_disco/support/openocd_stm32h747i_disco_m4.cfg rename to boards/st/stm32h747i_disco/support/openocd_stm32h747i_disco_m4.cfg diff --git a/boards/boards_legacy/arm/stm32h747i_disco/support/openocd_stm32h747i_disco_m7.cfg b/boards/st/stm32h747i_disco/support/openocd_stm32h747i_disco_m7.cfg similarity index 100% rename from boards/boards_legacy/arm/stm32h747i_disco/support/openocd_stm32h747i_disco_m7.cfg rename to boards/st/stm32h747i_disco/support/openocd_stm32h747i_disco_m7.cfg From fad7e2eb415d0a84ef6d0a3325daf89b95603b71 Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 5 Feb 2024 17:55:33 +0100 Subject: [PATCH 13/15] boards: Convert stm32h750b_dk to HWM v2 Port the board to HWMv2. Signed-off-by: Erwan Gouriou --- .../arm/stm32h750b_dk/Kconfig.defconfig | 11 ----------- .../stm32h750b_dk/Kconfig.stm32h750b_dk} | 5 +---- .../stm32h750b_dk/arduino_r3_connector.dtsi | 0 .../arm => st}/stm32h750b_dk/board.cmake | 0 boards/st/stm32h750b_dk/board.yml | 5 +++++ .../stm32h750b_dk/doc/img/stm32h750b_dk.png | Bin .../arm => st}/stm32h750b_dk/doc/index.rst | 4 ++-- .../arm => st}/stm32h750b_dk/stm32h750b_dk.dts | 0 .../arm => st}/stm32h750b_dk/stm32h750b_dk.yaml | 0 .../stm32h750b_dk/stm32h750b_dk_defconfig | 3 --- .../arm => st}/stm32h750b_dk/support/openocd.cfg | 0 11 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 boards/boards_legacy/arm/stm32h750b_dk/Kconfig.defconfig rename boards/{boards_legacy/arm/stm32h750b_dk/Kconfig.board => st/stm32h750b_dk/Kconfig.stm32h750b_dk} (50%) rename boards/{boards_legacy/arm => st}/stm32h750b_dk/arduino_r3_connector.dtsi (100%) rename boards/{boards_legacy/arm => st}/stm32h750b_dk/board.cmake (100%) create mode 100644 boards/st/stm32h750b_dk/board.yml rename boards/{boards_legacy/arm => st}/stm32h750b_dk/doc/img/stm32h750b_dk.png (100%) rename boards/{boards_legacy/arm => st}/stm32h750b_dk/doc/index.rst (97%) rename boards/{boards_legacy/arm => st}/stm32h750b_dk/stm32h750b_dk.dts (100%) rename boards/{boards_legacy/arm => st}/stm32h750b_dk/stm32h750b_dk.yaml (100%) rename boards/{boards_legacy/arm => st}/stm32h750b_dk/stm32h750b_dk_defconfig (88%) rename boards/{boards_legacy/arm => st}/stm32h750b_dk/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/stm32h750b_dk/Kconfig.defconfig b/boards/boards_legacy/arm/stm32h750b_dk/Kconfig.defconfig deleted file mode 100644 index 48576f5706d..00000000000 --- a/boards/boards_legacy/arm/stm32h750b_dk/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# STM32H750B DK board configuration - -# Copyright (c) 2023 STMicroelectronics -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_STM32H750B_DK - -config BOARD - default "stm32h750b_dk" - -endif # BOARD_STM32H750B_DK diff --git a/boards/boards_legacy/arm/stm32h750b_dk/Kconfig.board b/boards/st/stm32h750b_dk/Kconfig.stm32h750b_dk similarity index 50% rename from boards/boards_legacy/arm/stm32h750b_dk/Kconfig.board rename to boards/st/stm32h750b_dk/Kconfig.stm32h750b_dk index afa01489528..b141d9d1b9d 100644 --- a/boards/boards_legacy/arm/stm32h750b_dk/Kconfig.board +++ b/boards/st/stm32h750b_dk/Kconfig.stm32h750b_dk @@ -1,8 +1,5 @@ -# STM32H735G Discovery board configuration - # Copyright (c) 2023 STMicroelectronics # SPDX-License-Identifier: Apache-2.0 config BOARD_STM32H750B_DK - bool "STM32H750B Discovery Kit" - depends on SOC_STM32H750XX + select SOC_STM32H750XX diff --git a/boards/boards_legacy/arm/stm32h750b_dk/arduino_r3_connector.dtsi b/boards/st/stm32h750b_dk/arduino_r3_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/stm32h750b_dk/arduino_r3_connector.dtsi rename to boards/st/stm32h750b_dk/arduino_r3_connector.dtsi diff --git a/boards/boards_legacy/arm/stm32h750b_dk/board.cmake b/boards/st/stm32h750b_dk/board.cmake similarity index 100% rename from boards/boards_legacy/arm/stm32h750b_dk/board.cmake rename to boards/st/stm32h750b_dk/board.cmake diff --git a/boards/st/stm32h750b_dk/board.yml b/boards/st/stm32h750b_dk/board.yml new file mode 100644 index 00000000000..95275ee2e42 --- /dev/null +++ b/boards/st/stm32h750b_dk/board.yml @@ -0,0 +1,5 @@ +board: + name: stm32h750b_dk + vendor: st + socs: + - name: stm32h750xx diff --git a/boards/boards_legacy/arm/stm32h750b_dk/doc/img/stm32h750b_dk.png b/boards/st/stm32h750b_dk/doc/img/stm32h750b_dk.png similarity index 100% rename from boards/boards_legacy/arm/stm32h750b_dk/doc/img/stm32h750b_dk.png rename to boards/st/stm32h750b_dk/doc/img/stm32h750b_dk.png diff --git a/boards/boards_legacy/arm/stm32h750b_dk/doc/index.rst b/boards/st/stm32h750b_dk/doc/index.rst similarity index 97% rename from boards/boards_legacy/arm/stm32h750b_dk/doc/index.rst rename to boards/st/stm32h750b_dk/doc/index.rst index 6ac1aa15d34..f295947a334 100644 --- a/boards/boards_legacy/arm/stm32h750b_dk/doc/index.rst +++ b/boards/st/stm32h750b_dk/doc/index.rst @@ -59,8 +59,8 @@ The current Zephyr stm32h750b_dk board configuration supports the following hard Other hardware features are not yet supported on Zephyr porting. -The default configuration per core can be found in the defconfig file: -``boards/arm/stm32h750b_dk/stm32h750b_dk_defconfig`` +The default configuration can be found in the defconfig file: +:zephyr_file:`boards/st/stm32h750b_dk/stm32h750b_dk_defconfig` Pin Mapping =========== diff --git a/boards/boards_legacy/arm/stm32h750b_dk/stm32h750b_dk.dts b/boards/st/stm32h750b_dk/stm32h750b_dk.dts similarity index 100% rename from boards/boards_legacy/arm/stm32h750b_dk/stm32h750b_dk.dts rename to boards/st/stm32h750b_dk/stm32h750b_dk.dts diff --git a/boards/boards_legacy/arm/stm32h750b_dk/stm32h750b_dk.yaml b/boards/st/stm32h750b_dk/stm32h750b_dk.yaml similarity index 100% rename from boards/boards_legacy/arm/stm32h750b_dk/stm32h750b_dk.yaml rename to boards/st/stm32h750b_dk/stm32h750b_dk.yaml diff --git a/boards/boards_legacy/arm/stm32h750b_dk/stm32h750b_dk_defconfig b/boards/st/stm32h750b_dk/stm32h750b_dk_defconfig similarity index 88% rename from boards/boards_legacy/arm/stm32h750b_dk/stm32h750b_dk_defconfig rename to boards/st/stm32h750b_dk/stm32h750b_dk_defconfig index 64cab9ff714..08add3eb2c6 100644 --- a/boards/boards_legacy/arm/stm32h750b_dk/stm32h750b_dk_defconfig +++ b/boards/st/stm32h750b_dk/stm32h750b_dk_defconfig @@ -1,9 +1,6 @@ # Copyright (c) 2023 STMicroelectronics # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H750XX=y - # Enable the internal SMPS regulator CONFIG_POWER_SUPPLY_LDO=y diff --git a/boards/boards_legacy/arm/stm32h750b_dk/support/openocd.cfg b/boards/st/stm32h750b_dk/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/stm32h750b_dk/support/openocd.cfg rename to boards/st/stm32h750b_dk/support/openocd.cfg From d9808101244f06ac57088d220d672750e0b7165f Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 5 Feb 2024 17:55:39 +0100 Subject: [PATCH 14/15] boards: Convert stm32h7b3i_dk to HWM v2 Port the board to HWMv2. Signed-off-by: Erwan Gouriou --- .../boards_legacy/arm/stm32h7b3i_dk/Kconfig.board | 8 -------- .../arm => st}/stm32h7b3i_dk/Kconfig.defconfig | 3 --- boards/st/stm32h7b3i_dk/Kconfig.stm32h7b3i_dk | 5 +++++ .../stm32h7b3i_dk/arduino_r3_connector.dtsi | 0 .../arm => st}/stm32h7b3i_dk/board.cmake | 0 boards/st/stm32h7b3i_dk/board.yml | 5 +++++ .../stm32h7b3i_dk/doc/img/stm32h7b3i_dk.jpg | Bin .../arm => st}/stm32h7b3i_dk/doc/index.rst | 4 ++-- .../arm => st}/stm32h7b3i_dk/stm32h7b3i_dk.dts | 0 .../arm => st}/stm32h7b3i_dk/stm32h7b3i_dk.yaml | 0 .../stm32h7b3i_dk/stm32h7b3i_dk_defconfig | 3 --- .../arm => st}/stm32h7b3i_dk/support/openocd.cfg | 0 12 files changed, 12 insertions(+), 16 deletions(-) delete mode 100644 boards/boards_legacy/arm/stm32h7b3i_dk/Kconfig.board rename boards/{boards_legacy/arm => st}/stm32h7b3i_dk/Kconfig.defconfig (91%) create mode 100644 boards/st/stm32h7b3i_dk/Kconfig.stm32h7b3i_dk rename boards/{boards_legacy/arm => st}/stm32h7b3i_dk/arduino_r3_connector.dtsi (100%) rename boards/{boards_legacy/arm => st}/stm32h7b3i_dk/board.cmake (100%) create mode 100644 boards/st/stm32h7b3i_dk/board.yml rename boards/{boards_legacy/arm => st}/stm32h7b3i_dk/doc/img/stm32h7b3i_dk.jpg (100%) rename boards/{boards_legacy/arm => st}/stm32h7b3i_dk/doc/index.rst (98%) rename boards/{boards_legacy/arm => st}/stm32h7b3i_dk/stm32h7b3i_dk.dts (100%) rename boards/{boards_legacy/arm => st}/stm32h7b3i_dk/stm32h7b3i_dk.yaml (100%) rename boards/{boards_legacy/arm => st}/stm32h7b3i_dk/stm32h7b3i_dk_defconfig (89%) rename boards/{boards_legacy/arm => st}/stm32h7b3i_dk/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/arm/stm32h7b3i_dk/Kconfig.board b/boards/boards_legacy/arm/stm32h7b3i_dk/Kconfig.board deleted file mode 100644 index c3912d786e0..00000000000 --- a/boards/boards_legacy/arm/stm32h7b3i_dk/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# STM32H7B3I Discovery kit board configuration - -# Copyright (c) 2022 Byte-Lab d.o.o. -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_STM32H7B3I_DK - bool "STM32H7B3I Discovery Kit Development Board" - depends on SOC_STM32H7B3XXQ diff --git a/boards/boards_legacy/arm/stm32h7b3i_dk/Kconfig.defconfig b/boards/st/stm32h7b3i_dk/Kconfig.defconfig similarity index 91% rename from boards/boards_legacy/arm/stm32h7b3i_dk/Kconfig.defconfig rename to boards/st/stm32h7b3i_dk/Kconfig.defconfig index 8a32fb1c68f..39101c47f7b 100644 --- a/boards/boards_legacy/arm/stm32h7b3i_dk/Kconfig.defconfig +++ b/boards/st/stm32h7b3i_dk/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_STM32H7B3I_DK -config BOARD - default "stm32h7b3i_dk" - config INPUT default y if LVGL diff --git a/boards/st/stm32h7b3i_dk/Kconfig.stm32h7b3i_dk b/boards/st/stm32h7b3i_dk/Kconfig.stm32h7b3i_dk new file mode 100644 index 00000000000..c243bf05acd --- /dev/null +++ b/boards/st/stm32h7b3i_dk/Kconfig.stm32h7b3i_dk @@ -0,0 +1,5 @@ +# Copyright (c) 2022 Byte-Lab d.o.o. +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_STM32H7B3I_DK + select SOC_STM32H7B3XXQ diff --git a/boards/boards_legacy/arm/stm32h7b3i_dk/arduino_r3_connector.dtsi b/boards/st/stm32h7b3i_dk/arduino_r3_connector.dtsi similarity index 100% rename from boards/boards_legacy/arm/stm32h7b3i_dk/arduino_r3_connector.dtsi rename to boards/st/stm32h7b3i_dk/arduino_r3_connector.dtsi diff --git a/boards/boards_legacy/arm/stm32h7b3i_dk/board.cmake b/boards/st/stm32h7b3i_dk/board.cmake similarity index 100% rename from boards/boards_legacy/arm/stm32h7b3i_dk/board.cmake rename to boards/st/stm32h7b3i_dk/board.cmake diff --git a/boards/st/stm32h7b3i_dk/board.yml b/boards/st/stm32h7b3i_dk/board.yml new file mode 100644 index 00000000000..5516412eac9 --- /dev/null +++ b/boards/st/stm32h7b3i_dk/board.yml @@ -0,0 +1,5 @@ +board: + name: stm32h7b3i_dk + vendor: st + socs: + - name: stm32h7b3xx diff --git a/boards/boards_legacy/arm/stm32h7b3i_dk/doc/img/stm32h7b3i_dk.jpg b/boards/st/stm32h7b3i_dk/doc/img/stm32h7b3i_dk.jpg similarity index 100% rename from boards/boards_legacy/arm/stm32h7b3i_dk/doc/img/stm32h7b3i_dk.jpg rename to boards/st/stm32h7b3i_dk/doc/img/stm32h7b3i_dk.jpg diff --git a/boards/boards_legacy/arm/stm32h7b3i_dk/doc/index.rst b/boards/st/stm32h7b3i_dk/doc/index.rst similarity index 98% rename from boards/boards_legacy/arm/stm32h7b3i_dk/doc/index.rst rename to boards/st/stm32h7b3i_dk/doc/index.rst index 83d18858426..98f00c34234 100644 --- a/boards/boards_legacy/arm/stm32h7b3i_dk/doc/index.rst +++ b/boards/st/stm32h7b3i_dk/doc/index.rst @@ -68,8 +68,8 @@ The current Zephyr stm32h7b3i_dk board configuration supports the following hard Other hardware features have not been enabled yet for this board. -The default configuration per core can be found in the defconfig file: -``boards/arm/stm32h7b3i_dk/stm32h7b3i_dk_defconfig`` +The default configuration can be found in the defconfig file: +:zephyr_file:`boards/st/stm32h7b3i_dk/stm32h7b3i_dk_defconfig` Pin Mapping =========== diff --git a/boards/boards_legacy/arm/stm32h7b3i_dk/stm32h7b3i_dk.dts b/boards/st/stm32h7b3i_dk/stm32h7b3i_dk.dts similarity index 100% rename from boards/boards_legacy/arm/stm32h7b3i_dk/stm32h7b3i_dk.dts rename to boards/st/stm32h7b3i_dk/stm32h7b3i_dk.dts diff --git a/boards/boards_legacy/arm/stm32h7b3i_dk/stm32h7b3i_dk.yaml b/boards/st/stm32h7b3i_dk/stm32h7b3i_dk.yaml similarity index 100% rename from boards/boards_legacy/arm/stm32h7b3i_dk/stm32h7b3i_dk.yaml rename to boards/st/stm32h7b3i_dk/stm32h7b3i_dk.yaml diff --git a/boards/boards_legacy/arm/stm32h7b3i_dk/stm32h7b3i_dk_defconfig b/boards/st/stm32h7b3i_dk/stm32h7b3i_dk_defconfig similarity index 89% rename from boards/boards_legacy/arm/stm32h7b3i_dk/stm32h7b3i_dk_defconfig rename to boards/st/stm32h7b3i_dk/stm32h7b3i_dk_defconfig index 913a1ed5dbd..bb3b8c0178c 100644 --- a/boards/boards_legacy/arm/stm32h7b3i_dk/stm32h7b3i_dk_defconfig +++ b/boards/st/stm32h7b3i_dk/stm32h7b3i_dk_defconfig @@ -2,9 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 # Set SoC present on the board -CONFIG_SOC_SERIES_STM32H7X=y -CONFIG_SOC_STM32H7B3XXQ=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/stm32h7b3i_dk/support/openocd.cfg b/boards/st/stm32h7b3i_dk/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/stm32h7b3i_dk/support/openocd.cfg rename to boards/st/stm32h7b3i_dk/support/openocd.cfg From c1aa335038615df6d15366e63cc8130087c71942 Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Tue, 6 Feb 2024 17:25:35 +0100 Subject: [PATCH 15/15] soc: stm32h7: Couple of tests fixes following migration This should cover all issues. Signed-off-by: Erwan Gouriou --- .../st_b_lcd40_dsi1_mb1166/doc/index.rst | 2 +- samples/boards/stm32/h7_dual_core/README.rst | 8 +++---- ...> stm32h747i_disco_stm32h747xx_m4.overlay} | 0 ...> stm32h747i_disco_stm32h747xx_m7.overlay} | 0 samples/drivers/display/sample.yaml | 2 +- samples/drivers/flash_shell/sample.yaml | 8 +++---- samples/modules/canopennode/sample.yaml | 2 +- samples/modules/lvgl/demos/sample.yaml | 2 +- samples/net/gptp/sample.yaml | 2 +- samples/subsys/display/lvgl/sample.yaml | 2 +- ...f => stm32h747i_disco_stm32h747xx_m7.conf} | 0 ...> stm32h747i_disco_stm32h747xx_m7.overlay} | 0 samples/subsys/fs/fs_sample/sample.yaml | 4 +--- samples/subsys/fs/littlefs/sample.yaml | 3 +-- .../fs_mgmt_hash_supported/testcase.yaml | 24 +++++++++---------- 15 files changed, 28 insertions(+), 31 deletions(-) rename samples/boards/stm32/h7_dual_core/boards/{stm32h747i_disco_m4.overlay => stm32h747i_disco_stm32h747xx_m4.overlay} (100%) rename samples/boards/stm32/h7_dual_core/boards/{stm32h747i_disco_m7.overlay => stm32h747i_disco_stm32h747xx_m7.overlay} (100%) rename samples/subsys/fs/fs_sample/boards/{stm32h747i_disco_m7.conf => stm32h747i_disco_stm32h747xx_m7.conf} (100%) rename samples/subsys/fs/fs_sample/boards/{stm32h747i_disco_m7.overlay => stm32h747i_disco_stm32h747xx_m7.overlay} (100%) diff --git a/boards/shields/st_b_lcd40_dsi1_mb1166/doc/index.rst b/boards/shields/st_b_lcd40_dsi1_mb1166/doc/index.rst index 815b65f5750..4e71b025ee3 100644 --- a/boards/shields/st_b_lcd40_dsi1_mb1166/doc/index.rst +++ b/boards/shields/st_b_lcd40_dsi1_mb1166/doc/index.rst @@ -107,7 +107,7 @@ Set ``-DSHIELD="st_b_lcd40_dsi1_mb1166"`` when you invoke ``west build``. For ex .. zephyr-app-commands:: :zephyr-app: samples/drivers/display - :board: stm32h747i_disco_m7 + :board: stm32h747i_disco/stm32h747xx/m7 :shield: st_b_lcd40_dsi1_mb1166 :goals: build diff --git a/samples/boards/stm32/h7_dual_core/README.rst b/samples/boards/stm32/h7_dual_core/README.rst index 2fb5aa63f4f..eba0db90dfb 100644 --- a/samples/boards/stm32/h7_dual_core/README.rst +++ b/samples/boards/stm32/h7_dual_core/README.rst @@ -10,18 +10,18 @@ Blinky led triggered by mailbox new message. Building and Running ******************** -Build for stm32h747i_disco_m7: +Build for stm32h747i_disco/stm32h747xx/m7: .. zephyr-app-commands:: :zephyr-app: samples/boards/stm32/h7_dual_core - :board: stm32h747i_disco_m7 + :board: stm32h747i_disco/stm32h747xx/m7 :goals: build -Build for stm32h747i_disco_m4: +Build for stm32h747i_disco/stm32h747xx/m4: .. zephyr-app-commands:: :zephyr-app: samples/boards/stm32/h7_dual_core - :board: stm32h747i_disco_m4 + :board: stm32h747i_disco/stm32h747xx/m4 :goals: build Sample Output diff --git a/samples/boards/stm32/h7_dual_core/boards/stm32h747i_disco_m4.overlay b/samples/boards/stm32/h7_dual_core/boards/stm32h747i_disco_stm32h747xx_m4.overlay similarity index 100% rename from samples/boards/stm32/h7_dual_core/boards/stm32h747i_disco_m4.overlay rename to samples/boards/stm32/h7_dual_core/boards/stm32h747i_disco_stm32h747xx_m4.overlay diff --git a/samples/boards/stm32/h7_dual_core/boards/stm32h747i_disco_m7.overlay b/samples/boards/stm32/h7_dual_core/boards/stm32h747i_disco_stm32h747xx_m7.overlay similarity index 100% rename from samples/boards/stm32/h7_dual_core/boards/stm32h747i_disco_m7.overlay rename to samples/boards/stm32/h7_dual_core/boards/stm32h747i_disco_stm32h747xx_m7.overlay diff --git a/samples/drivers/display/sample.yaml b/samples/drivers/display/sample.yaml index 285c3b95152..4d00dee05df 100644 --- a/samples/drivers/display/sample.yaml +++ b/samples/drivers/display/sample.yaml @@ -127,7 +127,7 @@ tests: harness_config: fixture: fixture_display sample.display.st_b_lcd40_dsi1_mb1166: - platform_allow: stm32h747i_disco_m7 + platform_allow: stm32h747i_disco/stm32h747xx/m7 extra_args: SHIELD=st_b_lcd40_dsi1_mb1166 tags: - display diff --git a/samples/drivers/flash_shell/sample.yaml b/samples/drivers/flash_shell/sample.yaml index 2734a63c7de..cd19cdad656 100644 --- a/samples/drivers/flash_shell/sample.yaml +++ b/samples/drivers/flash_shell/sample.yaml @@ -8,11 +8,11 @@ tests: - shell filter: CONFIG_FLASH_HAS_DRIVER_ENABLED platform_exclude: - - nucleo_h745zi_q_m4 - - stm32h747i_disco_m4 + - nucleo_h745zi_q/stm32h745xx/m4 + - stm32h747i_disco/stm32h747xx/m4 - gd32f350r_eval - - arduino_portenta_h7_m4 - - arduino_giga_r1_m4 + - arduino_portenta_h7/stm32h747xx/m4 + - arduino_giga_r1/stm32h747xx/m4 harness: keyboard min_ram: 12 integration_platforms: diff --git a/samples/modules/canopennode/sample.yaml b/samples/modules/canopennode/sample.yaml index 279fdf46c28..7cc95c0ed17 100644 --- a/samples/modules/canopennode/sample.yaml +++ b/samples/modules/canopennode/sample.yaml @@ -20,7 +20,7 @@ tests: platform_exclude: - nucleo_h723zg - nucleo_h743zi - - nucleo_h745zi_q + - nucleo_h745zi_q/stm32h745xx/m7 - nucleo_h753zi sample.modules.canopennode.program_download: sysbuild: true diff --git a/samples/modules/lvgl/demos/sample.yaml b/samples/modules/lvgl/demos/sample.yaml index bd7461dd46c..4184f7df1af 100644 --- a/samples/modules/lvgl/demos/sample.yaml +++ b/samples/modules/lvgl/demos/sample.yaml @@ -25,7 +25,7 @@ tests: extra_configs: - CONFIG_LV_Z_DEMO_WIDGETS=y sample.modules.lvgl.demos.st_b_lcd40_dsi1_mb1166: - platform_allow: stm32h747i_disco_m7 + platform_allow: stm32h747i_disco/stm32h747xx/m7 extra_args: SHIELD=st_b_lcd40_dsi1_mb1166 harness: console harness_config: diff --git a/samples/net/gptp/sample.yaml b/samples/net/gptp/sample.yaml index e65327ef47a..52b90a7f4e2 100644 --- a/samples/net/gptp/sample.yaml +++ b/samples/net/gptp/sample.yaml @@ -17,7 +17,7 @@ tests: - native_sim_64 - nucleo_f767zi - nucleo_h743zi - - nucleo_h745zi_q_m7 + - nucleo_h745zi_q/stm32h745xx/m7 depends_on: netif integration_platforms: - frdm_k64f diff --git a/samples/subsys/display/lvgl/sample.yaml b/samples/subsys/display/lvgl/sample.yaml index 3c6e56cdfe1..4fe2f4ac312 100644 --- a/samples/subsys/display/lvgl/sample.yaml +++ b/samples/subsys/display/lvgl/sample.yaml @@ -41,7 +41,7 @@ tests: integration_platforms: - mimxrt1170_evk_cm7 sample.subsys.display.lvgl.st_b_lcd40_dsi1_mb1166: - platform_allow: stm32h747i_disco_m7 + platform_allow: stm32h747i_disco/stm32h747xx/m7 extra_args: SHIELD=st_b_lcd40_dsi1_mb1166 harness: console harness_config: diff --git a/samples/subsys/fs/fs_sample/boards/stm32h747i_disco_m7.conf b/samples/subsys/fs/fs_sample/boards/stm32h747i_disco_stm32h747xx_m7.conf similarity index 100% rename from samples/subsys/fs/fs_sample/boards/stm32h747i_disco_m7.conf rename to samples/subsys/fs/fs_sample/boards/stm32h747i_disco_stm32h747xx_m7.conf diff --git a/samples/subsys/fs/fs_sample/boards/stm32h747i_disco_m7.overlay b/samples/subsys/fs/fs_sample/boards/stm32h747i_disco_stm32h747xx_m7.overlay similarity index 100% rename from samples/subsys/fs/fs_sample/boards/stm32h747i_disco_m7.overlay rename to samples/subsys/fs/fs_sample/boards/stm32h747i_disco_stm32h747xx_m7.overlay diff --git a/samples/subsys/fs/fs_sample/sample.yaml b/samples/subsys/fs/fs_sample/sample.yaml index cda7ed025c7..22d47ca3b26 100644 --- a/samples/subsys/fs/fs_sample/sample.yaml +++ b/samples/subsys/fs/fs_sample/sample.yaml @@ -49,6 +49,4 @@ tests: platform_allow: hifive_unmatched bl5340_dvk/nrf5340/cpuapp sample.filesystem.fat_fs.stm32h747i_disco_m7_sdmmc: build_only: true - platform_allow: stm32h747i_disco_m7 - extra_args: - - OVERLAY_CONFIG=boards/stm32h747i_disco_m7.conf + platform_allow: stm32h747i_disco/stm32h747xx/m7 diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml index 1d3899b314f..3150fa5ee65 100644 --- a/samples/subsys/fs/littlefs/sample.yaml +++ b/samples/subsys/fs/littlefs/sample.yaml @@ -36,7 +36,6 @@ tests: - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_qspi.overlay sample.filesystem.littlefs.stm32h747i_disco_m7_sdmmc: build_only: true - platform_allow: stm32h747i_disco_m7 + platform_allow: stm32h747i_disco/stm32h747xx/m7 extra_args: - - OVERLAY_CONFIG=boards/stm32h747i_disco_m7.conf - CONF_FILE=prj_blk.conf diff --git a/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml b/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml index 5d8994f8541..4f07ecf0211 100644 --- a/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml +++ b/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml @@ -15,26 +15,26 @@ tests: extra_args: > OVERLAY_CONFIG="configuration/crc32.conf" platform_exclude: - - arduino_giga_r1_m4 - - arduino_portenta_h7_m4 + - arduino_giga_r1/stm32h747xx/m4 + - arduino_portenta_h7/stm32h747xx/m4 - lpcxpresso51u68 - - nucleo_h745zi_q_m4 - - stm32h747i_disco_m4 + - nucleo_h745zi_q/stm32h745xx/m4 + - stm32h747i_disco/stm32h747xx/m4 mgmt.mcumgr.fs.mgmt.hash.supported.sha256: extra_args: > OVERLAY_CONFIG="configuration/sha256.conf" platform_exclude: - - arduino_giga_r1_m4 - - arduino_portenta_h7_m4 + - arduino_giga_r1/stm32h747xx/m4 + - arduino_portenta_h7/stm32h747xx/m4 - lpcxpresso51u68 - - nucleo_h745zi_q_m4 - - stm32h747i_disco_m4 + - nucleo_h745zi_q/stm32h745xx/m4 + - stm32h747i_disco/stm32h747xx/m4 mgmt.mcumgr.fs.mgmt.hash.supported.all: extra_args: > OVERLAY_CONFIG="configuration/all.conf" platform_exclude: - - arduino_giga_r1_m4 - - arduino_portenta_h7_m4 + - arduino_giga_r1/stm32h747xx/m4 + - arduino_portenta_h7/stm32h747xx/m4 - lpcxpresso51u68 - - nucleo_h745zi_q_m4 - - stm32h747i_disco_m4 + - nucleo_h745zi_q/stm32h745xx/m4 + - stm32h747i_disco/stm32h747xx/m4