Generator for STM32F76x/77x mcuconf.h files.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12334 110e8d01-0319-4d1e-a829-52ad28d1bb01

7 files changed, 115 insertions, 53 deletions

diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/mcuconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/mcuconf.h
index 31750430d..a40a40e08 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/mcuconf.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/mcuconf.h
@@ -32,6 +32,8 @@
  */

 

 #define STM32F7xx_MCUCONF

+#define STM32F746_MCUCONF

+#define STM32F756_MCUCONF

 

 /*

  * HAL driver system settings.

@@ -90,10 +92,28 @@
 #define STM32_LPTIM1SEL                     STM32_LPTIM1SEL_PCLK1

 #define STM32_CECSEL                        STM32_CECSEL_LSE

 #define STM32_CK48MSEL                      STM32_CK48MSEL_PLL

-#define STM32_SDMMCSEL                      STM32_SDMMCSEL_PLL48CLK

+#define STM32_SDMMC1SEL                     STM32_SDMMC1SEL_PLL48CLK

 #define STM32_SRAM2_NOCACHE                 FALSE

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_PRIORITY            6

+#define STM32_IRQ_EXTI1_PRIORITY            6

+#define STM32_IRQ_EXTI2_PRIORITY            6

+#define STM32_IRQ_EXTI3_PRIORITY            6

+#define STM32_IRQ_EXTI4_PRIORITY            6

+#define STM32_IRQ_EXTI5_9_PRIORITY          6

+#define STM32_IRQ_EXTI10_15_PRIORITY        6

+#define STM32_IRQ_EXTI16_PRIORITY           6

+#define STM32_IRQ_EXTI17_PRIORITY           15

+#define STM32_IRQ_EXTI18_PRIORITY           6

+#define STM32_IRQ_EXTI19_PRIORITY           6

+#define STM32_IRQ_EXTI20_PRIORITY           6

+#define STM32_IRQ_EXTI21_PRIORITY           15

+#define STM32_IRQ_EXTI22_PRIORITY           15

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_ADCPRE                    ADC_CCR_ADCPRE_DIV4

@@ -135,24 +155,6 @@
 #define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 6)

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI17_IRQ_PRIORITY       15

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI21_IRQ_PRIORITY       15

-#define STM32_EXT_EXTI22_IRQ_PRIORITY       15

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

@@ -360,6 +362,8 @@
 #define STM32_UART_UART4_IRQ_PRIORITY       12

 #define STM32_UART_UART5_IRQ_PRIORITY       12

 #define STM32_UART_USART6_IRQ_PRIORITY      12

+#define STM32_UART_UART7_IRQ_PRIORITY       12

+#define STM32_UART_UART8_IRQ_PRIORITY       12

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

@@ -379,13 +383,16 @@
 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

 #define STM32_USB_OTG2_RX_FIFO_SIZE         1024

-#define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

-#define STM32_USB_OTG_THREAD_STACK_SIZE     128

-#define STM32_USB_OTGFIFO_FILL_BASEPRI      0

 

 /*

  * WDG driver system settings.

  */

 #define STM32_WDG_USE_IWDG                  FALSE

 

+/*

+ * WSPI driver system settings.

+ */

+#define STM32_WSPI_USE_QUADSPI1             FALSE

+#define STM32_WSPI_QUADSPI1_DMA_STREAM      STM32_DMA_STREAM_ID(2, 7)

+

 #endif /* MCUCONF_H */

diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f746_discovery/mcuconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f746_discovery/mcuconf.h
index 31750430d..a40a40e08 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f746_discovery/mcuconf.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg-stm32f746_discovery/mcuconf.h
@@ -32,6 +32,8 @@
  */

 

 #define STM32F7xx_MCUCONF

+#define STM32F746_MCUCONF

