Skip to content

!arch/stm32: rename STM32F7/H7 QUADSPI Kconfig symbol to QSPI #19069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acassis merged 1 commit into from
Jun 10, 2026
Merged

!arch/stm32: rename STM32F7/H7 QUADSPI Kconfig symbol to QSPI #19069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arch/arm/src/stm32f7/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ if(CONFIG_STM32F7_ADC)
list(APPEND SRCS stm32_adc.c)
endif()

if(CONFIG_STM32F7_QUADSPI)
if(CONFIG_STM32F7_QSPI)
list(APPEND SRCS stm32_qspi.c)
endif()

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/src/stm32f7/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1469,7 +1469,7 @@ config STM32F7_OTGFSHS
default n
select USBHOST_HAVE_ASYNCH if USBHOST

config STM32F7_QUADSPI
config STM32F7_QSPI
bool "QuadSPI"
default n

Expand Down Expand Up @@ -2185,7 +2185,7 @@ config STM32F7_EXTERNAL_RAM
In addition to internal SDRAM, external RAM may be available through the FMC.

menu "QuadSPI Configuration"
depends on STM32F7_QUADSPI
depends on STM32F7_QSPI

config STM32F7_QSPI_FLASH_SIZE
int "Size of attached serial flash, bytes"
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/src/stm32f7/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ ifeq ($(CONFIG_STM32F7_ADC),y)
CHIP_CSRCS += stm32_adc.c
endif

ifeq ($(CONFIG_STM32F7_QUADSPI),y)
ifeq ($(CONFIG_STM32F7_QSPI),y)
CHIP_CSRCS += stm32_qspi.c
endif

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/src/stm32f7/stm32_qspi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
#include "stm32_rcc.h"
#include "hardware/stm32_qspi.h"

#ifdef CONFIG_STM32F7_QUADSPI
#ifdef CONFIG_STM32F7_QSPI

/****************************************************************************
* Pre-processor Definitions
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/src/stm32f7/stm32_qspi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

#include "chip.h"

#ifdef CONFIG_STM32F7_QUADSPI
#ifdef CONFIG_STM32F7_QSPI

/****************************************************************************
* Pre-processor Definitions
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/src/stm32f7/stm32f72xx73xx_rcc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ static inline void rcc_enableahb3(void)
regval |= RCC_AHB3ENR_FMCEN;
#endif

#ifdef CONFIG_STM32F7_QUADSPI
#ifdef CONFIG_STM32F7_QSPI
/* FQuad SPI memory controller clock enable */

regval |= RCC_AHB3ENR_QSPIEN;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ static inline void rcc_enableahb3(void)
regval |= RCC_AHB3ENR_FMCEN;
#endif

#ifdef CONFIG_STM32F7_QUADSPI
#ifdef CONFIG_STM32F7_QSPI
/* FQuad SPI memory controller clock enable */

regval |= RCC_AHB3ENR_QSPIEN;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ static inline void rcc_enableahb3(void)
regval |= RCC_AHB3ENR_FMCEN;
#endif

#ifdef CONFIG_STM32F7_QUADSPI
#ifdef CONFIG_STM32F7_QSPI
/* FQuad SPI memory controller clock enable */

regval |= RCC_AHB3ENR_QSPIEN;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/src/stm32h7/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ if(CONFIG_STM32H7_PWR)
list(APPEND SRCS stm32_pwr.c)
endif()

if(CONFIG_STM32H7_QUADSPI)
if(CONFIG_STM32H7_QSPI)
list(APPEND SRCS stm32_qspi.c)
endif()

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/src/stm32h7/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,7 @@ config STM32H7_OTG_USBREGEN
bool "Enable USB voltage regulator"
default n

config STM32H7_QUADSPI
config STM32H7_QSPI
bool "QuadSPI"
default n

Expand Down Expand Up @@ -2221,7 +2221,7 @@ endif # STM32H7_RTC_LSECLOCK
endmenu # RTC Configuration

menu "QuadSPI Configuration"
depends on STM32H7_QUADSPI
depends on STM32H7_QSPI

config STM32H7_QSPI_FLASH_SIZE
int "Size of attached serial flash, bytes"
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/src/stm32h7/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ ifeq ($(CONFIG_STM32H7_PWR),y)
CHIP_CSRCS += stm32_pwr.c
endif

ifeq ($(CONFIG_STM32H7_QUADSPI),y)
ifeq ($(CONFIG_STM32H7_QSPI),y)
CHIP_CSRCS += stm32_qspi.c
endif

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/src/stm32h7/stm32_qspi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
#include "stm32_rcc.h"
#include "hardware/stm32_qspi.h"

#ifdef CONFIG_STM32H7_QUADSPI
#ifdef CONFIG_STM32H7_QSPI

