QUADSPI settings in all registries and platform.mk.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9535 35acf78f-673a-0410-8e92-d51de3d6d3f4

10 files changed, 136 insertions, 0 deletions

diff --git a/os/hal/ports/STM32/STM32F0xx/stm32_registry.h b/os/hal/ports/STM32/STM32F0xx/stm32_registry.h
index d9fc5080d..ba43d7170 100644
--- a/os/hal/ports/STM32/STM32F0xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F0xx/stm32_registry.h
@@ -153,6 +153,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -412,6 +415,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -613,6 +619,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -822,6 +831,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -1046,6 +1058,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -1274,6 +1289,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -1530,6 +1548,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -1802,6 +1823,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

diff --git a/os/hal/ports/STM32/STM32F1xx/stm32_registry.h b/os/hal/ports/STM32/STM32F1xx/stm32_registry.h
index 1a420c330..d9b975559 100644
--- a/os/hal/ports/STM32/STM32F1xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F1xx/stm32_registry.h
@@ -138,6 +138,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -336,6 +339,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -512,6 +518,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -718,6 +727,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -964,6 +976,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -1212,6 +1227,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

diff --git a/os/hal/ports/STM32/STM32F37x/stm32_registry.h b/os/hal/ports/STM32/STM32F37x/stm32_registry.h
index a7301c576..f9bd0ba7d 100644
--- a/os/hal/ports/STM32/STM32F37x/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F37x/stm32_registry.h
@@ -134,6 +134,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -382,6 +385,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

diff --git a/os/hal/ports/STM32/STM32F3xx/stm32_registry.h b/os/hal/ports/STM32/STM32F3xx/stm32_registry.h
index 3fea891eb..815a74354 100644
--- a/os/hal/ports/STM32/STM32F3xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F3xx/stm32_registry.h
@@ -164,6 +164,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -428,6 +431,9 @@
 

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -672,6 +678,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -885,6 +894,9 @@
 

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -1095,6 +1107,9 @@
 

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -1322,6 +1337,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -1568,6 +1586,9 @@
 

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -1798,6 +1819,9 @@
 

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -2012,6 +2036,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -2238,6 +2265,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -2469,6 +2499,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -2710,6 +2743,9 @@
 

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

diff --git a/os/hal/ports/STM32/STM32F4xx/platform.mk b/os/hal/ports/STM32/STM32F4xx/platform.mk
index 055657d8d..ced19b83e 100644
--- a/os/hal/ports/STM32/STM32F4xx/platform.mk
+++ b/os/hal/ports/STM32/STM32F4xx/platform.mk
@@ -31,6 +31,9 @@ endif
 ifneq ($(findstring HAL_USE_USB TRUE,$(HALCONF)),)

 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/OTGv1/hal_usb_lld.c

 endif

+ifneq ($(findstring HAL_USE_QSPI TRUE,$(HALCONF)),)

+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.c

+endif

 ifneq ($(findstring HAL_USE_RTC TRUE,$(HALCONF)),)

 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2/hal_rtc_lld.c

 endif

@@ -74,6 +77,7 @@ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv1/hal_i2c_lld.c \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/MACv1/hal_mac_lld.c \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/OTGv1/hal_usb_lld.c \

+               $(CHIBIOS)/os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.c \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2/hal_rtc_lld.c \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/SDIOv1/hal_sdc_lld.c \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv1/hal_i2s_lld.c \

@@ -99,6 +103,7 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv1 \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/MACv1 \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/OTGv1 \

+               $(CHIBIOS)/os/hal/ports/STM32/LLD/QUADSPIv1 \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2 \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/SDIOv1 \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv1 \

diff --git a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h
index eb9ce86a5..c48f815a7 100644
--- a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h
@@ -217,6 +217,13 @@
 

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  TRUE

+#define STM32_QUADSPI1_HANDLER              Vector1AC

+#define STM32_QUADSPI1_NUMBER               91

+#define STM32_QUADSPI1_DMA_MSK              STM32_DMA_STREAM_ID_MSK(2, 7)

+#define STM32_QUADSPI1_DMA_CHN              0x30000000

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -571,6 +578,13 @@
 

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  TRUE

+#define STM32_QUADSPI1_HANDLER              Vector1AC