+#define STM32F756_MCUCONF

 

 /*

  * HAL driver system settings.

@@ -90,10 +92,28 @@
 #define STM32_LPTIM1SEL                     STM32_LPTIM1SEL_PCLK1

 #define STM32_CECSEL                        STM32_CECSEL_LSE

 #define STM32_CK48MSEL                      STM32_CK48MSEL_PLL

-#define STM32_SDMMCSEL                      STM32_SDMMCSEL_PLL48CLK

+#define STM32_SDMMC1SEL                     STM32_SDMMC1SEL_PLL48CLK

 #define STM32_SRAM2_NOCACHE                 FALSE

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_PRIORITY            6

+#define STM32_IRQ_EXTI1_PRIORITY            6

+#define STM32_IRQ_EXTI2_PRIORITY            6

+#define STM32_IRQ_EXTI3_PRIORITY            6

+#define STM32_IRQ_EXTI4_PRIORITY            6

+#define STM32_IRQ_EXTI5_9_PRIORITY          6

+#define STM32_IRQ_EXTI10_15_PRIORITY        6

+#define STM32_IRQ_EXTI16_PRIORITY           6

+#define STM32_IRQ_EXTI17_PRIORITY           15

+#define STM32_IRQ_EXTI18_PRIORITY           6

+#define STM32_IRQ_EXTI19_PRIORITY           6

+#define STM32_IRQ_EXTI20_PRIORITY           6

+#define STM32_IRQ_EXTI21_PRIORITY           15

+#define STM32_IRQ_EXTI22_PRIORITY           15

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_ADCPRE                    ADC_CCR_ADCPRE_DIV4

@@ -135,24 +155,6 @@
 #define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 6)

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI17_IRQ_PRIORITY       15

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI21_IRQ_PRIORITY       15

-#define STM32_EXT_EXTI22_IRQ_PRIORITY       15

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

@@ -360,6 +362,8 @@
 #define STM32_UART_UART4_IRQ_PRIORITY       12

 #define STM32_UART_UART5_IRQ_PRIORITY       12

 #define STM32_UART_USART6_IRQ_PRIORITY      12

+#define STM32_UART_UART7_IRQ_PRIORITY       12

+#define STM32_UART_UART8_IRQ_PRIORITY       12

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

@@ -379,13 +383,16 @@
 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

 #define STM32_USB_OTG2_RX_FIFO_SIZE         1024

-#define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

-#define STM32_USB_OTG_THREAD_STACK_SIZE     128

-#define STM32_USB_OTGFIFO_FILL_BASEPRI      0

 

 /*

  * WDG driver system settings.

  */

 #define STM32_WDG_USE_IWDG                  FALSE

 

+/*

+ * WSPI driver system settings.

+ */

+#define STM32_WSPI_USE_QUADSPI1             FALSE

+#define STM32_WSPI_QUADSPI1_DMA_STREAM      STM32_DMA_STREAM_ID(2, 7)

+

 #endif /* MCUCONF_H */

diff --git a/demos/STM32/RT-STM32F767ZI-NUCLEO144/mcuconf.h b/demos/STM32/RT-STM32F767ZI-NUCLEO144/mcuconf.h
index de50e1bcb..a0f6a6c75 100644
--- a/demos/STM32/RT-STM32F767ZI-NUCLEO144/mcuconf.h
+++ b/demos/STM32/RT-STM32F767ZI-NUCLEO144/mcuconf.h
@@ -32,6 +32,11 @@
  */

 

 #define STM32F7xx_MCUCONF

+#define STM32F765_MCUCONF

+#define STM32F767_MCUCONF

+#define STM32F777_MCUCONF

+#define STM32F769_MCUCONF

+#define STM32F779_MCUCONF

 

 /*

  * HAL driver system settings.

@@ -365,6 +370,8 @@
 #define STM32_UART_UART4_IRQ_PRIORITY       12

 #define STM32_UART_UART5_IRQ_PRIORITY       12

 #define STM32_UART_USART6_IRQ_PRIORITY      12

+#define STM32_UART_UART7_IRQ_PRIORITY       12

+#define STM32_UART_UART8_IRQ_PRIORITY       12

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

@@ -384,13 +391,16 @@
 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

 #define STM32_USB_OTG2_RX_FIFO_SIZE         1024

-#define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

-#define STM32_USB_OTG_THREAD_STACK_SIZE     128

-#define STM32_USB_OTGFIFO_FILL_BASEPRI      0

 

 /*

  * WDG driver system settings.

  */

 #define STM32_WDG_USE_IWDG                  FALSE

 

+/*

+ * WSPI driver system settings.

+ */