/****************************************************************************
* Pre-processor Definitions
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/src/stm32h7/stm32_qspi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

#include "chip.h"

#ifdef CONFIG_STM32H7_QUADSPI
#ifdef CONFIG_STM32H7_QSPI

/****************************************************************************
* Pre-processor Definitions
Expand Down
2 changes: 1 addition & 1 deletion boards/arm/stm32f7/stm32f746g-disco/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ config STM32F746GDISCO_FLASH
select MTD_N25QXXX
select MTD_SMART
select FS_SMARTFS
select STM32F7_QUADSPI
select STM32F7_QSPI
select MTD_BYTE_WRITE
---help---
Configures an MTD device for use with the onboard flash
Expand Down
2 changes: 1 addition & 1 deletion boards/arm/stm32f7/stm32f777zit6-meadow/configs/f7corecomp/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ CONFIG_START_DAY=14
CONFIG_STM32F7_DMA1=y
CONFIG_STM32F7_DMA2=y
CONFIG_STM32F7_OTGFS=y
CONFIG_STM32F7_QSPI=y
CONFIG_STM32F7_QSPI_POLLING=y
CONFIG_STM32F7_QUADSPI=y
CONFIG_STM32F7_SDMMC2=y
CONFIG_STM32F7_SDMMC_DMA=y
CONFIG_STM32F7_USART1=y
Expand Down
2 changes: 1 addition & 1 deletion boards/arm/stm32f7/stm32f777zit6-meadow/configs/i2s/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ CONFIG_STM32F7_I2S2=y
CONFIG_STM32F7_I2S2_MCK=y
CONFIG_STM32F7_I2S2_TX=y
CONFIG_STM32F7_OTGFS=y
CONFIG_STM32F7_QSPI=y
CONFIG_STM32F7_QSPI_POLLING=y
CONFIG_STM32F7_QUADSPI=y
CONFIG_STM32F7_USART1=y
CONFIG_SYSLOG_DEFAULT=y
CONFIG_SYSLOG_DEVPATH="/dev/ttyS1"
Expand Down
2 changes: 1 addition & 1 deletion boards/arm/stm32f7/stm32f777zit6-meadow/configs/projectlab/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ CONFIG_SPI=y
CONFIG_START_DAY=14
CONFIG_STM32F7_I2C1=y
CONFIG_STM32F7_OTGFS=y
CONFIG_STM32F7_QUADSPI=y
CONFIG_STM32F7_QSPI=y
CONFIG_STM32F7_USART1=y
CONFIG_SYSTEM_FLASH_ERASEALL=y
CONFIG_SYSTEM_NSH=y
Expand Down
2 changes: 1 addition & 1 deletion boards/arm/stm32f7/stm32f777zit6-meadow/configs/usbnsh/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ CONFIG_SCHED_WAITPID=y
CONFIG_SPI=y
CONFIG_START_DAY=14
CONFIG_STM32F7_OTGFS=y
CONFIG_STM32F7_QUADSPI=y
CONFIG_STM32F7_QSPI=y
CONFIG_STM32F7_USART1=y
CONFIG_SYSTEM_FLASH_ERASEALL=y
CONFIG_SYSTEM_NSH=y
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#include "stm32f777zit6-meadow.h"

#ifdef CONFIG_STM32F7_QUADSPI
#ifdef CONFIG_STM32F7_QSPI
# include "stm32_qspi.h"

# ifdef CONFIG_FS_FAT
Expand Down Expand Up @@ -124,7 +124,7 @@ void stm32_boardinitialize(void)
#ifdef CONFIG_BOARD_LATE_INITIALIZE
void board_late_initialize(void)
{
#ifdef CONFIG_STM32F7_QUADSPI
#ifdef CONFIG_STM32F7_QSPI
struct qspi_dev_s *qspi;
struct mtd_dev_s *mtd;

Expand Down
2 changes: 1 addition & 1 deletion boards/arm/stm32h7/linum-stm32h753bi/configs/littlefs/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ CONFIG_START_DAY=6
CONFIG_START_MONTH=12
CONFIG_START_YEAR=2011
CONFIG_STM32H7_PWR=y
CONFIG_STM32H7_QSPI=y
CONFIG_STM32H7_QSPI_INTERRUPTS=y
CONFIG_STM32H7_QUADSPI=y
CONFIG_STM32H7_RTC=y
CONFIG_STM32H7_USART1=y
CONFIG_SYSTEM_NSH=y
Expand Down
2 changes: 1 addition & 1 deletion boards/arm/stm32h7/linum-stm32h753bi/configs/nxffs/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ CONFIG_START_DAY=6
CONFIG_START_MONTH=12
CONFIG_START_YEAR=2011
CONFIG_STM32H7_PWR=y
CONFIG_STM32H7_QSPI=y
CONFIG_STM32H7_QSPI_INTERRUPTS=y
CONFIG_STM32H7_QUADSPI=y
CONFIG_STM32H7_RTC=y
CONFIG_STM32H7_USART1=y
CONFIG_SYSTEM_NSH=y
Expand Down
Loading