LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MLK-20987-1 imx8qm/qxp: spl: Fix SPL flexspi boot break 

The CONFIG_QSPI_BOOT has been removed from SPL flexspi build, because
we have to change the u-boot ENV to SD/MMC, and this configuration will
set relevant configurations.

But we don't clean up CONFIG_QSPI_BOOT for SPL completely, SPL still has
some places using it and cause problem to flexspi boot.
Using CONFIG_SPL_SPI_SUPPORT to replace the CONFIG_QSPI_BOOT.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 0491bd4ba21ad620b4c514323a7d6b8a9e10325c)
This commit is contained in:
Ye Li 2019-02-25 19:07:05 -08:00
parent 61363f12ef
commit e3a1ff7514
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/freescale/imx8qm_mek/spl.c
View File

@ -175,7 +175,7 @@ void spl_dram_init(void)
void spl_board_init(void) void spl_board_init(void)
{ {
#if defined(CONFIG_QSPI_BOOT) #if defined(CONFIG_SPL_SPI_SUPPORT)
sc_ipc_t ipcHndl = 0; sc_ipc_t ipcHndl = 0;
ipcHndl = gd->arch.ipc_channel_handle; ipcHndl = gd->arch.ipc_channel_handle;
@ -192,7 +192,7 @@ void spl_board_init(void)
void spl_board_prepare_for_boot(void) void spl_board_prepare_for_boot(void)
{ {
#if defined(CONFIG_QSPI_BOOT) #if defined(CONFIG_SPL_SPI_SUPPORT)
sc_ipc_t ipcHndl = 0; sc_ipc_t ipcHndl = 0;
ipcHndl = gd->arch.ipc_channel_handle; ipcHndl = gd->arch.ipc_channel_handle;

4
board/freescale/imx8qxp_mek/spl.c
View File

@ -173,7 +173,7 @@ int board_mmc_getcd(struct mmc *mmc)
void spl_board_init(void) void spl_board_init(void)
{ {
#if defined(CONFIG_QSPI_BOOT) #if defined(CONFIG_SPL_SPI_SUPPORT)
sc_ipc_t ipcHndl = 0; sc_ipc_t ipcHndl = 0;
ipcHndl = gd->arch.ipc_channel_handle; ipcHndl = gd->arch.ipc_channel_handle;
@ -189,7 +189,7 @@ void spl_board_init(void)
void spl_board_prepare_for_boot(void) void spl_board_prepare_for_boot(void)
{ {
#if defined(CONFIG_QSPI_BOOT) #if defined(CONFIG_SPL_SPI_SUPPORT)
sc_ipc_t ipcHndl = 0; sc_ipc_t ipcHndl = 0;
ipcHndl = gd->arch.ipc_channel_handle; ipcHndl = gd->arch.ipc_channel_handle;

2
include/configs/imx8qm_mek.h
View File

@ -13,7 +13,7 @@
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#ifdef CONFIG_QSPI_BOOT #ifdef CONFIG_SPL_SPI_SUPPORT
#define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SPI_LOAD
#endif #endif

2
include/configs/imx8qxp_mek.h
View File

@ -14,7 +14,7 @@
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#ifdef CONFIG_QSPI_BOOT #ifdef CONFIG_SPL_SPI_SUPPORT
#define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SPI_LOAD
#endif #endif