+#define STM32_WSPI_USE_QUADSPI1             FALSE

+#define STM32_WSPI_QUADSPI1_DMA_STREAM      STM32_DMA_STREAM_ID(2, 7)

+

 #endif /* MCUCONF_H */

diff --git a/demos/STM32/RT-STM32F769I-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F769I-DISCOVERY/mcuconf.h
index 5428aadc6..5e65ced87 100644
--- a/demos/STM32/RT-STM32F769I-DISCOVERY/mcuconf.h
+++ b/demos/STM32/RT-STM32F769I-DISCOVERY/mcuconf.h
@@ -32,6 +32,11 @@
  */

 

 #define STM32F7xx_MCUCONF

+#define STM32F765_MCUCONF

+#define STM32F767_MCUCONF

+#define STM32F777_MCUCONF

+#define STM32F769_MCUCONF

+#define STM32F779_MCUCONF

 

 /*

  * HAL driver system settings.

@@ -365,6 +370,8 @@
 #define STM32_UART_UART4_IRQ_PRIORITY       12

 #define STM32_UART_UART5_IRQ_PRIORITY       12

 #define STM32_UART_USART6_IRQ_PRIORITY      12

+#define STM32_UART_UART7_IRQ_PRIORITY       12

+#define STM32_UART_UART8_IRQ_PRIORITY       12

 #define STM32_UART_USART1_DMA_PRIORITY      0

 #define STM32_UART_USART2_DMA_PRIORITY      0

 #define STM32_UART_USART3_DMA_PRIORITY      0

@@ -384,13 +391,16 @@
 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

 #define STM32_USB_OTG2_RX_FIFO_SIZE         1024

-#define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

-#define STM32_USB_OTG_THREAD_STACK_SIZE     128

-#define STM32_USB_OTGFIFO_FILL_BASEPRI      0

 

 /*

  * WDG driver system settings.

  */

 #define STM32_WDG_USE_IWDG                  FALSE

 

+/*

+ * WSPI driver system settings.

+ */

+#define STM32_WSPI_USE_QUADSPI1             FALSE

+#define STM32_WSPI_QUADSPI1_DMA_STREAM      STM32_DMA_STREAM_ID(2, 7)

+

 #endif /* MCUCONF_H */

diff --git a/os/hal/ports/STM32/STM32F7xx/hal_lld.h b/os/hal/ports/STM32/STM32F7xx/hal_lld.h
index 5fbe981f7..cb1f73339 100644
--- a/os/hal/ports/STM32/STM32F7xx/hal_lld.h
+++ b/os/hal/ports/STM32/STM32F7xx/hal_lld.h
@@ -910,6 +910,26 @@
 #error "Using a wrong mcuconf.h file, STM32F756_MCUCONF not defined"

 #endif

 

+#if defined(STM32F765xx) && !defined(STM32F765_MCUCONF)

+#error "Using a wrong mcuconf.h file, STM32F765_MCUCONF not defined"

+#endif

+

+#if defined(STM32F767xx) && !defined(STM32F767_MCUCONF)

+#error "Using a wrong mcuconf.h file, STM32F767_MCUCONF not defined"

+#endif

+

+#if defined(STM32F777xx) && !defined(STM32F777_MCUCONF)

+#error "Using a wrong mcuconf.h file, STM32F777_MCUCONF not defined"

+#endif

+

+#if defined(STM32F769xx) && !defined(STM32F769_MCUCONF)

+#error "Using a wrong mcuconf.h file, STM32F769_MCUCONF not defined"

+#endif

+

+#if defined(STM32F779xx) && !defined(STM32F779_MCUCONF)

+#error "Using a wrong mcuconf.h file, STM32F779_MCUCONF not defined"

+#endif

+

 /*

  * Board file checks.

  */

diff --git a/readme.txt b/readme.txt
index 4423da9aa..042a7b940 100644
--- a/readme.txt
+++ b/readme.txt
@@ -88,7 +88,7 @@
 - NEW: Independent TRNG driver model added to HAL.

 - NEW: Added a new "pipes" subsystem to the OS library.

 - NEW: Added mcuconf.h generators for STM32L432xx, STM32L476xx, STM32L496xx,

