Merge pull request #2662 from SummerGGift/master_spi_flash

BernardXiong · web-flow · commit 9eef64416917 · 2019-05-10T09:30:50.000+08:00
[bsp][stm32][atk-f767] 修改 QSPI FLASH 名称以及设备初始化顺序
diff --git a/bsp/stm32/stm32f767-atk-apollo/board/Kconfig b/bsp/stm32/stm32f767-atk-apollo/board/Kconfig
@@ -24,7 +24,7 @@ menu "Onboard Peripheral Drivers"
         default n
 
     config BSP_USING_QSPI_FLASH
-        bool "Enable QSPI FLASH (w25q128 qspi)"
+        bool "Enable QSPI FLASH (W25Q256 qspi)"
         select BSP_USING_QSPI
         select RT_USING_SFUD
         select RT_SFUD_USING_QSPI
diff --git a/bsp/stm32/stm32f767-atk-apollo/board/ports/drv_qspi_flash.c b/bsp/stm32/stm32f767-atk-apollo/board/ports/drv_qspi_flash.c
@@ -64,14 +64,14 @@ static int rt_hw_qspi_flash_with_sfud_init(void)
 {
     stm32_qspi_bus_attach_device("qspi1", "qspi10", RT_NULL, 4, w25qxx_enter_qspi_mode, RT_NULL);
     
-    /* init w25q128 */
-    if (RT_NULL == rt_sfud_flash_probe("W25Q128", "qspi10"))
+    /* init W25Q256 */
+    if (RT_NULL == rt_sfud_flash_probe("W25Q256", "qspi10"))
     {
         return -RT_ERROR;
     }
 
     return RT_EOK;
 }
-INIT_COMPONENT_EXPORT(rt_hw_qspi_flash_with_sfud_init);
+INIT_DEVICE_EXPORT(rt_hw_qspi_flash_with_sfud_init);
 
 #endif/* BSP_USING_QSPI_FLASH */

Original file line number	Diff line number	Diff line change
`@@ -64,14 +64,14 @@ static int rt_hw_qspi_flash_with_sfud_init(void)`
`64`	`64`	`{`
`65`	`65`	`stm32_qspi_bus_attach_device("qspi1", "qspi10", RT_NULL, 4, w25qxx_enter_qspi_mode, RT_NULL);`
`66`	`66`
`67`		`- /* init w25q128 */`
`68`		`- if (RT_NULL == rt_sfud_flash_probe("W25Q128", "qspi10"))`
	`67`	`+ /* init W25Q256 */`
	`68`	`+ if (RT_NULL == rt_sfud_flash_probe("W25Q256", "qspi10"))`
`69`	`69`	`{`
`70`	`70`	`return -RT_ERROR;`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`return RT_EOK;`
`74`	`74`	`}`
`75`		`-INIT_COMPONENT_EXPORT(rt_hw_qspi_flash_with_sfud_init);`
	`75`	`+INIT_DEVICE_EXPORT(rt_hw_qspi_flash_with_sfud_init);`
`76`	`76`
`77`	`77`	`#endif/* BSP_USING_QSPI_FLASH */`