From 5ad3d2426f44f13439baf3f7f9de7fb9ddf1c00c Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sat, 6 Oct 2018 04:48:41 +0000
Subject: Removed references to QSPI to most configuration files, more to do.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12330 110e8d01-0319-4d1e-a829-52ad28d1bb01
---
 tools/ftl/processors/conf/halconf/halconf.h.ftl    | 27 ----------------------
 .../conf/mcuconf_stm32l432xx/mcuconf.h.ftl         | 12 +++++-----
 .../conf/mcuconf_stm32l476xx/mcuconf.h.ftl         | 12 +++++-----
 .../conf/mcuconf_stm32l496xx/mcuconf.h.ftl         | 12 +++++-----
 4 files changed, 18 insertions(+), 45 deletions(-)

(limited to 'tools')

diff --git a/tools/ftl/processors/conf/halconf/halconf.h.ftl b/tools/ftl/processors/conf/halconf/halconf.h.ftl
index 8e2af71e5..c4d0192b2 100644
--- a/tools/ftl/processors/conf/halconf/halconf.h.ftl
+++ b/tools/ftl/processors/conf/halconf/halconf.h.ftl
@@ -135,13 +135,6 @@
 #define HAL_USE_PWM                         ${doc.HAL_USE_PWM!"FALSE"}
 #endif
 
-/**
- * @brief   Enables the QSPI subsystem.
- */
-#if !defined(HAL_USE_QSPI) || defined(__DOXYGEN__)
-#define HAL_USE_QSPI                        ${doc.HAL_USE_QSPI!"FALSE"}
-#endif
-
 /**
  * @brief   Enables the RTC subsystem.
  */
@@ -364,26 +357,6 @@
 #define MMC_NICE_WAITING                    ${doc.MMC_NICE_WAITING!"TRUE"}
 #endif
 
-/*===========================================================================*/
-/* QSPI driver related settings.                                             */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(QSPI_USE_WAIT) || defined(__DOXYGEN__)
-#define QSPI_USE_WAIT                       ${doc.QSPI_USE_WAIT!"TRUE"}
-#endif
-
-/**
- * @brief   Enables the @p qspiAcquireBus() and @p qspiReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(QSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define QSPI_USE_MUTUAL_EXCLUSION           ${doc.QSPI_USE_MUTUAL_EXCLUSION!"TRUE"}
-#endif
-
 /*===========================================================================*/
 /* SDC driver related settings.                                              */
 /*===========================================================================*/
diff --git a/tools/ftl/processors/conf/mcuconf_stm32l432xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32l432xx/mcuconf.h.ftl
index 8f4d9476e..dd22456f5 100644
--- a/tools/ftl/processors/conf/mcuconf_stm32l432xx/mcuconf.h.ftl
+++ b/tools/ftl/processors/conf/mcuconf_stm32l432xx/mcuconf.h.ftl
@@ -188,12 +188,6 @@
 #define STM32_PWM_TIM1_IRQ_PRIORITY         ${doc.STM32_PWM_TIM1_IRQ_PRIORITY!"7"}
 #define STM32_PWM_TIM2_IRQ_PRIORITY         ${doc.STM32_PWM_TIM2_IRQ_PRIORITY!"7"}
 
-/*
- * QSPI driver system settings.
- */
-#define STM32_QSPI_USE_QUADSPI1             ${doc.STM32_QSPI_USE_QUADSPI1!"FALSE"}
-#define STM32_QSPI_QUADSPI1_DMA_STREAM      ${doc.STM32_QSPI_QUADSPI1_DMA_STREAM!"STM32_DMA_STREAM_ID(2, 7)"}
-
 /*
  * SERIAL driver system settings.
  */
@@ -253,4 +247,10 @@
  */
 #define STM32_WDG_USE_IWDG                  ${doc.STM32_WDG_USE_IWDG!"FALSE"}
 