-       STM32L4R5xx and STM32F746/756 devices.

+       STM32L4R5xx, STM32F746/756 and STM32F76x/77x devices.

 - NEW: Added demo for STM32L496ZG-Nucleo144 and STM32L4R5ZI-Nucleo144 boards.

 - NEW: Modified USARTv2 to support HW FIFOs where present.

 - NEW: STM32 DMAv1, ADCv3, DACv1, I2Cv2, SPIv2 and USARTv2 are now

diff --git a/tools/ftl/processors/conf/mcuconf_stm32f767xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32f76xxx/mcuconf.h.ftl
index 042a9687e..c306fab16 100644
--- a/tools/ftl/processors/conf/mcuconf_stm32f767xx/mcuconf.h.ftl
+++ b/tools/ftl/processors/conf/mcuconf_stm32f76xxx/mcuconf.h.ftl
@@ -43,8 +43,11 @@
  */

 

 #define STM32F7xx_MCUCONF

-#define STM32F746_MCUCONF

-#define STM32F756_MCUCONF

+#define STM32F765_MCUCONF

+#define STM32F767_MCUCONF

+#define STM32F777_MCUCONF

+#define STM32F769_MCUCONF

+#define STM32F779_MCUCONF

 

 /*

  * HAL driver system settings.

@@ -104,6 +107,7 @@
 #define STM32_CECSEL                        ${doc.STM32_CECSEL!"STM32_CECSEL_LSE"}

 #define STM32_CK48MSEL                      ${doc.STM32_CK48MSEL!"STM32_CK48MSEL_PLL"}

 #define STM32_SDMMC1SEL                     ${doc.STM32_SDMMC1SEL!"STM32_SDMMC1SEL_PLL48CLK"}

+#define STM32_SDMMC2SEL                     ${doc.STM32_SDMMC2SEL!"STM32_SDMMC2SEL_PLL48CLK"}

 #define STM32_SRAM2_NOCACHE                 ${doc.STM32_SRAM2_NOCACHE!"FALSE"}

 

 /*

@@ -271,13 +275,17 @@
  * SDC driver system settings.

  */

 #define STM32_SDC_USE_SDMMC1                ${doc.STM32_SDC_USE_SDMMC1!"FALSE"}

+#define STM32_SDC_USE_SDMMC2                ${doc.STM32_SDC_USE_SDMMC2!"FALSE"}

 #define STM32_SDC_SDMMC_UNALIGNED_SUPPORT   ${doc.STM32_SDC_SDMMC_UNALIGNED_SUPPORT!"TRUE"}

 #define STM32_SDC_SDMMC_WRITE_TIMEOUT       ${doc.STM32_SDC_SDMMC_WRITE_TIMEOUT!"1000"}

 #define STM32_SDC_SDMMC_READ_TIMEOUT        ${doc.STM32_SDC_SDMMC_READ_TIMEOUT!"1000"}

 #define STM32_SDC_SDMMC_CLOCK_DELAY         ${doc.STM32_SDC_SDMMC_CLOCK_DELAY!"10"}

 #define STM32_SDC_SDMMC1_DMA_STREAM         ${doc.STM32_SDC_SDMMC1_DMA_STREAM!"STM32_DMA_STREAM_ID(2, 3)"}

+#define STM32_SDC_SDMMC2_DMA_STREAM         ${doc.STM32_SDC_SDMMC2_DMA_STREAM!"STM32_DMA_STREAM_ID(2, 0)"}

 #define STM32_SDC_SDMMC1_DMA_PRIORITY       ${doc.STM32_SDC_SDMMC1_DMA_PRIORITY!"3"}

+#define STM32_SDC_SDMMC2_DMA_PRIORITY       ${doc.STM32_SDC_SDMMC2_DMA_PRIORITY!"3"}

 #define STM32_SDC_SDMMC1_IRQ_PRIORITY       ${doc.STM32_SDC_SDMMC1_IRQ_PRIORITY!"9"}

+#define STM32_SDC_SDMMC2_IRQ_PRIORITY       ${doc.STM32_SDC_SDMMC2_IRQ_PRIORITY!"9"}

 

 /*

  * SERIAL driver system settings.