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
The following commit(s) were added to refs/heads/master by this push:
new 46d2306bf81 !arch/stm32: rename STM32F7/H7 QUADSPI Kconfig symbol to
QSPI
46d2306bf81 is described below
commit 46d2306bf815418ca4a23e78c4512b1e1673d112
Author: raiden00pl <[email protected]>
AuthorDate: Tue Jun 9 12:11:57 2026 +0200
!arch/stm32: rename STM32F7/H7 QUADSPI Kconfig symbol to QSPI
BREAKING CHANGE: CONFIG_STM32F7_QUADSPI and CONFIG_STM32H7_QUADSPI are
renamed to CONFIG_STM32F7_QSPI and CONFIG_STM32H7_QSPI. Out-of-tree F7/H7
board configurations must update the symbol name.
Standardize the F7/H7 QSPI enable symbol on the QSPI name (the QUADSPI and
QSPI peripherals are the same IP block). Only the Kconfig enable symbol and
its CONFIG_ references are renamed; the QUADSPI hardware register/pin/DMA
macros are unchanged.
Signed-off-by: raiden00pl <[email protected]>
---
arch/arm/src/stm32f7/CMakeLists.txt | 2 +-
arch/arm/src/stm32f7/Kconfig | 4 ++--
arch/arm/src/stm32f7/Make.defs | 2 +-
arch/arm/src/stm32f7/stm32_qspi.c | 2 +-
arch/arm/src/stm32f7/stm32_qspi.h | 2 +-
arch/arm/src/stm32f7/stm32f72xx73xx_rcc.c | 2 +-
arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c | 2 +-
arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c | 2 +-
arch/arm/src/stm32h7/CMakeLists.txt | 2 +-
arch/arm/src/stm32h7/Kconfig | 4 ++--
arch/arm/src/stm32h7/Make.defs | 2 +-
arch/arm/src/stm32h7/stm32_qspi.c | 2 +-
arch/arm/src/stm32h7/stm32_qspi.h | 2 +-
boards/arm/stm32f7/stm32f746g-disco/Kconfig | 2 +-
boards/arm/stm32f7/stm32f777zit6-meadow/configs/f7corecomp/defconfig | 2 +-
boards/arm/stm32f7/stm32f777zit6-meadow/configs/i2s/defconfig | 2 +-
boards/arm/stm32f7/stm32f777zit6-meadow/configs/projectlab/defconfig | 2 +-
boards/arm/stm32f7/stm32f777zit6-meadow/configs/usbnsh/defconfig | 2 +-
boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c | 4 ++--
boards/arm/stm32h7/linum-stm32h753bi/configs/littlefs/defconfig | 2 +-
boards/arm/stm32h7/linum-stm32h753bi/configs/nxffs/defconfig | 2 +-
21 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/arch/arm/src/stm32f7/CMakeLists.txt
b/arch/arm/src/stm32f7/CMakeLists.txt
index 89cca465803..fbf052e2458 100644
--- a/arch/arm/src/stm32f7/CMakeLists.txt
+++ b/arch/arm/src/stm32f7/CMakeLists.txt
@@ -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()
diff --git a/arch/arm/src/stm32f7/Kconfig b/arch/arm/src/stm32f7/Kconfig
index ec6c5361ede..825e55ef277 100644
--- a/arch/arm/src/stm32f7/Kconfig
+++ b/arch/arm/src/stm32f7/Kconfig
@@ -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
@@ -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"
diff --git a/arch/arm/src/stm32f7/Make.defs b/arch/arm/src/stm32f7/Make.defs
index 04f0514666b..4c9fe1c7319 100644
--- a/arch/arm/src/stm32f7/Make.defs
+++ b/arch/arm/src/stm32f7/Make.defs
@@ -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
diff --git a/arch/arm/src/stm32f7/stm32_qspi.c
b/arch/arm/src/stm32f7/stm32_qspi.c
index a9e46655548..c9f30d3155a 100644
--- a/arch/arm/src/stm32f7/stm32_qspi.c
+++ b/arch/arm/src/stm32f7/stm32_qspi.c
@@ -56,7 +56,7 @@
#include "stm32_rcc.h"
#include "hardware/stm32_qspi.h"
-#ifdef CONFIG_STM32F7_QUADSPI
+#ifdef CONFIG_STM32F7_QSPI
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/stm32f7/stm32_qspi.h
b/arch/arm/src/stm32f7/stm32_qspi.h
index 018bf0c1173..ae919405ef5 100644
--- a/arch/arm/src/stm32f7/stm32_qspi.h
+++ b/arch/arm/src/stm32f7/stm32_qspi.h
@@ -35,7 +35,7 @@
#include "chip.h"
-#ifdef CONFIG_STM32F7_QUADSPI
+#ifdef CONFIG_STM32F7_QSPI
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/stm32f7/stm32f72xx73xx_rcc.c
b/arch/arm/src/stm32f7/stm32f72xx73xx_rcc.c
index 19d3e90346b..625c5917073 100644
--- a/arch/arm/src/stm32f7/stm32f72xx73xx_rcc.c
+++ b/arch/arm/src/stm32f7/stm32f72xx73xx_rcc.c
@@ -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;
diff --git a/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c
b/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c
index fac08c11467..a0f80c1a031 100644
--- a/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c
+++ b/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c
@@ -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;
diff --git a/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c
b/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c
index ff026b7f8e7..a497d7ccb85 100644
--- a/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c
+++ b/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c
@@ -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;
diff --git a/arch/arm/src/stm32h7/CMakeLists.txt
b/arch/arm/src/stm32h7/CMakeLists.txt
index eb5a4218c22..e1636a3fb8d 100644
--- a/arch/arm/src/stm32h7/CMakeLists.txt
+++ b/arch/arm/src/stm32h7/CMakeLists.txt
@@ -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()
diff --git a/arch/arm/src/stm32h7/Kconfig b/arch/arm/src/stm32h7/Kconfig
index 4f1c6eaaa17..bc7c0670d88 100644
--- a/arch/arm/src/stm32h7/Kconfig
+++ b/arch/arm/src/stm32h7/Kconfig
@@ -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
@@ -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"
diff --git a/arch/arm/src/stm32h7/Make.defs b/arch/arm/src/stm32h7/Make.defs
index 73f9b13979a..005c695adc8 100644
--- a/arch/arm/src/stm32h7/Make.defs
+++ b/arch/arm/src/stm32h7/Make.defs
@@ -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
diff --git a/arch/arm/src/stm32h7/stm32_qspi.c
b/arch/arm/src/stm32h7/stm32_qspi.c
index bb985448e65..c346fa55125 100644
--- a/arch/arm/src/stm32h7/stm32_qspi.c
+++ b/arch/arm/src/stm32h7/stm32_qspi.c
@@ -57,7 +57,7 @@
#include "stm32_rcc.h"
#include "hardware/stm32_qspi.h"
-#ifdef CONFIG_STM32H7_QUADSPI
+#ifdef CONFIG_STM32H7_QSPI
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/stm32h7/stm32_qspi.h
b/arch/arm/src/stm32h7/stm32_qspi.h
index 93f03807023..36724b2538e 100644
--- a/arch/arm/src/stm32h7/stm32_qspi.h
+++ b/arch/arm/src/stm32h7/stm32_qspi.h
@@ -35,7 +35,7 @@
#include "chip.h"
-#ifdef CONFIG_STM32H7_QUADSPI
+#ifdef CONFIG_STM32H7_QSPI
/****************************************************************************
* Pre-processor Definitions
diff --git a/boards/arm/stm32f7/stm32f746g-disco/Kconfig
b/boards/arm/stm32f7/stm32f746g-disco/Kconfig
index 40785710b6d..f43ffe7e876 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/Kconfig
+++ b/boards/arm/stm32f7/stm32f746g-disco/Kconfig
@@ -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
diff --git
a/boards/arm/stm32f7/stm32f777zit6-meadow/configs/f7corecomp/defconfig
b/boards/arm/stm32f7/stm32f777zit6-meadow/configs/f7corecomp/defconfig
index 0361ac3973f..23b69992c3e 100644
--- a/boards/arm/stm32f7/stm32f777zit6-meadow/configs/f7corecomp/defconfig
+++ b/boards/arm/stm32f7/stm32f777zit6-meadow/configs/f7corecomp/defconfig
@@ -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
diff --git a/boards/arm/stm32f7/stm32f777zit6-meadow/configs/i2s/defconfig
b/boards/arm/stm32f7/stm32f777zit6-meadow/configs/i2s/defconfig
index 2a5630c8763..bd8641a4643 100644
--- a/boards/arm/stm32f7/stm32f777zit6-meadow/configs/i2s/defconfig
+++ b/boards/arm/stm32f7/stm32f777zit6-meadow/configs/i2s/defconfig
@@ -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"
diff --git
a/boards/arm/stm32f7/stm32f777zit6-meadow/configs/projectlab/defconfig
b/boards/arm/stm32f7/stm32f777zit6-meadow/configs/projectlab/defconfig
index e4d37559d9d..9df11e1e0fc 100644
--- a/boards/arm/stm32f7/stm32f777zit6-meadow/configs/projectlab/defconfig
+++ b/boards/arm/stm32f7/stm32f777zit6-meadow/configs/projectlab/defconfig
@@ -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
diff --git a/boards/arm/stm32f7/stm32f777zit6-meadow/configs/usbnsh/defconfig
b/boards/arm/stm32f7/stm32f777zit6-meadow/configs/usbnsh/defconfig
index 6fb257d819b..1b453b93181 100644
--- a/boards/arm/stm32f7/stm32f777zit6-meadow/configs/usbnsh/defconfig
+++ b/boards/arm/stm32f7/stm32f777zit6-meadow/configs/usbnsh/defconfig
@@ -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
diff --git a/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c
b/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c
index fbf4f961fc5..5966f0315b8 100644
--- a/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c
+++ b/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c
@@ -36,7 +36,7 @@
#include "stm32f777zit6-meadow.h"
-#ifdef CONFIG_STM32F7_QUADSPI
+#ifdef CONFIG_STM32F7_QSPI
# include "stm32_qspi.h"
# ifdef CONFIG_FS_FAT
@@ -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;
diff --git a/boards/arm/stm32h7/linum-stm32h753bi/configs/littlefs/defconfig
b/boards/arm/stm32h7/linum-stm32h753bi/configs/littlefs/defconfig
index ef1fdd8f3fa..d0502ff974d 100644
--- a/boards/arm/stm32h7/linum-stm32h753bi/configs/littlefs/defconfig
+++ b/boards/arm/stm32h7/linum-stm32h753bi/configs/littlefs/defconfig
@@ -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
diff --git a/boards/arm/stm32h7/linum-stm32h753bi/configs/nxffs/defconfig
b/boards/arm/stm32h7/linum-stm32h753bi/configs/nxffs/defconfig
index c04492147c9..25020b5ef45 100644
--- a/boards/arm/stm32h7/linum-stm32h753bi/configs/nxffs/defconfig
+++ b/boards/arm/stm32h7/linum-stm32h753bi/configs/nxffs/defconfig
@@ -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
