|
@@ -14,6 +14,7 @@
|
|
|
#include <spi_flash.h>
|
|
|
#include "../common/qixis.h"
|
|
|
#include "t102xqds_qixis.h"
|
|
|
+#include "../common/spl.h"
|
|
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
|
@@ -132,8 +133,8 @@ void board_init_r(gd_t *gd, ulong dest_addr)
|
|
|
(uchar *)CONFIG_ENV_ADDR);
|
|
|
#endif
|
|
|
#ifdef CONFIG_SPL_SPI_BOOT
|
|
|
- spi_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
|
|
|
- (uchar *)CONFIG_ENV_ADDR);
|
|
|
+ fsl_spi_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
|
|
|
+ (uchar *)CONFIG_ENV_ADDR);
|
|
|
#endif
|
|
|
|
|
|
gd->env_addr = (ulong)(CONFIG_ENV_ADDR);
|
|
@@ -146,7 +147,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
|
|
|
#ifdef CONFIG_SPL_MMC_BOOT
|
|
|
mmc_boot();
|
|
|
#elif defined(CONFIG_SPL_SPI_BOOT)
|
|
|
- spi_boot();
|
|
|
+ fsl_spi_boot();
|
|
|
#elif defined(CONFIG_SPL_NAND_BOOT)
|
|
|
nand_boot();
|
|
|
#endif
|