+/*
+ * WSPI driver system settings.
+ */
+#define STM32_WSPI_USE_QUADSPI1             ${doc.STM32_WSPI_USE_QUADSPI1!"FALSE"}
+#define STM32_WSPI_QUADSPI1_DMA_STREAM      ${doc.STM32_WSPI_QUADSPI1_DMA_STREAM!"STM32_DMA_STREAM_ID(2, 7)"}
+
 #endif /* MCUCONF_H */
diff --git a/tools/ftl/processors/conf/mcuconf_stm32l476xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32l476xx/mcuconf.h.ftl
index c6a1dbfba..550c1088c 100644
--- a/tools/ftl/processors/conf/mcuconf_stm32l476xx/mcuconf.h.ftl
+++ b/tools/ftl/processors/conf/mcuconf_stm32l476xx/mcuconf.h.ftl
@@ -233,12 +233,6 @@
 #define STM32_PWM_TIM5_IRQ_PRIORITY         ${doc.STM32_PWM_TIM5_IRQ_PRIORITY!"7"}
 #define STM32_PWM_TIM8_IRQ_PRIORITY         ${doc.STM32_PWM_TIM8_IRQ_PRIORITY!"7"}
 
-/*
- * QSPI driver system settings.
- */
-#define STM32_QSPI_USE_QUADSPI1             ${doc.STM32_QSPI_USE_QUADSPI1!"FALSE"}
-#define STM32_QSPI_QUADSPI1_DMA_STREAM      ${doc.STM32_QSPI_QUADSPI1_DMA_STREAM!"STM32_DMA_STREAM_ID(2, 7)"}
-
 /*
  * SDC driver system settings.
  */
@@ -335,4 +329,10 @@
  */
 #define STM32_WDG_USE_IWDG                  ${doc.STM32_WDG_USE_IWDG!"FALSE"}
 
+/*
+ * WSPI driver system settings.
+ */
+#define STM32_WSPI_USE_QUADSPI1             ${doc.STM32_WSPI_USE_QUADSPI1!"FALSE"}
+#define STM32_WSPI_QUADSPI1_DMA_STREAM      ${doc.STM32_WSPI_QUADSPI1_DMA_STREAM!"STM32_DMA_STREAM_ID(2, 7)"}
+
 #endif /* MCUCONF_H */
diff --git a/tools/ftl/processors/conf/mcuconf_stm32l496xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32l496xx/mcuconf.h.ftl
index 814977ce3..5948b926a 100644
--- a/tools/ftl/processors/conf/mcuconf_stm32l496xx/mcuconf.h.ftl
+++ b/tools/ftl/processors/conf/mcuconf_stm32l496xx/mcuconf.h.ftl
@@ -238,12 +238,6 @@
 #define STM32_PWM_TIM5_IRQ_PRIORITY         ${doc.STM32_PWM_TIM5_IRQ_PRIORITY!"7"}
 #define STM32_PWM_TIM8_IRQ_PRIORITY         ${doc.STM32_PWM_TIM8_IRQ_PRIORITY!"7"}
 
-/*
- * QSPI driver system settings.
- */
-#define STM32_QSPI_USE_QUADSPI1             ${doc.STM32_QSPI_USE_QUADSPI1!"FALSE"}
-#define STM32_QSPI_QUADSPI1_DMA_STREAM      ${doc.STM32_QSPI_QUADSPI1_DMA_STREAM!"STM32_DMA_STREAM_ID(2, 7)"}
-
 /*
  * SDC driver system settings.
  */
@@ -340,4 +334,10 @@
  */
 #define STM32_WDG_USE_IWDG                  ${doc.STM32_WDG_USE_IWDG!"FALSE"}
 
+/*
+ * WSPI driver system settings.
+ */
+#define STM32_WSPI_USE_QUADSPI1             ${doc.STM32_WSPI_USE_QUADSPI1!"FALSE"}
+#define STM32_WSPI_QUADSPI1_DMA_STREAM      ${doc.STM32_WSPI_QUADSPI1_DMA_STREAM!"STM32_DMA_STREAM_ID(2, 7)"}
+
 #endif /* MCUCONF_H */
-- 
cgit v1.2.3