Merge pull request #205 from ChibiOS/fsmc

FSMC drivers update

39 files changed, 312 insertions, 147 deletions

diff --git a/testhal/STM32/STM32F0xx/COMP/halconf_community.h b/testhal/STM32/STM32F0xx/COMP/halconf_community.h
index 76d4856..3279b50 100644
--- a/testhal/STM32/STM32F0xx/COMP/halconf_community.h
+++ b/testhal/STM32/STM32F0xx/COMP/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F0xx/COMP/mcuconf_community.h b/testhal/STM32/STM32F0xx/COMP/mcuconf_community.h
index 1be93a6..0af8b15 100644
--- a/testhal/STM32/STM32F0xx/COMP/mcuconf_community.h
+++ b/testhal/STM32/STM32F0xx/COMP/mcuconf_community.h
@@ -23,8 +23,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1           FALSE
+#define STM32_NAND_USE_NAND2           FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
diff --git a/testhal/STM32/STM32F0xx/crc/halconf_community.h b/testhal/STM32/STM32F0xx/crc/halconf_community.h
index 91233ed..ad52c4b 100644
--- a/testhal/STM32/STM32F0xx/crc/halconf_community.h
+++ b/testhal/STM32/STM32F0xx/crc/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F0xx/crc/mcuconf_community.h b/testhal/STM32/STM32F0xx/crc/mcuconf_community.h
index 1ebe24c..3b9709a 100644
--- a/testhal/STM32/STM32F0xx/crc/mcuconf_community.h
+++ b/testhal/STM32/STM32F0xx/crc/mcuconf_community.h
@@ -23,8 +23,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1           FALSE
+#define STM32_NAND_USE_NAND2           FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
diff --git a/testhal/STM32/STM32F0xx/onewire/halconf_community.h b/testhal/STM32/STM32F0xx/onewire/halconf_community.h
index df56d7e..42bdd72 100644
--- a/testhal/STM32/STM32F0xx/onewire/halconf_community.h
+++ b/testhal/STM32/STM32F0xx/onewire/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F0xx/onewire/mcuconf_community.h b/testhal/STM32/STM32F0xx/onewire/mcuconf_community.h
index 1ebe24c..3b9709a 100644
--- a/testhal/STM32/STM32F0xx/onewire/mcuconf_community.h
+++ b/testhal/STM32/STM32F0xx/onewire/mcuconf_community.h
@@ -23,8 +23,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1           FALSE
+#define STM32_NAND_USE_NAND2           FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
diff --git a/testhal/STM32/STM32F0xx/qei/halconf_community.h b/testhal/STM32/STM32F0xx/qei/halconf_community.h
index 14fb2ca..2017e79 100644
--- a/testhal/STM32/STM32F0xx/qei/halconf_community.h
+++ b/testhal/STM32/STM32F0xx/qei/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F0xx/qei/mcuconf_community.h b/testhal/STM32/STM32F0xx/qei/mcuconf_community.h
index 1ebe24c..3b9709a 100644
--- a/testhal/STM32/STM32F0xx/qei/mcuconf_community.h
+++ b/testhal/STM32/STM32F0xx/qei/mcuconf_community.h
@@ -23,8 +23,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1           FALSE
+#define STM32_NAND_USE_NAND2           FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
diff --git a/testhal/STM32/STM32F1xx/onewire/halconf_community.h b/testhal/STM32/STM32F1xx/onewire/halconf_community.h
index df56d7e..42bdd72 100644
--- a/testhal/STM32/STM32F1xx/onewire/halconf_community.h
+++ b/testhal/STM32/STM32F1xx/onewire/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F1xx/onewire/mcuconf_community.h b/testhal/STM32/STM32F1xx/onewire/mcuconf_community.h
index 1ebe24c..3b9709a 100644
--- a/testhal/STM32/STM32F1xx/onewire/mcuconf_community.h
+++ b/testhal/STM32/STM32F1xx/onewire/mcuconf_community.h
@@ -23,8 +23,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1           FALSE
+#define STM32_NAND_USE_NAND2           FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
diff --git a/testhal/STM32/STM32F1xx/qei/halconf_community.h b/testhal/STM32/STM32F1xx/qei/halconf_community.h
index 14fb2ca..2017e79 100644
--- a/testhal/STM32/STM32F1xx/qei/halconf_community.h
+++ b/testhal/STM32/STM32F1xx/qei/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F1xx/qei/mcuconf_community.h b/testhal/STM32/STM32F1xx/qei/mcuconf_community.h
index 1ebe24c..3b9709a 100644
--- a/testhal/STM32/STM32F1xx/qei/mcuconf_community.h
+++ b/testhal/STM32/STM32F1xx/qei/mcuconf_community.h
@@ -23,8 +23,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1           FALSE
+#define STM32_NAND_USE_NAND2           FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
diff --git a/testhal/STM32/STM32F3xx/COMP/halconf_community.h b/testhal/STM32/STM32F3xx/COMP/halconf_community.h
index 76d4856..3279b50 100644
--- a/testhal/STM32/STM32F3xx/COMP/halconf_community.h
+++ b/testhal/STM32/STM32F3xx/COMP/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F3xx/COMP/mcuconf_community.h b/testhal/STM32/STM32F3xx/COMP/mcuconf_community.h
index 1ebe24c..3b9709a 100644
--- a/testhal/STM32/STM32F3xx/COMP/mcuconf_community.h
+++ b/testhal/STM32/STM32F3xx/COMP/mcuconf_community.h
@@ -23,8 +23,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1           FALSE
+#define STM32_NAND_USE_NAND2           FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
diff --git a/testhal/STM32/STM32F3xx/EEProm/halconf_community.h b/testhal/STM32/STM32F3xx/EEProm/halconf_community.h
index 75035b3..2f4cf60 100644
--- a/testhal/STM32/STM32F3xx/EEProm/halconf_community.h
+++ b/testhal/STM32/STM32F3xx/EEProm/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F3xx/EEProm/mcuconf_community.h b/testhal/STM32/STM32F3xx/EEProm/mcuconf_community.h
index 1ebe24c..3b9709a 100644
--- a/testhal/STM32/STM32F3xx/EEProm/mcuconf_community.h
+++ b/testhal/STM32/STM32F3xx/EEProm/mcuconf_community.h
@@ -23,8 +23,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1           FALSE
+#define STM32_NAND_USE_NAND2           FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
diff --git a/testhal/STM32/STM32F3xx/OPAMP/halconf_community.h b/testhal/STM32/STM32F3xx/OPAMP/halconf_community.h
index 41bc0df..d56022f 100644
--- a/testhal/STM32/STM32F3xx/OPAMP/halconf_community.h
+++ b/testhal/STM32/STM32F3xx/OPAMP/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F3xx/OPAMP/mcuconf_community.h b/testhal/STM32/STM32F3xx/OPAMP/mcuconf_community.h
index b862d6e..d62e390 100644
--- a/testhal/STM32/STM32F3xx/OPAMP/mcuconf_community.h
+++ b/testhal/STM32/STM32F3xx/OPAMP/mcuconf_community.h
@@ -23,8 +23,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1           FALSE
+#define STM32_NAND_USE_NAND2           FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
diff --git a/testhal/STM32/STM32F3xx/TIMCAP/halconf_community.h b/testhal/STM32/STM32F3xx/TIMCAP/halconf_community.h
index dbd6deb..2ef054b 100644
--- a/testhal/STM32/STM32F3xx/TIMCAP/halconf_community.h
+++ b/testhal/STM32/STM32F3xx/TIMCAP/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F3xx/TIMCAP/mcuconf_community.h b/testhal/STM32/STM32F3xx/TIMCAP/mcuconf_community.h
index a462bae..822b972 100644
--- a/testhal/STM32/STM32F3xx/TIMCAP/mcuconf_community.h
+++ b/testhal/STM32/STM32F3xx/TIMCAP/mcuconf_community.h
@@ -23,8 +23,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1           FALSE
+#define STM32_NAND_USE_NAND2           FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
diff --git a/testhal/STM32/STM32F4xx/EICU/halconf_community.h b/testhal/STM32/STM32F4xx/EICU/halconf_community.h
index f5cb75e..007550c 100644
--- a/testhal/STM32/STM32F4xx/EICU/halconf_community.h
+++ b/testhal/STM32/STM32F4xx/EICU/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F4xx/EICU/mcuconf_community.h b/testhal/STM32/STM32F4xx/EICU/mcuconf_community.h
index 36e182b..c6b0466 100644
--- a/testhal/STM32/STM32F4xx/EICU/mcuconf_community.h
+++ b/testhal/STM32/STM32F4xx/EICU/mcuconf_community.h
@@ -23,8 +23,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1           FALSE
+#define STM32_NAND_USE_NAND2           FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/halconf_community.h b/testhal/STM32/STM32F4xx/FSMC_NAND/halconf_community.h
index 20fd46c..a72fba8 100644
--- a/testhal/STM32/STM32F4xx/FSMC_NAND/halconf_community.h
+++ b/testhal/STM32/STM32F4xx/FSMC_NAND/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/main.c b/testhal/STM32/STM32F4xx/FSMC_NAND/main.c
index 73c9cb3..c4e2324 100644
--- a/testhal/STM32/STM32F4xx/FSMC_NAND/main.c
+++ b/testhal/STM32/STM32F4xx/FSMC_NAND/main.c
@@ -78,9 +78,9 @@
 #define NAND_TEST_KILL_BLOCK      8000
 #endif
 
