Browse Source

Merge pull request #2507 from qgyhd1234/fal

[BSP]Modify the fal_cfg.h to support spi flash
Bernard Xiong 6 years ago
parent
commit
4bdbb5c24d
1 changed files with 40 additions and 5 deletions
  1. 40 5
      bsp/stm32/stm32l475-atk-pandora/board/ports/fal_cfg.h

+ 40 - 5
bsp/stm32/stm32l475-atk-pandora/board/ports/fal_cfg.h

@@ -14,21 +14,56 @@
 #include <rtthread.h>
 #include <board.h>
 
+#if defined(BSP_USING_ON_CHIP_FLASH)
 extern const struct fal_flash_dev stm32_onchip_flash;
+#endif /* BSP_USING_ON_CHIP_FLASH */
+
+#if defined(BSP_USING_QSPI_FLASH)
+extern struct fal_flash_dev nor_flash0;
+#endif /* BSP_USING_QSPI_FLASH */
+
+/* ========================= Device Configuration ========================== */
+#ifdef BSP_USING_ON_CHIP_FLASH
+#define ONCHIP_FLASH_DEV     &stm32_onchip_flash,  
+#else
+#define ONCHIP_FLASH_DEV    
+#endif /* BSP_USING_ON_CHIP_FLASH */
+
+#ifdef BSP_USING_QSPI_FLASH
+#define SPI_FLASH_DEV        &nor_flash0,  
+#else
+#define SPI_FLASH_DEV    
+#endif /* BSP_USING_QSPI_FLASH */
 
 /* flash device table */
 #define FAL_FLASH_DEV_TABLE                                          \
 {                                                                    \
-    &stm32_onchip_flash,                                             \
+    ONCHIP_FLASH_DEV                                                 \
+    SPI_FLASH_DEV                                                    \
 }
+
 /* ====================== Partition Configuration ========================== */
 #ifdef FAL_PART_HAS_TABLE_CFG
 
+#ifdef BSP_USING_ON_CHIP_FLASH
+#define ONCHIP_FLASH_PATITION          {FAL_PART_MAGIC_WROD, "app",   "onchip_flash",   0,           496 * 1024, 0},      \
+                                       {FAL_PART_MAGIC_WROD, "param", "onchip_flash",   496* 1024,   16 * 1024,  0},
+#else
+#define ONCHIP_FLASH_PATITION
+#endif
+
+#ifdef BSP_USING_QSPI_FLASH
+#define SPI_FLASH_PARTITION            {FAL_PART_MAGIC_WROD, "filesystem", "W25Q128", 9 * 1024 * 1024, 16 * 1024 * 1024, 0},
+#else
+#define SPI_FLASH_PARTITION 
+#endif
+
 /* partition table */
-#define FAL_PART_TABLE                                                            \
-{                                                                                 \
-    {FAL_PART_MAGIC_WROD, "app",   "onchip_flash",   0,           496 * 1024, 0}, \
-    {FAL_PART_MAGIC_WROD, "param", "onchip_flash",   496* 1024,   16 * 1024,  0}, \
+#define FAL_PART_TABLE                                               \
+{                                                                    \
+    ONCHIP_FLASH_PATITION                                            \
+    SPI_FLASH_PARTITION                                              \
 }
 #endif /* FAL_PART_HAS_TABLE_CFG */
+
 #endif /* _FAL_CFG_H_ */