summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2019-05-10 09:30:50 +0800
committerGitHub <[email protected]>2019-05-10 09:30:50 +0800
commit9eef6441691772515523a025ac09b843121adfa0 (patch)
tree4a3f2500e87e71c6690139741476aa69191738c7
parent1dd364b45a907935a7b67a2199e83dae582fd85b (diff)
parentd8b1c7d0679530702690a2b6cb3157f3bf4855c0 (diff)
Merge pull request #2662 from SummerGGift/master_spi_flash
[bsp][stm32][atk-f767] 修改 QSPI FLASH 名称以及设备初始化顺序
-rw-r--r--bsp/stm32/stm32f767-atk-apollo/board/Kconfig2
-rw-r--r--bsp/stm32/stm32f767-atk-apollo/board/ports/drv_qspi_flash.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/bsp/stm32/stm32f767-atk-apollo/board/Kconfig b/bsp/stm32/stm32f767-atk-apollo/board/Kconfig
index 04033b2424..77d2f5eaf8 100644
--- 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
index 36ecb754e9..5cabc9d4d2 100644
--- 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 */