-#if STM32_NAND_USE_FSMC_NAND1
+#if STM32_NAND_USE_NAND1
   #define NAND                    NANDD1
-#elif STM32_NAND_USE_FSMC_NAND2
+#elif STM32_NAND_USE_NAND2
   #define NAND                    NANDD2
 #else
 #error "You should enable at least one NAND interface"
diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/mcuconf_community.h b/testhal/STM32/STM32F4xx/FSMC_NAND/mcuconf_community.h
index 108d84c..0a5db9b 100644
--- a/testhal/STM32/STM32F4xx/FSMC_NAND/mcuconf_community.h
+++ b/testhal/STM32/STM32F4xx/FSMC_NAND/mcuconf_community.h
@@ -24,8 +24,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           TRUE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1                TRUE
+#define STM32_NAND_USE_NAND2                FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
@@ -34,19 +34,16 @@
 /*
  * FSMC SRAM driver system settings.
  */
-#define STM32_USE_FSMC_SRAM                 FALSE
-#define STM32_SRAM_USE_FSMC_SRAM1           FALSE
-#define STM32_SRAM_USE_FSMC_SRAM2           FALSE
-#define STM32_SRAM_USE_FSMC_SRAM3           FALSE
-#define STM32_SRAM_USE_FSMC_SRAM4           FALSE
+#define STM32_SRAM_USE_SRAM1                FALSE
+#define STM32_SRAM_USE_SRAM2                FALSE
+#define STM32_SRAM_USE_SRAM3                FALSE
+#define STM32_SRAM_USE_SRAM4                FALSE
 
 /*
  * FSMC SDRAM driver system settings.
  */
