[bsp/stm32f407-lckfb-skystar] 天空星高配版的FLASH从GD25Q32升级为W25Q128 (#9108)

* -更新芯片型号和板子型号

* -天空星目前只有青春版（没有贴外部flash），高配版（有贴外部flash）正在生产，所贴的SPI FLASH 从GD25Q32升级为W25Q128。

bsp/stm32/stm32f407-lckfb-skystar/Kconfig

@@ -6,14 +6,14 @@ RTT_DIR := ../../..
 
 PKGS_DIR := packages
 
-config SOC_STM32F407ZG
+config SOC_STM32F407VE
     bool
     select SOC_SERIES_STM32F4
     select RT_USING_COMPONENTS_INIT
     select RT_USING_USER_MAIN
     default y
 
-config BOARD_STM32F407_SPARK
+config BOARD_STM32F407_LCKFB
     bool
     default y
 

bsp/stm32/stm32f407-lckfb-skystar/board/Kconfig

@@ -3,7 +3,7 @@ menu "Hardware Drivers Config"
 menu "Onboard Peripheral Drivers"
 
     config BSP_USING_SPI_FLASH
-        bool "Enable SPI FLASH (GD25Q32 spi1)"
+        bool "Enable SPI FLASH (W25Q128 spi1)"
         select BSP_USING_SPI
         select BSP_USING_SPI1
         select RT_USING_SFUD
@@ -29,7 +29,7 @@ menu "Onboard Peripheral Drivers"
             endif
 
             config BSP_USING_FLASH_FATFS
-                bool "Enable FAL filesystem partition base on GD25Q32"
+                bool "Enable FAL filesystem partition base on W25Q128"
                 select BSP_USING_FAL
                 default n
             if BSP_USING_FLASH_FATFS

bsp/stm32/stm32f407-lckfb-skystar/board/ports/fal/fal_cfg.h

@@ -24,13 +24,13 @@
 extern const struct fal_flash_dev stm32_onchip_flash_16k;
 extern const struct fal_flash_dev stm32_onchip_flash_64k;
 extern const struct fal_flash_dev stm32_onchip_flash_128k;
-extern struct fal_flash_dev gd25q32;
+extern struct fal_flash_dev w25q128;
 
 /* flash device table */
 #define FAL_FLASH_DEV_TABLE                                          \
 {                                                                    \
     &stm32_onchip_flash_128k,                                        \
-    &gd25q32,                                                        \
+    &w25q128,                                                        \
 }
 
 /* ====================== Partition Configuration ========================== */
@@ -39,9 +39,9 @@ extern struct fal_flash_dev gd25q32;
 {                                                                                                                   \
     {FAL_PART_MAGIC_WROD,        "app", "onchip_flash_128k",                            0,       384 * 1024, 0}, \
     {FAL_PART_MAGIC_WROD,      "param", "onchip_flash_128k",                   384 * 1024,       512 * 1024, 0}, \
-    {FAL_PART_MAGIC_WROD,  "easyflash",    "GD25Q32",                                   0,       512 * 1024, 0}, \
+    {FAL_PART_MAGIC_WROD,  "easyflash",    "W25Q128",                                   0,       512 * 1024, 0}, \
-    {FAL_PART_MAGIC_WROD,   "download",    "GD25Q32",                          512 * 1024,       512 * 1024, 0}, \
+    {FAL_PART_MAGIC_WROD,   "download",    "W25Q128",                          512 * 1024,       512 * 1024, 0}, \
-    {FAL_PART_MAGIC_WROD, "filesystem",    "GD25Q32",                  (512 + 512) * 1024,  3 * 1024 * 1024, 0}, \
+    {FAL_PART_MAGIC_WROD, "filesystem",    "W25Q128",                  (512 + 512) * 1024,  15 * 1024 * 1024, 0}, \
 }
 #endif /*FAL_PART_TABLE*/
 

bsp/stm32/stm32f407-lckfb-skystar/board/ports/fal/fal_spi_flash_sfud_port.c

@@ -21,11 +21,11 @@ static int write(long offset, const uint8_t *buf, size_t size);
 static int erase(long offset, size_t size);
 
 static sfud_flash_t sfud_dev = NULL;
-struct fal_flash_dev gd25q32 =
+struct fal_flash_dev w25q128 =
 {
-    .name       = "GD25Q32",
+    .name       = "W25Q128",
     .addr       = 0,
-    .len        = 4 * 1024 * 1024,
+    .len        = 16 * 1024 * 1024,
     .blk_size   = 4096,
     .ops        = {init, read, write, erase},
     .write_gran = 1
@@ -33,15 +33,15 @@ struct fal_flash_dev gd25q32 =
 
 static int init(void)
 {
-    sfud_dev = rt_sfud_flash_find_by_dev_name("GD25Q32");
+    sfud_dev = rt_sfud_flash_find_by_dev_name("W25Q128");
     if (RT_NULL == sfud_dev)
     {
         return -1;
     }
 
     /* update the flash chip information */
-    gd25q32.blk_size = sfud_dev->chip.erase_gran;
+    w25q128.blk_size = sfud_dev->chip.erase_gran;
-    gd25q32.len = sfud_dev->chip.capacity;
+    w25q128.len = sfud_dev->chip.capacity;
 
     return 0;
 }
@@ -50,7 +50,7 @@ static int read(long offset, uint8_t *buf, size_t size)
 {
     assert(sfud_dev);
     assert(sfud_dev->init_ok);
-    sfud_read(sfud_dev, gd25q32.addr + offset, size, buf);
+    sfud_read(sfud_dev, w25q128.addr + offset, size, buf);
 
     return size;
 }
@@ -59,7 +59,7 @@ static int write(long offset, const uint8_t *buf, size_t size)
 {
     assert(sfud_dev);
     assert(sfud_dev->init_ok);
-    if (sfud_write(sfud_dev, gd25q32.addr + offset, size, buf) != SFUD_SUCCESS)
+    if (sfud_write(sfud_dev, w25q128.addr + offset, size, buf) != SFUD_SUCCESS)
     {
         return -1;
     }
@@ -71,7 +71,7 @@ static int erase(long offset, size_t size)
 {
     assert(sfud_dev);
     assert(sfud_dev->init_ok);
-    if (sfud_erase(sfud_dev, gd25q32.addr + offset, size) != SFUD_SUCCESS)
+    if (sfud_erase(sfud_dev, w25q128.addr + offset, size) != SFUD_SUCCESS)
     {
         return -1;
     }

bsp/stm32/stm32f407-lckfb-skystar/board/ports/spi_flash_init.c

@@ -21,7 +21,7 @@ static int rt_hw_spi_flash_init(void)
     __HAL_RCC_GPIOB_CLK_ENABLE();
     rt_hw_spi_device_attach("spi1", "spi10", GET_PIN(A, 4));
 
-    if (RT_NULL == rt_sfud_flash_probe("GD25Q32", "spi10"))
+    if (RT_NULL == rt_sfud_flash_probe("W25Q128", "spi10"))
     {
         return -RT_ERROR;
     }

bsp/stm32/stm32f407-lckfb-skystar/rtconfig.h

@@ -1,11 +1,8 @@
 #ifndef RT_CONFIG_H__
 #define RT_CONFIG_H__
 
-/* Automatically generated file; DO NOT EDIT. */
+#define SOC_STM32F407VE
-/* RT-Thread Configuration */
+#define BOARD_STM32F407_LCKFB
-
-#define SOC_STM32F407ZG
-#define BOARD_STM32F407_SPARK
 
 /* RT-Thread Kernel */
 
@@ -15,7 +12,6 @@
 #define RT_THREAD_PRIORITY_32
 #define RT_THREAD_PRIORITY_MAX 32
 #define RT_TICK_PER_SECOND 1000
-#define RT_USING_OVERFLOW_CHECK
 #define RT_USING_HOOK
 #define RT_HOOK_USING_FUNC_PTR
 #define RT_USING_IDLE_HOOK
@@ -24,9 +20,16 @@
 
 /* kservice optimization */
 
+/* end of kservice optimization */
+
+/* klibc optimization */
+
+/* end of klibc optimization */
 #define RT_USING_DEBUG
+#define RT_DEBUGING_ASSERT
 #define RT_DEBUGING_COLOR
 #define RT_DEBUGING_CONTEXT
+#define RT_USING_OVERFLOW_CHECK
 
 /* Inter-Thread communication */
 
@@ -35,6 +38,7 @@
 #define RT_USING_EVENT
 #define RT_USING_MAILBOX
 #define RT_USING_MESSAGEQUEUE
+/* end of Inter-Thread communication */
 
 /* Memory Management */
 
@@ -42,12 +46,14 @@
 #define RT_USING_SMALL_MEM
 #define RT_USING_SMALL_MEM_AS_HEAP
 #define RT_USING_HEAP
+/* end of Memory Management */
 #define RT_USING_DEVICE
 #define RT_USING_CONSOLE
 #define RT_CONSOLEBUF_SIZE 128
 #define RT_CONSOLE_DEVICE_NAME "uart1"
-#define RT_VER_NUM 0x50100
+#define RT_VER_NUM 0x50200
 #define RT_BACKTRACE_LEVEL_MAX_NR 32
+/* end of RT-Thread Kernel */
 #define RT_USING_HW_ATOMIC
 #define RT_USING_CPU_FFS
 #define ARCH_ARM
@@ -77,30 +83,7 @@
 
 /* DFS: device virtual file system */
 
-#define RT_USING_DFS
+/* end of DFS: device virtual file system */
-#define DFS_USING_POSIX
-#define DFS_USING_WORKDIR
-#define DFS_FD_MAX 16
-#define RT_USING_DFS_V1
-#define DFS_FILESYSTEMS_MAX 4
-#define DFS_FILESYSTEM_TYPES_MAX 4
-#define RT_USING_DFS_ELMFAT
-
-/* elm-chan's FatFs, Generic FAT Filesystem Module */
-
-#define RT_DFS_ELM_CODE_PAGE 437
-#define RT_DFS_ELM_WORD_ACCESS
-#define RT_DFS_ELM_USE_LFN_3
-#define RT_DFS_ELM_USE_LFN 3
-#define RT_DFS_ELM_LFN_UNICODE_0
-#define RT_DFS_ELM_LFN_UNICODE 0
-#define RT_DFS_ELM_MAX_LFN 255
-#define RT_DFS_ELM_DRIVES 2
-#define RT_DFS_ELM_MAX_SECTOR_SIZE 4096
-#define RT_DFS_ELM_REENTRANT
-#define RT_DFS_ELM_MUTEX_TIMEOUT 3000
-#define RT_USING_DFS_DEVFS
-#define RT_USING_DFS_ROMFS
 
 /* Device Drivers */
 
@@ -110,10 +93,13 @@
 #define RT_USING_SERIAL_V1
 #define RT_SERIAL_USING_DMA
 #define RT_SERIAL_RB_BUFSZ 64
+#define RT_USING_SPI
+#define RT_USING_SFUD
+#define RT_SFUD_USING_SFDP
+#define RT_SFUD_USING_FLASH_INFO_TABLE
+#define RT_SFUD_SPI_MAX_HZ 50000000
 #define RT_USING_PIN
-
+/* end of Device Drivers */
-/* Using USB */
-
 
 /* C/C++ and POSIX layer */
 
@@ -125,6 +111,8 @@
 #define RT_LIBC_TZ_DEFAULT_HOUR 8
 #define RT_LIBC_TZ_DEFAULT_MIN 0
 #define RT_LIBC_TZ_DEFAULT_SEC 0
+/* end of Timezone and Daylight Saving Time */
+/* end of ISO-ANSI C layer */
 
 /* POSIX (Portable Operating System Interface) layer */
 
@@ -134,18 +122,30 @@
 
 /* Socket is in the 'Network' category */
 
+/* end of Interprocess Communication (IPC) */
+/* end of POSIX (Portable Operating System Interface) layer */
+/* end of C/C++ and POSIX layer */
 
 /* Network */
 
+/* end of Network */
 
 /* Memory protection */
 
+/* end of Memory protection */
 
 /* Utilities */
 
+/* end of Utilities */
+
+/* Using USB legacy version */
+
+/* end of Using USB legacy version */
+/* end of RT-Thread Components */
 
 /* RT-Thread Utestcases */
 
+/* end of RT-Thread Utestcases */
 
 /* RT-Thread online packages */
 
@@ -156,119 +156,173 @@
 
 /* Marvell WiFi */
 
+/* end of Marvell WiFi */
 
 /* Wiced WiFi */
 
+/* end of Wiced WiFi */
 
 /* CYW43012 WiFi */
 
+/* end of CYW43012 WiFi */
 
 /* BL808 WiFi */
 
+/* end of BL808 WiFi */
 
 /* CYW43439 WiFi */
 
+/* end of CYW43439 WiFi */
+/* end of Wi-Fi */
 
 /* IoT Cloud */
 
+/* end of IoT Cloud */
+/* end of IoT - internet of things */
 
 /* security packages */
 
+/* end of security packages */
 
 /* language packages */
 
 /* JSON: JavaScript Object Notation, a lightweight data-interchange format */
 
+/* end of JSON: JavaScript Object Notation, a lightweight data-interchange format */
 
 /* XML: Extensible Markup Language */
 
+/* end of XML: Extensible Markup Language */
+/* end of language packages */
 
 /* multimedia packages */
 
 /* LVGL: powerful and easy-to-use embedded GUI library */
 
+/* end of LVGL: powerful and easy-to-use embedded GUI library */
 
 /* u8g2: a monochrome graphic library */
 
+/* end of u8g2: a monochrome graphic library */
+/* end of multimedia packages */
 
 /* tools packages */
 
+/* end of tools packages */
 
 /* system packages */
 
 /* enhanced kernel services */
 
+/* end of enhanced kernel services */
 
 /* acceleration: Assembly language or algorithmic acceleration packages */
 
+/* end of acceleration: Assembly language or algorithmic acceleration packages */
 
 /* CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */
 
+/* end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */
 
 /* Micrium: Micrium software products porting for RT-Thread */
 
+/* end of Micrium: Micrium software products porting for RT-Thread */
+/* end of system packages */
 
 /* peripheral libraries and drivers */
 
-/* sensors drivers */
+/* HAL & SDK Drivers */
 
+/* STM32 HAL & SDK Drivers */
 
-/* touch drivers */
+/* end of STM32 HAL & SDK Drivers */
 
+/* Infineon HAL Packages */
+
+/* end of Infineon HAL Packages */
 
 /* Kendryte SDK */
 
+/* end of Kendryte SDK */
+/* end of HAL & SDK Drivers */
+
+/* sensors drivers */
+
+/* end of sensors drivers */
+
+/* touch drivers */
+
+/* end of touch drivers */
+/* end of peripheral libraries and drivers */
 
 /* AI packages */
 
+/* end of AI packages */
 
 /* Signal Processing and Control Algorithm Packages */
 
+/* end of Signal Processing and Control Algorithm Packages */
 
 /* miscellaneous packages */
 
 /* project laboratory */
 
+/* end of project laboratory */
+
 /* samples: kernel and components samples */
 
+/* end of samples: kernel and components samples */
 
 /* entertainment: terminal games and other interesting software packages */
 
+/* end of entertainment: terminal games and other interesting software packages */
+/* end of miscellaneous packages */
 
 /* Arduino libraries */
 
 
 /* Projects and Demos */
 
+/* end of Projects and Demos */
 
 /* Sensors */
 
+/* end of Sensors */
 
 /* Display */
 
+/* end of Display */
 
 /* Timing */
 
+/* end of Timing */
 
 /* Data Processing */
 
+/* end of Data Processing */
 
 /* Data Storage */
 
 /* Communication */
 
+/* end of Communication */
 
 /* Device Control */
 
+/* end of Device Control */
 
 /* Other */
 
+/* end of Other */
 
 /* Signal IO */
 
+/* end of Signal IO */
 
 /* Uncategorized */
 
+/* end of Arduino libraries */
+/* end of RT-Thread online packages */
 #define SOC_FAMILY_STM32
 #define SOC_SERIES_STM32F4
 
@@ -276,11 +330,17 @@
 
 /* Onboard Peripheral Drivers */
 
+/* end of Onboard Peripheral Drivers */
 
 /* On-chip Peripheral Drivers */
 
 #define BSP_USING_GPIO
 #define BSP_USING_UART
 #define BSP_USING_UART1
+#define BSP_USING_ON_CHIP_FLASH
+#define BSP_USING_SPI
+#define BSP_USING_SPI1
+/* end of On-chip Peripheral Drivers */
+/* end of Hardware Drivers Config */
 
 #endif