+#define STM32_QUADSPI1_NUMBER               91

+#define STM32_QUADSPI1_DMA_MSK              STM32_DMA_STREAM_ID_MSK(2, 7)

+#define STM32_QUADSPI1_DMA_CHN              0x30000000

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -906,6 +920,9 @@
 

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -1268,6 +1285,9 @@
 

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #if !defined(STM32F2XX)

@@ -1584,6 +1604,9 @@
 

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -1865,6 +1888,9 @@
                                              STM32_DMA_STREAM_ID_MSK(1, 1))

 #define STM32_I2C4_TX_DMA_CHN               0x00040020

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

@@ -2123,6 +2149,9 @@
 

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

diff --git a/os/hal/ports/STM32/STM32F7xx/platform.mk b/os/hal/ports/STM32/STM32F7xx/platform.mk
index 67200e45c..bd0396e2d 100644
--- a/os/hal/ports/STM32/STM32F7xx/platform.mk
+++ b/os/hal/ports/STM32/STM32F7xx/platform.mk
@@ -31,6 +31,9 @@ endif
 ifneq ($(findstring HAL_USE_USB TRUE,$(HALCONF)),)

 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/OTGv1/hal_usb_lld.c

 endif

+ifneq ($(findstring HAL_USE_QSPI TRUE,$(HALCONF)),)

+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.c

+endif

 ifneq ($(findstring HAL_USE_RTC TRUE,$(HALCONF)),)

 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2/hal_rtc_lld.c

 endif

@@ -74,6 +77,7 @@ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv2/hal_i2c_lld.c \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/MACv1/hal_mac_lld.c \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/OTGv1/hal_usb_lld.c \

+               $(CHIBIOS)/os/hal/ports/STM32/LLD/QUADSPIv1/hal_qspi_lld.c \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2/hal_rtc_lld.c \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/SDMMCv1/hal_sdc_lld.c \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv2/hal_i2s_lld.c \

@@ -99,6 +103,7 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
                $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv2 \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/MACv1 \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/OTGv1 \

+               $(CHIBIOS)/os/hal/ports/STM32/LLD/QUADSPIv1 \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2 \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/SDMMCv1 \

                $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv2 \

diff --git a/os/hal/ports/STM32/STM32F7xx/stm32_registry.h b/os/hal/ports/STM32/STM32F7xx/stm32_registry.h
index de8a14fd4..225a6aba5 100644
--- a/os/hal/ports/STM32/STM32F7xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F7xx/stm32_registry.h
@@ -215,6 +215,13 @@
 #define STM32_I2C4_TX_DMA_MSK               STM32_DMA_STREAM_ID_MSK(1, 5)

 #define STM32_I2C4_TX_DMA_CHN               0x00200000

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  TRUE

+#define STM32_QUADSPI1_HANDLER              Vector1B0

+#define STM32_QUADSPI1_NUMBER               92

+#define STM32_QUADSPI1_DMA_MSK              STM32_DMA_STREAM_ID_MSK(2, 7)

+#define STM32_QUADSPI1_DMA_CHN              0x30000000

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

diff --git a/os/hal/ports/STM32/STM32L0xx/stm32_registry.h b/os/hal/ports/STM32/STM32L0xx/stm32_registry.h
index 4bd55971e..5ec62184f 100644
--- a/os/hal/ports/STM32/STM32L0xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32L0xx/stm32_registry.h
@@ -141,6 +141,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #define STM32_RTC_HAS_SUBSECONDS            TRUE

diff --git a/os/hal/ports/STM32/STM32L1xx/stm32_registry.h b/os/hal/ports/STM32/STM32L1xx/stm32_registry.h
index ae29b55b3..4107527cf 100644
--- a/os/hal/ports/STM32/STM32L1xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32L1xx/stm32_registry.h
@@ -184,6 +184,9 @@
 #define STM32_HAS_I2C3                      FALSE

 #define STM32_HAS_I2C4                      FALSE

 

+/* QUADSPI attributes.*/

+#define STM32_HAS_QUADSPI1                  FALSE

+

 /* RTC attributes.*/

 #define STM32_HAS_RTC                       TRUE

 #if (STM32L1XX_PROD_CAT == 1) || defined(__DOXYGEN__)