-#define STM32_USE_FSMC_SDRAM                FALSE
-#define STM32_SDRAM_USE_FSMC_SDRAM1         FALSE
-#define STM32_SDRAM_USE_FSMC_SDRAM2         TRUE
-
+#define STM32_SDRAM_USE_SDRAM1              FALSE
+#define STM32_SDRAM_USE_SDRAM2              FALSE
 /*
  * TIMCAP driver system settings.
  */
diff --git a/testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf_community.h b/testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf_community.h
index da9c607..51524e1 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf_community.h
+++ b/testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               TRUE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F4xx/FSMC_SDRAM/main.c b/testhal/STM32/STM32F4xx/FSMC_SDRAM/main.c
index 1ec34d2..0d3feee 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SDRAM/main.c
+++ b/testhal/STM32/STM32F4xx/FSMC_SDRAM/main.c
@@ -23,7 +23,6 @@
 
 #include "string.h"
 
-#include "hal_fsmc_sdram.h"
 #include "membench.h"
 #include "memtest.h"
 
@@ -33,84 +32,6 @@
  ******************************************************************************
  */
 
-/*
- *  FMC SDRAM Mode definition register defines
- */
-#define FMC_SDCMR_MRD_BURST_LENGTH_1             ((uint16_t)0x0000)
-#define FMC_SDCMR_MRD_BURST_LENGTH_2             ((uint16_t)0x0001)
-#define FMC_SDCMR_MRD_BURST_LENGTH_4             ((uint16_t)0x0002)
-#define FMC_SDCMR_MRD_BURST_LENGTH_8             ((uint16_t)0x0004)
-#define FMC_SDCMR_MRD_BURST_TYPE_SEQUENTIAL      ((uint16_t)0x0000)
-#define FMC_SDCMR_MRD_BURST_TYPE_INTERLEAVED     ((uint16_t)0x0008)
-#define FMC_SDCMR_MRD_CAS_LATENCY_2              ((uint16_t)0x0020)
-#define FMC_SDCMR_MRD_CAS_LATENCY_3              ((uint16_t)0x0030)
-#define FMC_SDCMR_MRD_OPERATING_MODE_STANDARD    ((uint16_t)0x0000)
-#define FMC_SDCMR_MRD_WRITEBURST_MODE_PROGRAMMED ((uint16_t)0x0000)
-#define FMC_SDCMR_MRD_WRITEBURST_MODE_SINGLE     ((uint16_t)0x0200)
-
-/*
- * FMC_ReadPipe_Delay
- */
-#define FMC_ReadPipe_Delay_0               ((uint32_t)0x00000000)
-#define FMC_ReadPipe_Delay_1               ((uint32_t)0x00002000)
-#define FMC_ReadPipe_Delay_2               ((uint32_t)0x00004000)
-#define FMC_ReadPipe_Delay_Mask            ((uint32_t)0x00006000)
-
-/*
- * FMC_Read_Burst
- */
-#define FMC_Read_Burst_Disable             ((uint32_t)0x00000000)
-#define FMC_Read_Burst_Enable              ((uint32_t)0x00001000)
-#define FMC_Read_Burst_Mask                ((uint32_t)0x00001000)
-
-/*
- * FMC_SDClock_Period
- */
-#define FMC_SDClock_Disable                ((uint32_t)0x00000000)
-#define FMC_SDClock_Period_2               ((uint32_t)0x00000800)
-#define FMC_SDClock_Period_3               ((uint32_t)0x00000C00)
-#define FMC_SDClock_Period_Mask            ((uint32_t)0x00000C00)
-
-/*
- * FMC_ColumnBits_Number
- */
-#define FMC_ColumnBits_Number_8b           ((uint32_t)0x00000000)
-#define FMC_ColumnBits_Number_9b           ((uint32_t)0x00000001)
-#define FMC_ColumnBits_Number_10b          ((uint32_t)0x00000002)
-#define FMC_ColumnBits_Number_11b          ((uint32_t)0x00000003)
-
-/*
- * FMC_RowBits_Number
- */
-#define FMC_RowBits_Number_11b             ((uint32_t)0x00000000)
-#define FMC_RowBits_Number_12b             ((uint32_t)0x00000004)
-#define FMC_RowBits_Number_13b             ((uint32_t)0x00000008)
-
-/*
- * FMC_SDMemory_Data_Width
- */
-#define FMC_SDMemory_Width_8b                ((uint32_t)0x00000000)
-#define FMC_SDMemory_Width_16b               ((uint32_t)0x00000010)
-#define FMC_SDMemory_Width_32b               ((uint32_t)0x00000020)
-
-/*
- * FMC_InternalBank_Number
- */
-#define FMC_InternalBank_Number_2          ((uint32_t)0x00000000)
-#define FMC_InternalBank_Number_4          ((uint32_t)0x00000040)
-
-/*
- * FMC_CAS_Latency
- */
-#define FMC_CAS_Latency_1                  ((uint32_t)0x00000080)
-#define FMC_CAS_Latency_2                  ((uint32_t)0x00000100)
-#define FMC_CAS_Latency_3                  ((uint32_t)0x00000180)
-
-/*
- * FMC_Write_Protection
- */
-#define FMC_Write_Protection_Disable       ((uint32_t)0x00000000)
-#define FMC_Write_Protection_Enable        ((uint32_t)0x00000200)
 
 #define SDRAM_SIZE       (8 * 1024 * 1024)
 #define SDRAM_START      ((void *)FSMC_Bank6_MAP_BASE)
