This is an automated email from the ASF dual-hosted git repository. acassis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit d195260894ced73c2e985e92b8713dfda60a1a83 Author: Sergey Rzhevsky <r...@yandex.ru> AuthorDate: Sun Sep 21 18:14:51 2025 +0300 arch/arm/stm32h7: add support for STM32H750xx chips Add STM32H7_STM32H7X0XX chip family. Add new chip configurations for STM32H750 variants in Kconfig, update hardware includes to support CONFIG_STM32H7_STM32H7X0XX, and modify board configurations for stm32h750b-dk to use STM32H750XB. This enables support for the new STM32H750 chip series with appropriate memory and peripheral mappings. Normalize the defconfig files for boards from stm32f7 chip family. Signed-off-by: Sergey Rzhevsky <r...@yandex.ru> --- arch/arm/include/stm32h7/chip.h | 7 ++- arch/arm/include/stm32h7/irq.h | 4 +- arch/arm/src/stm32h7/Kconfig | 55 +++++++++++++++++++--- arch/arm/src/stm32h7/hardware/stm32_dmamux.h | 4 +- arch/arm/src/stm32h7/hardware/stm32_ethernet.h | 3 +- arch/arm/src/stm32h7/hardware/stm32_exti.h | 3 +- arch/arm/src/stm32h7/hardware/stm32_flash.h | 4 +- arch/arm/src/stm32h7/hardware/stm32_gpio.h | 4 +- arch/arm/src/stm32h7/hardware/stm32_i2c.h | 4 +- arch/arm/src/stm32h7/hardware/stm32_memorymap.h | 4 +- arch/arm/src/stm32h7/hardware/stm32_pinmap.h | 8 +++- arch/arm/src/stm32h7/hardware/stm32_pwr.h | 4 +- arch/arm/src/stm32h7/hardware/stm32_rcc.h | 4 +- arch/arm/src/stm32h7/hardware/stm32_sdmmc.h | 4 +- arch/arm/src/stm32h7/hardware/stm32_spi.h | 4 +- arch/arm/src/stm32h7/hardware/stm32_syscfg.h | 4 +- arch/arm/src/stm32h7/hardware/stm32_uart.h | 4 +- arch/arm/src/stm32h7/hardware/stm32h7x3xx_gpio.h | 9 ++-- arch/arm/src/stm32h7/hardware/stm32h7x3xx_pinmap.h | 5 +- .../stm32h7/hardware/stm32h7x3xx_pinmap_legacy.h | 8 +++- arch/arm/src/stm32h7/hardware/stm32h7x3xx_spi.h | 3 +- arch/arm/src/stm32h7/hardware/stm32h7x3xx_uart.h | 3 +- arch/arm/src/stm32h7/stm32_exti_gpio.c | 3 +- arch/arm/src/stm32h7/stm32_flash.c | 6 ++- arch/arm/src/stm32h7/stm32_gpio.c | 9 ++-- arch/arm/src/stm32h7/stm32_rcc.c | 4 +- boards/Kconfig | 13 ++++- .../stm32h7/stm32h750b-dk/configs/lvgl/defconfig | 4 +- 28 files changed, 144 insertions(+), 47 deletions(-) diff --git a/arch/arm/include/stm32h7/chip.h b/arch/arm/include/stm32h7/chip.h index 721ad74a0a0..b5bda7328e5 100644 --- a/arch/arm/include/stm32h7/chip.h +++ b/arch/arm/include/stm32h7/chip.h @@ -76,7 +76,10 @@ defined (CONFIG_ARCH_CHIP_STM32H7B3LI) || \ defined (CONFIG_ARCH_CHIP_STM32H745XI) || \ defined (CONFIG_ARCH_CHIP_STM32H745ZI) || \ - defined (CONFIG_ARCH_CHIP_STM32H750B) || \ + defined (CONFIG_ARCH_CHIP_STM32H750VB) || \ + defined (CONFIG_ARCH_CHIP_STM32H750ZB) || \ + defined (CONFIG_ARCH_CHIP_STM32H750IB) || \ + defined (CONFIG_ARCH_CHIP_STM32H750XB) || \ defined (CONFIG_ARCH_CHIP_STM32H755II) #elif defined(CONFIG_ARCH_CHIP_STM32H747XI) #else @@ -85,7 +88,7 @@ /* Size SRAM */ -#if defined(CONFIG_STM32H7_STM32H7X3XX) || defined(CONFIG_STM32H7_STM32H7X5XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) || defined(CONFIG_STM32H7_STM32H7X3XX) || defined(CONFIG_STM32H7_STM32H7X5XX) /* Memory */ # define STM32H7_SRAM_SIZE (512*1024) /* 512Kb SRAM on AXI bus Matrix (D1) */ diff --git a/arch/arm/include/stm32h7/irq.h b/arch/arm/include/stm32h7/irq.h index a5a13c7b19f..427d6b8c1f2 100644 --- a/arch/arm/include/stm32h7/irq.h +++ b/arch/arm/include/stm32h7/irq.h @@ -69,7 +69,9 @@ * Included Files ****************************************************************************/ -#if defined(CONFIG_STM32H7_STM32H7X3XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) +# include <arch/stm32h7/stm32h7x3xx_irq.h> +#elif defined(CONFIG_STM32H7_STM32H7X3XX) # include <arch/stm32h7/stm32h7x3xx_irq.h> #elif defined(CONFIG_STM32H7_STM32H7B3XX) # include <arch/stm32h7/stm32h7x3xx_irq.h> diff --git a/arch/arm/src/stm32h7/Kconfig b/arch/arm/src/stm32h7/Kconfig index 10fd179f8fc..4701b3ca560 100644 --- a/arch/arm/src/stm32h7/Kconfig +++ b/arch/arm/src/stm32h7/Kconfig @@ -202,15 +202,41 @@ config ARCH_CHIP_STM32H747XI Dual core STM32 H7 Cortex M7+M4, 2048 Kb FLASH, 1024K Kb SRAM TFBGA240 -config ARCH_CHIP_STM32H750B - bool "STM32H750B" - select STM32H7_STM32H7X5XX - select STM32H7_FLASH_CONFIG_I +config ARCH_CHIP_STM32H750VB + bool "STM32H750VB" + select STM32H7_STM32H7X0XX + select STM32H7_FLASH_CONFIG_B + select STM32H7_IO_CONFIG_V + ---help--- + STM32 H7 Cortex M7+M4, 128 Kb FLASH, 1024K Kb SRAM, + LQFP100 + +config ARCH_CHIP_STM32H750ZB + bool "STM32H750ZB" + select STM32H7_STM32H7X0XX + select STM32H7_FLASH_CONFIG_B + select STM32H7_IO_CONFIG_Z + ---help--- + STM32 H7 Cortex M7+M4, 128 Kb FLASH, 1024K Kb SRAM, + LQFP144 + +config ARCH_CHIP_STM32H750IB + bool "STM32H750IB" + select STM32H7_STM32H7X0XX + select STM32H7_FLASH_CONFIG_B + select STM32H7_IO_CONFIG_I + ---help--- + STM32 H7 Cortex M7+M4, 128 Kb FLASH, 1024K Kb SRAM, + LQFP176 or UFBGA176+25 + +config ARCH_CHIP_STM32H750XB + bool "STM32H750XB" + select STM32H7_STM32H7X0XX + select STM32H7_FLASH_CONFIG_B select STM32H7_IO_CONFIG_X - select STM32H7_HAVE_SMPS ---help--- - STM32 H7 Cortex M7+M4, 1024 Kb FLASH, 1024K Kb SRAM, - LQFP208 + STM32 H7 Cortex M7+M4, 128 Kb FLASH, 1024K Kb SRAM, + TFBGA240+25 config ARCH_CHIP_STM32H753AI bool "STM32H753AI" @@ -388,6 +414,21 @@ config ARCH_CHIP_STM32H7_CORTEXM4 endchoice # STM32 H7 Core selection +config STM32H7_STM32H7X0XX + bool + default n + select ARCH_HAVE_FPU + select ARCH_HAVE_DPFPU + select STM32H7_HAVE_LTDC + select STM32H7_HAVE_ETHERNET + select STM32H7_HAVE_FMC + select STM32H7_HAVE_GPIOF if !STM32H7_IO_CONFIG_V + select STM32H7_HAVE_GPIOG if !STM32H7_IO_CONFIG_V + select STM32H7_HAVE_SPI4 + select STM32H7_HAVE_SPI5 if !STM32H7_IO_CONFIG_V + select STM32H7_HAVE_SPI6 + select STM32H7_HAVE_RNG + config STM32H7_STM32H7X3XX bool default n diff --git a/arch/arm/src/stm32h7/hardware/stm32_dmamux.h b/arch/arm/src/stm32h7/hardware/stm32_dmamux.h index 31555d761f2..74973a4004a 100644 --- a/arch/arm/src/stm32h7/hardware/stm32_dmamux.h +++ b/arch/arm/src/stm32h7/hardware/stm32_dmamux.h @@ -203,7 +203,9 @@ /* Import DMAMUX map */ -#if defined(CONFIG_STM32H7_STM32H7X3XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) +# include "hardware/stm32h7x3xx_dmamux.h" +#elif defined(CONFIG_STM32H7_STM32H7X3XX) # include "hardware/stm32h7x3xx_dmamux.h" #elif defined(CONFIG_STM32H7_STM32H7B3XX) # include "hardware/stm32h7x3xx_dmamux.h" diff --git a/arch/arm/src/stm32h7/hardware/stm32_ethernet.h b/arch/arm/src/stm32h7/hardware/stm32_ethernet.h index 069ec296cf9..f22c76cd156 100644 --- a/arch/arm/src/stm32h7/hardware/stm32_ethernet.h +++ b/arch/arm/src/stm32h7/hardware/stm32_ethernet.h @@ -33,7 +33,8 @@ * families */ -#if defined(CONFIG_STM32H7_STM32H7X3XX) || \ +#if defined(CONFIG_STM32H7_STM32H7X0XX) || \ + defined(CONFIG_STM32H7_STM32H7X3XX) || \ defined(CONFIG_STM32H7_STM32H7B3XX) || \ defined(CONFIG_STM32H7_STM32H7X5XX) || \ defined(CONFIG_STM32H7_STM32H7X7XX) diff --git a/arch/arm/src/stm32h7/hardware/stm32_exti.h b/arch/arm/src/stm32h7/hardware/stm32_exti.h index 708cfc241ec..e197f4b6c42 100644 --- a/arch/arm/src/stm32h7/hardware/stm32_exti.h +++ b/arch/arm/src/stm32h7/hardware/stm32_exti.h @@ -35,7 +35,8 @@ * families */ -#if defined(CONFIG_STM32H7_STM32H7X3XX) || \ +#if defined(CONFIG_STM32H7_STM32H7X0XX) || \ + defined(CONFIG_STM32H7_STM32H7X3XX) || \ defined(CONFIG_STM32H7_STM32H7B3XX) || \ defined(CONFIG_STM32H7_STM32H7X5XX) || \ defined(CONFIG_STM32H7_STM32H7X7XX) diff --git a/arch/arm/src/stm32h7/hardware/stm32_flash.h b/arch/arm/src/stm32h7/hardware/stm32_flash.h index 932b3399b6e..399694f63f7 100644 --- a/arch/arm/src/stm32h7/hardware/stm32_flash.h +++ b/arch/arm/src/stm32h7/hardware/stm32_flash.h @@ -30,7 +30,9 @@ #include <nuttx/config.h> #include "chip.h" -#if defined(CONFIG_STM32H7_STM32H7X3XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) +# include "hardware/stm32h7x3xx_flash.h" +#elif defined(CONFIG_STM32H7_STM32H7X3XX) # include "hardware/stm32h7x3xx_flash.h" #elif defined(CONFIG_STM32H7_STM32H7B3XX) # include "hardware/stm32h7b3xx_flash.h" diff --git a/arch/arm/src/stm32h7/hardware/stm32_gpio.h b/arch/arm/src/stm32h7/hardware/stm32_gpio.h index eaa5f8cf3cd..83c989afaa2 100644 --- a/arch/arm/src/stm32h7/hardware/stm32_gpio.h +++ b/arch/arm/src/stm32h7/hardware/stm32_gpio.h @@ -30,7 +30,9 @@ #include <nuttx/config.h> #include "chip.h" -#if defined(CONFIG_STM32H7_STM32H7X3XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) +# include "hardware/stm32h7x3xx_gpio.h" +#elif defined(CONFIG_STM32H7_STM32H7X3XX) # include "hardware/stm32h7x3xx_gpio.h" #elif defined(CONFIG_STM32H7_STM32H7B3XX) # include "hardware/stm32h7x3xx_gpio.h" diff --git a/arch/arm/src/stm32h7/hardware/stm32_i2c.h b/arch/arm/src/stm32h7/hardware/stm32_i2c.h index bcf8a5d2a12..7b7efcd8549 100644 --- a/arch/arm/src/stm32h7/hardware/stm32_i2c.h +++ b/arch/arm/src/stm32h7/hardware/stm32_i2c.h @@ -30,7 +30,9 @@ #include <nuttx/config.h> #include "chip.h" -#if defined(CONFIG_STM32H7_STM32H7X3XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) +# include "hardware/stm32h7x3xx_i2c.h" +#elif defined(CONFIG_STM32H7_STM32H7X3XX) # include "hardware/stm32h7x3xx_i2c.h" #elif defined(CONFIG_STM32H7_STM32H7B3XX) # include "hardware/stm32h7x3xx_i2c.h" diff --git a/arch/arm/src/stm32h7/hardware/stm32_memorymap.h b/arch/arm/src/stm32h7/hardware/stm32_memorymap.h index a2435a16789..18c199495ab 100644 --- a/arch/arm/src/stm32h7/hardware/stm32_memorymap.h +++ b/arch/arm/src/stm32h7/hardware/stm32_memorymap.h @@ -30,7 +30,9 @@ #include <nuttx/config.h> #include "chip.h" -#if defined(CONFIG_STM32H7_STM32H7X3XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) +# include "hardware/stm32h7x3xx_memorymap.h" +#elif defined(CONFIG_STM32H7_STM32H7X3XX) # include "hardware/stm32h7x3xx_memorymap.h" #elif defined(CONFIG_STM32H7_STM32H7B3XX) # include "hardware/stm32h7x3xx_memorymap.h" diff --git a/arch/arm/src/stm32h7/hardware/stm32_pinmap.h b/arch/arm/src/stm32h7/hardware/stm32_pinmap.h index 18e8478ca9f..de4bd7bb444 100644 --- a/arch/arm/src/stm32h7/hardware/stm32_pinmap.h +++ b/arch/arm/src/stm32h7/hardware/stm32_pinmap.h @@ -31,7 +31,9 @@ #include "chip.h" #if defined(CONFIG_STM32H7_USE_LEGACY_PINMAP) -# if defined(CONFIG_STM32H7_STM32H7X3XX) +# if defined(CONFIG_STM32H7_STM32H7X0XX) +# include "hardware/stm32h7x3xx_pinmap_legacy.h" +# elif defined(CONFIG_STM32H7_STM32H7X3XX) # include "hardware/stm32h7x3xx_pinmap_legacy.h" # elif defined(CONFIG_STM32H7_STM32H7B3XX) # include "hardware/stm32h7x3xx_pinmap_legacy.h" @@ -41,7 +43,9 @@ # error "Unsupported STM32 H7 Pin map" # endif #else -# if defined(CONFIG_STM32H7_STM32H7X3XX) +# if defined(CONFIG_STM32H7_STM32H7X0XX) +# include "hardware/stm32h7x3xx_pinmap.h" +# elif defined(CONFIG_STM32H7_STM32H7X3XX) # include "hardware/stm32h7x3xx_pinmap.h" # elif defined(CONFIG_STM32H7_STM32H7B3XX) # include "hardware/stm32h7x3xx_pinmap.h" diff --git a/arch/arm/src/stm32h7/hardware/stm32_pwr.h b/arch/arm/src/stm32h7/hardware/stm32_pwr.h index 49bfa8e2f98..88f257e9a58 100644 --- a/arch/arm/src/stm32h7/hardware/stm32_pwr.h +++ b/arch/arm/src/stm32h7/hardware/stm32_pwr.h @@ -30,7 +30,9 @@ #include <nuttx/config.h> #include "chip.h" -#if defined(CONFIG_STM32H7_STM32H7X3XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) +# include "hardware/stm32h7x3xx_pwr.h" +#elif defined(CONFIG_STM32H7_STM32H7X3XX) # include "hardware/stm32h7x3xx_pwr.h" #elif defined(CONFIG_STM32H7_STM32H7B3XX) # include "hardware/stm32h7x3xx_pwr.h" diff --git a/arch/arm/src/stm32h7/hardware/stm32_rcc.h b/arch/arm/src/stm32h7/hardware/stm32_rcc.h index 6c91f2e748d..984f782d612 100644 --- a/arch/arm/src/stm32h7/hardware/stm32_rcc.h +++ b/arch/arm/src/stm32h7/hardware/stm32_rcc.h @@ -30,7 +30,9 @@ #include <nuttx/config.h> #include "chip.h" -#if defined(CONFIG_STM32H7_STM32H7X3XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) +# include "hardware/stm32h7x3xx_rcc.h" +#elif defined(CONFIG_STM32H7_STM32H7X3XX) # include "hardware/stm32h7x3xx_rcc.h" #elif defined(CONFIG_STM32H7_STM32H7B3XX) # include "hardware/stm32h7x3xx_rcc.h" diff --git a/arch/arm/src/stm32h7/hardware/stm32_sdmmc.h b/arch/arm/src/stm32h7/hardware/stm32_sdmmc.h index 13aaa70b89e..28bcba80b9a 100644 --- a/arch/arm/src/stm32h7/hardware/stm32_sdmmc.h +++ b/arch/arm/src/stm32h7/hardware/stm32_sdmmc.h @@ -30,7 +30,9 @@ #include <nuttx/config.h> #include "chip.h" -#if defined(CONFIG_STM32H7_STM32H7X3XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) +# include "stm32h7x3xx_sdmmc.h" +#elif defined(CONFIG_STM32H7_STM32H7X3XX) # include "stm32h7x3xx_sdmmc.h" #elif defined(CONFIG_STM32H7_STM32H7B3XX) # include "stm32h7x3xx_sdmmc.h" diff --git a/arch/arm/src/stm32h7/hardware/stm32_spi.h b/arch/arm/src/stm32h7/hardware/stm32_spi.h index 5ab43287573..44bae2e58fa 100644 --- a/arch/arm/src/stm32h7/hardware/stm32_spi.h +++ b/arch/arm/src/stm32h7/hardware/stm32_spi.h @@ -30,7 +30,9 @@ #include <nuttx/config.h> #include "chip.h" -#if defined(CONFIG_STM32H7_STM32H7X3XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) +# include "hardware/stm32h7x3xx_spi.h" +#elif defined(CONFIG_STM32H7_STM32H7X3XX) # include "hardware/stm32h7x3xx_spi.h" #elif defined(CONFIG_STM32H7_STM32H7B3XX) # include "hardware/stm32h7x3xx_spi.h" diff --git a/arch/arm/src/stm32h7/hardware/stm32_syscfg.h b/arch/arm/src/stm32h7/hardware/stm32_syscfg.h index c4823e7716a..a48b13ff5d2 100644 --- a/arch/arm/src/stm32h7/hardware/stm32_syscfg.h +++ b/arch/arm/src/stm32h7/hardware/stm32_syscfg.h @@ -30,7 +30,9 @@ #include <nuttx/config.h> #include "chip.h" -#if defined(CONFIG_STM32H7_STM32H7X3XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) +# include "hardware/stm32h7x3xx_syscfg.h" +#elif defined(CONFIG_STM32H7_STM32H7X3XX) # include "hardware/stm32h7x3xx_syscfg.h" #elif defined(CONFIG_STM32H7_STM32H7B3XX) # include "hardware/stm32h7x3xx_syscfg.h" diff --git a/arch/arm/src/stm32h7/hardware/stm32_uart.h b/arch/arm/src/stm32h7/hardware/stm32_uart.h index c84725cbf27..9bc1408a9b4 100644 --- a/arch/arm/src/stm32h7/hardware/stm32_uart.h +++ b/arch/arm/src/stm32h7/hardware/stm32_uart.h @@ -30,7 +30,9 @@ #include <nuttx/config.h> #include "chip.h" -#if defined(CONFIG_STM32H7_STM32H7X3XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) +# include "hardware/stm32h7x3xx_uart.h" +#elif defined(CONFIG_STM32H7_STM32H7X3XX) # include "hardware/stm32h7x3xx_uart.h" #elif defined(CONFIG_STM32H7_STM32H7B3XX) # include "hardware/stm32h7x3xx_uart.h" diff --git a/arch/arm/src/stm32h7/hardware/stm32h7x3xx_gpio.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_gpio.h index fc6511cd38a..e052e88da45 100644 --- a/arch/arm/src/stm32h7/hardware/stm32h7x3xx_gpio.h +++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_gpio.h @@ -30,10 +30,11 @@ #include <nuttx/config.h> #include <arch/stm32h7/chip.h> -#if defined(CONFIG_STM32H7_STM32H7X3XX) || \ - defined(CONFIG_STM32H7_STM32H7B3XX) || \ - defined(CONFIG_STM32H7_STM32H7X5XX) || \ - defined(CONFIG_STM32H7_STM32H7X7XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) || \ + defined(CONFIG_STM32H7_STM32H7X3XX) || \ + defined(CONFIG_STM32H7_STM32H7B3XX) || \ + defined(CONFIG_STM32H7_STM32H7X5XX) || \ + defined(CONFIG_STM32H7_STM32H7X7XX) /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/stm32h7/hardware/stm32h7x3xx_pinmap.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_pinmap.h index 4a92b2dc699..46b114c3e67 100644 --- a/arch/arm/src/stm32h7/hardware/stm32h7x3xx_pinmap.h +++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_pinmap.h @@ -31,7 +31,8 @@ #include "stm32_gpio.h" -#if defined(CONFIG_STM32H7_STM32H7X3XX) || \ +#if defined(CONFIG_STM32H7_STM32H7X0XX) || \ + defined(CONFIG_STM32H7_STM32H7X3XX) || \ defined(CONFIG_STM32H7_STM32H7B3XX) || \ defined(CONFIG_STM32H7_STM32H7X5XX) || \ defined(CONFIG_STM32H7_STM32H7X7XX) @@ -1537,5 +1538,5 @@ #define GPIO_UART8_TX_1 (GPIO_ALT|GPIO_AF8|GPIO_PUSHPULL|GPIO_PULLUP|GPIO_PORTE|GPIO_PIN1) #define GPIO_UART8_TX_2 (GPIO_ALT|GPIO_AF8|GPIO_PUSHPULL|GPIO_PULLUP|GPIO_PORTJ|GPIO_PIN8) -#endif /* CONFIG_STM32H7_STM32H7X3XX || CONFIG_STM32H7_STM32H7X7XX || CONFIG_STM32H7_STM32H7B3XX */ +#endif /* CONFIG_STM32H7_STM32H7X0XX CONFIG_STM32H7_STM32H7X3XX || CONFIG_STM32H7_STM32H7X7XX || CONFIG_STM32H7_STM32H7B3XX */ #endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_PINMAP_H */ diff --git a/arch/arm/src/stm32h7/hardware/stm32h7x3xx_pinmap_legacy.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_pinmap_legacy.h index 76269fbc0db..fa82a108a88 100644 --- a/arch/arm/src/stm32h7/hardware/stm32h7x3xx_pinmap_legacy.h +++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_pinmap_legacy.h @@ -31,7 +31,11 @@ #include "stm32_gpio.h" -#if defined(CONFIG_STM32H7_STM32H7X3XX) || defined(CONFIG_STM32H7_STM32H7X7XX) || defined(CONFIG_STM32H7_STM32H7B3XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) || \ + defined(CONFIG_STM32H7_STM32H7X3XX) || \ + defined(CONFIG_STM32H7_STM32H7B3XX) || \ + defined(CONFIG_STM32H7_STM32H7X5XX) || \ + defined(CONFIG_STM32H7_STM32H7X7XX) /**************************************************************************** * Pre-processor Definitions @@ -1534,5 +1538,5 @@ #define GPIO_UART8_TX_1 (GPIO_ALT|GPIO_AF8|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PULLUP|GPIO_PORTE|GPIO_PIN1) #define GPIO_UART8_TX_2 (GPIO_ALT|GPIO_AF8|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PULLUP|GPIO_PORTJ|GPIO_PIN8) -#endif /* CONFIG_STM32H7_STM32H7X3XX || CONFIG_STM32H7_STM32H7X7XX || CONFIG_STM32H7_STM32H7B3XX */ +#endif /* CONFIG_STM32H7_STM32H7X0XX CONFIG_STM32H7_STM32H7X3XX || CONFIG_STM32H7_STM32H7X7XX || CONFIG_STM32H7_STM32H7B3XX */ #endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_PINMAP_LEGACY_H */ diff --git a/arch/arm/src/stm32h7/hardware/stm32h7x3xx_spi.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_spi.h index 1252fdef6bf..2e00669d7d4 100644 --- a/arch/arm/src/stm32h7/hardware/stm32h7x3xx_spi.h +++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_spi.h @@ -29,7 +29,8 @@ #include <nuttx/config.h> -#if defined(CONFIG_STM32H7_STM32H7X3XX) || \ +#if defined(CONFIG_STM32H7_STM32H7X0XX) || \ + defined(CONFIG_STM32H7_STM32H7X3XX) || \ defined(CONFIG_STM32H7_STM32H7B3XX) || \ defined(CONFIG_STM32H7_STM32H7X5XX) || \ defined(CONFIG_STM32H7_STM32H7X7XX) diff --git a/arch/arm/src/stm32h7/hardware/stm32h7x3xx_uart.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_uart.h index da66a2f1337..e5785ef1c16 100644 --- a/arch/arm/src/stm32h7/hardware/stm32h7x3xx_uart.h +++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_uart.h @@ -31,7 +31,8 @@ #include "chip.h" #include "hardware/stm32_memorymap.h" -#if defined(CONFIG_STM32H7_STM32H7X3XX) || \ +#if defined(CONFIG_STM32H7_STM32H7X0XX) || \ + defined(CONFIG_STM32H7_STM32H7X3XX) || \ defined(CONFIG_STM32H7_STM32H7B3XX) || \ defined(CONFIG_STM32H7_STM32H7X5XX) || \ defined(CONFIG_STM32H7_STM32H7X7XX) diff --git a/arch/arm/src/stm32h7/stm32_exti_gpio.c b/arch/arm/src/stm32h7/stm32_exti_gpio.c index cc901cdf020..1e4c7fd7b75 100644 --- a/arch/arm/src/stm32h7/stm32_exti_gpio.c +++ b/arch/arm/src/stm32h7/stm32_exti_gpio.c @@ -44,7 +44,8 @@ * families */ -#if defined(CONFIG_STM32H7_STM32H7X3XX) || \ +#if defined(CONFIG_STM32H7_STM32H7X0XX) || \ + defined(CONFIG_STM32H7_STM32H7X3XX) || \ defined(CONFIG_STM32H7_STM32H7B3XX) || \ defined(CONFIG_STM32H7_STM32H7X5XX) || \ defined(CONFIG_STM32H7_STM32H7X7XX) diff --git a/arch/arm/src/stm32h7/stm32_flash.c b/arch/arm/src/stm32h7/stm32_flash.c index 75fa899d2a9..3a963bbc22b 100644 --- a/arch/arm/src/stm32h7/stm32_flash.c +++ b/arch/arm/src/stm32h7/stm32_flash.c @@ -26,10 +26,14 @@ #include <nuttx/config.h> -#if defined(CONFIG_STM32H7_STM32H7X3XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) +# include "stm32h743xx_flash.c" +#elif defined(CONFIG_STM32H7_STM32H7X3XX) # include "stm32h743xx_flash.c" #elif defined(CONFIG_STM32H7_STM32H7B3XX) # include "stm32h7b3xx_flash.c" +#elif defined(CONFIG_STM32H7_STM32H7X5XX) +# include "stm32h743xx_flash.c" #elif defined(CONFIG_STM32H7_STM32H7X7XX) # include "stm32h743xx_flash.c" #else diff --git a/arch/arm/src/stm32h7/stm32_gpio.c b/arch/arm/src/stm32h7/stm32_gpio.c index ea6fc18ddcf..24521876058 100644 --- a/arch/arm/src/stm32h7/stm32_gpio.c +++ b/arch/arm/src/stm32h7/stm32_gpio.c @@ -44,10 +44,11 @@ * families */ -#if defined(CONFIG_STM32H7_STM32H7X3XX) || \ - defined(CONFIG_STM32H7_STM32H7B3XX) || \ - defined(CONFIG_STM32H7_STM32H7X5XX) || \ - defined(CONFIG_STM32H7_STM32H7X7XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) || \ + defined(CONFIG_STM32H7_STM32H7X3XX) || \ + defined(CONFIG_STM32H7_STM32H7B3XX) || \ + defined(CONFIG_STM32H7_STM32H7X5XX) || \ + defined(CONFIG_STM32H7_STM32H7X7XX) #if defined(CONFIG_STM32H7_USE_LEGACY_PINMAP) # pragma message "CONFIG_STM32H7_USE_LEGACY_PINMAP will be deprecated migrate board.h see tools/stm32_pinmap_tool.py" diff --git a/arch/arm/src/stm32h7/stm32_rcc.c b/arch/arm/src/stm32h7/stm32_rcc.c index 0355e191630..f79c9c11259 100644 --- a/arch/arm/src/stm32h7/stm32_rcc.c +++ b/arch/arm/src/stm32h7/stm32_rcc.c @@ -56,7 +56,9 @@ /* Include chip-specific clocking initialization logic */ -#if defined(CONFIG_STM32H7_STM32H7X3XX) +#if defined(CONFIG_STM32H7_STM32H7X0XX) +# include "stm32h7x3xx_rcc.c" +#elif defined(CONFIG_STM32H7_STM32H7X3XX) # include "stm32h7x3xx_rcc.c" #elif defined(CONFIG_STM32H7_STM32H7B3XX) # include "stm32h7x3xx_rcc.c" diff --git a/boards/Kconfig b/boards/Kconfig index dcb317e8e0b..d22593ac817 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -1870,6 +1870,15 @@ config ARCH_BOARD_WEACT_STM32H743 ---help--- This is WeAct MiniSTM32H7xx (STM32H743VIT6) board. +config ARCH_BOARD_WEACT_STM32H750 + bool "WeAct Studio STM32H750" + depends on ARCH_CHIP_STM32H750VB + select ARCH_HAVE_LEDS + select ARCH_HAVE_BUTTONS + select ARCH_HAVE_IRQBUTTONS + ---help--- + This is WeAct MiniSTM32H7xx (STM32H750VB) board. + config ARCH_BOARD_NUCLEO_H743ZI bool "STM32H743 Nucleo H743ZI" depends on ARCH_CHIP_STM32H743ZI @@ -1907,9 +1916,9 @@ config ARCH_BOARD_STM32H745I_DISCO config ARCH_BOARD_STM32H750B_DK bool "STM32H750B-DK board" - depends on ARCH_CHIP_STM32H750B + depends on ARCH_CHIP_STM32H750XB ---help--- - STMicro STM32H750B-DK board based on the STMicro STM32H750B MCU. + STMicro STM32H750B-DK board based on the STMicro STM32H750XB MCU. config ARCH_BOARD_LINUM_STM32H753BI bool "Linum (STM32H753BI) board" diff --git a/boards/arm/stm32h7/stm32h750b-dk/configs/lvgl/defconfig b/boards/arm/stm32h7/stm32h750b-dk/configs/lvgl/defconfig index 96da5dc8849..9ed9e9acdf6 100644 --- a/boards/arm/stm32h7/stm32h750b-dk/configs/lvgl/defconfig +++ b/boards/arm/stm32h7/stm32h750b-dk/configs/lvgl/defconfig @@ -6,7 +6,6 @@ # modifications. # # CONFIG_STANDARD_SERIAL is not set -# CONFIG_STM32H7_CORTEXM4_ENABLED is not set # CONFIG_STM32H7_FB_CMAP is not set # CONFIG_STM32H7_LTDC_L1_CHROMAKEYEN is not set # CONFIG_STM32H7_LTDC_L2 is not set @@ -16,7 +15,7 @@ CONFIG_ARCH_BOARD="stm32h750b-dk" CONFIG_ARCH_BOARD_STM32H750B_DK=y CONFIG_ARCH_BOARD_STM32H750B_DK_TOUCHSCREEN_SWAPXY=y CONFIG_ARCH_CHIP="stm32h7" -CONFIG_ARCH_CHIP_STM32H750B=y +CONFIG_ARCH_CHIP_STM32H750XB=y CONFIG_ARCH_CHIP_STM32H7=y CONFIG_ARCH_CHIP_STM32H7_CORTEXM7=y CONFIG_ARCH_STACKDUMP=y @@ -77,7 +76,6 @@ CONFIG_STM32H7_I2C4=y CONFIG_STM32H7_LTDC=y CONFIG_STM32H7_LTDC_FB_BASE=0xd0000000 CONFIG_STM32H7_LTDC_FB_SIZE=522240 -CONFIG_STM32H7_PWR_DIRECT_SMPS_SUPPLY=y CONFIG_STM32H7_USART3=y CONFIG_SYSTEM_NSH=y CONFIG_TTY_SIGINT=y