@@ -262,8 +183,8 @@ int main(void) {
   halInit();
   chSysInit();
 
-  fsmcSdramInit();
-  fsmcSdramStart(&SDRAMD, &sdram_cfg);
+  sdramInit();
+  sdramStart(&SDRAMD1, &sdram_cfg);
 
   membench();
   memtest();
diff --git a/testhal/STM32/STM32F4xx/FSMC_SDRAM/mcuconf_community.h b/testhal/STM32/STM32F4xx/FSMC_SDRAM/mcuconf_community.h
index c8d995f..4e08dfe 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SDRAM/mcuconf_community.h
+++ b/testhal/STM32/STM32F4xx/FSMC_SDRAM/mcuconf_community.h
@@ -26,8 +26,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1                FALSE
+#define STM32_NAND_USE_NAND2                FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
@@ -36,18 +36,16 @@
 /*
  * FSMC SRAM driver system settings.
  */
-#define STM32_USE_FSMC_SRAM                 FALSE
-#define STM32_SRAM_USE_FSMC_SRAM1           FALSE
-#define STM32_SRAM_USE_FSMC_SRAM2           FALSE
-#define STM32_SRAM_USE_FSMC_SRAM3           FALSE
-#define STM32_SRAM_USE_FSMC_SRAM4           FALSE
+#define STM32_SRAM_USE_SRAM1                FALSE
+#define STM32_SRAM_USE_SRAM2                FALSE
+#define STM32_SRAM_USE_SRAM3                FALSE
+#define STM32_SRAM_USE_SRAM4                FALSE
 
 /*
  * FSMC SDRAM driver system settings.
  */
-#define STM32_USE_FSMC_SDRAM                TRUE
-#define STM32_SDRAM_USE_FSMC_SDRAM1         FALSE
-#define STM32_SDRAM_USE_FSMC_SDRAM2         TRUE
+#define STM32_SDRAM_USE_SDRAM1              FALSE
+#define STM32_SDRAM_USE_SDRAM2              TRUE
 
 /*
  * TIMCAP driver system settings.
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/halconf_community.h b/testhal/STM32/STM32F4xx/FSMC_SRAM/halconf_community.h
index da9c607..a19553b 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SRAM/halconf_community.h
+++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                TRUE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/main.c b/testhal/STM32/STM32F4xx/FSMC_SRAM/main.c
index c94bd73..4bd94f8 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SRAM/main.c
+++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/main.c
@@ -17,7 +17,6 @@
 #include "ch.h"
 #include "hal.h"
 
-#include "hal_fsmc_sram.h"
 #include "membench.h"
 #include "memtest.h"
 
@@ -173,8 +172,8 @@ int main(void) {
   halInit();
   chSysInit();
 
-  fsmcSramInit();
-  fsmcSramStart(&SRAMD4, &sram_cfg);
+  sramInit();
+  sramStart(&SRAMD4, &sram_cfg);
 
   membench();
   memtest();
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/mcuconf_community.h b/testhal/STM32/STM32F4xx/FSMC_SRAM/mcuconf_community.h
index 317fe5d..b601a5f 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SRAM/mcuconf_community.h
+++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/mcuconf_community.h
@@ -26,8 +26,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1                FALSE
+#define STM32_NAND_USE_NAND2                FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
@@ -36,18 +36,16 @@
 /*
  * FSMC SRAM driver system settings.
  */
-#define STM32_USE_FSMC_SRAM                 TRUE
-#define STM32_SRAM_USE_FSMC_SRAM1           FALSE
-#define STM32_SRAM_USE_FSMC_SRAM2           FALSE
-#define STM32_SRAM_USE_FSMC_SRAM3           FALSE
-#define STM32_SRAM_USE_FSMC_SRAM4           TRUE
+#define STM32_SRAM_USE_SRAM1                FALSE
+#define STM32_SRAM_USE_SRAM2                FALSE
+#define STM32_SRAM_USE_SRAM3                FALSE
+#define STM32_SRAM_USE_SRAM4                TRUE
 
 /*
  * FSMC SDRAM driver system settings.
  */
-#define STM32_USE_FSMC_SDRAM                FALSE
-#define STM32_SDRAM_USE_FSMC_SDRAM1         FALSE
-#define STM32_SDRAM_USE_FSMC_SDRAM2         TRUE
+#define STM32_SDRAM_USE_SDRAM1              FALSE
+#define STM32_SDRAM_USE_SDRAM2              FALSE
 
 /*
  * TIMCAP driver system settings.
diff --git a/testhal/STM32/STM32F4xx/USB_HOST/halconf_community.h b/testhal/STM32/STM32F4xx/USB_HOST/halconf_community.h
index c76d1ef..60452b8 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/halconf_community.h
+++ b/testhal/STM32/STM32F4xx/USB_HOST/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F4xx/USB_HOST/mcuconf_community.h b/testhal/STM32/STM32F4xx/USB_HOST/mcuconf_community.h
index 1ebe24c..3b9709a 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/mcuconf_community.h
+++ b/testhal/STM32/STM32F4xx/USB_HOST/mcuconf_community.h
@@ -23,8 +23,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1           FALSE
+#define STM32_NAND_USE_NAND2           FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
diff --git a/testhal/STM32/STM32F4xx/onewire/halconf_community.h b/testhal/STM32/STM32F4xx/onewire/halconf_community.h
index df56d7e..42bdd72 100644
--- a/testhal/STM32/STM32F4xx/onewire/halconf_community.h
+++ b/testhal/STM32/STM32F4xx/onewire/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F4xx/onewire/mcuconf_community.h b/testhal/STM32/STM32F4xx/onewire/mcuconf_community.h
index 1ebe24c..3b9709a 100644
--- a/testhal/STM32/STM32F4xx/onewire/mcuconf_community.h
+++ b/testhal/STM32/STM32F4xx/onewire/mcuconf_community.h
@@ -23,8 +23,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1           FALSE
+#define STM32_NAND_USE_NAND2           FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
diff --git a/testhal/STM32/STM32F7xx/USB_MSD/halconf_community.h b/testhal/STM32/STM32F7xx/USB_MSD/halconf_community.h
index 32d0271..6e804ec 100644
--- a/testhal/STM32/STM32F7xx/USB_MSD/halconf_community.h
+++ b/testhal/STM32/STM32F7xx/USB_MSD/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32F7xx/USB_MSD/mcuconf_community.h b/testhal/STM32/STM32F7xx/USB_MSD/mcuconf_community.h
index 1ebe24c..3b9709a 100644
--- a/testhal/STM32/STM32F7xx/USB_MSD/mcuconf_community.h
+++ b/testhal/STM32/STM32F7xx/USB_MSD/mcuconf_community.h
@@ -23,8 +23,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1           FALSE
+#define STM32_NAND_USE_NAND2           FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0
diff --git a/testhal/STM32/STM32L0xx/COMP/halconf_community.h b/testhal/STM32/STM32L0xx/COMP/halconf_community.h
index 76d4856..3279b50 100644
--- a/testhal/STM32/STM32L0xx/COMP/halconf_community.h
+++ b/testhal/STM32/STM32L0xx/COMP/halconf_community.h
@@ -32,6 +32,20 @@
 #endif

 

 /**

+ * @brief   Enables the SDRAM subsystem.

+ */

+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SDRAM               FALSE

+#endif

+

+/**

+ * @brief   Enables the SRAM subsystem.

+ */

+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)

+#define HAL_USE_SRAM                FALSE

+#endif

+

+/**

  * @brief   Enables the NAND subsystem.

  */

 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)

diff --git a/testhal/STM32/STM32L0xx/COMP/mcuconf_community.h b/testhal/STM32/STM32L0xx/COMP/mcuconf_community.h
index 142ed57..e771876 100644
--- a/testhal/STM32/STM32L0xx/COMP/mcuconf_community.h
+++ b/testhal/STM32/STM32L0xx/COMP/mcuconf_community.h
@@ -23,8 +23,8 @@
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_FSMC_NAND1           FALSE
-#define STM32_NAND_USE_FSMC_NAND2           FALSE
+#define STM32_NAND_USE_NAND1           FALSE
+#define STM32_NAND_USE_NAND2           FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
 #define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
 #define STM32_NAND_DMA_PRIORITY             0