|
@@ -88,7 +88,11 @@ static inline int bad_block(uchar *marker, int port_size)
|
|
|
return __raw_readw((u16 *)marker) != 0xffff;
|
|
|
}
|
|
|
|
|
|
-static void nand_load(unsigned int offs, int uboot_size, uchar *dst)
|
|
|
+#ifdef CONFIG_TPL_BUILD
|
|
|
+int nand_spl_load_image(uint32_t offs, unsigned int uboot_size, void *vdst)
|
|
|
+#else
|
|
|
+static int nand_load(uint32_t offs, unsigned int uboot_size, void *vdst)
|
|
|
+#endif
|
|
|
{
|
|
|
struct fsl_ifc *ifc = IFC_BASE_ADDR;
|
|
|
uchar *buf = (uchar *)CONFIG_SYS_NAND_BASE;
|
|
@@ -105,6 +109,7 @@ static void nand_load(unsigned int offs, int uboot_size, uchar *dst)
|
|
|
|
|
|
int sram_addr;
|
|
|
int pg_no;
|
|
|
+ uchar *dst = vdst;
|
|
|
|
|
|
/* Get NAND Flash configuration */
|
|
|
csor = CONFIG_SYS_NAND_CSOR;
|
|
@@ -208,8 +213,19 @@ static void nand_load(unsigned int offs, int uboot_size, uchar *dst)
|
|
|
offs += page_size;
|
|
|
} while ((offs & (blk_size - 1)) && (pos < uboot_size));
|
|
|
}
|
|
|
+
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
+/*
|
|
|
+ * Defines a static function nand_load_image() here, because non-static makes
|
|
|
+ * the code too large for certain SPLs(minimal SPL, maximum size <= 4Kbytes)
|
|
|
+ */
|
|
|
+#ifndef CONFIG_TPL_BUILD
|
|
|
+#define nand_spl_load_image(offs, uboot_size, vdst) \
|
|
|
+ nand_load(offs, uboot_size, vdst)
|
|
|
+#endif
|
|
|
+
|
|
|
/*
|
|
|
* Main entrypoint for NAND Boot. It's necessary that SDRAM is already
|
|
|
* configured and available since this code loads the main U-boot image
|
|
@@ -221,16 +237,17 @@ void nand_boot(void)
|
|
|
/*
|
|
|
* Load U-Boot image from NAND into RAM
|
|
|
*/
|
|
|
- nand_load(CONFIG_SYS_NAND_U_BOOT_OFFS, CONFIG_SYS_NAND_U_BOOT_SIZE,
|
|
|
- (uchar *)CONFIG_SYS_NAND_U_BOOT_DST);
|
|
|
+ nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
|
|
|
+ CONFIG_SYS_NAND_U_BOOT_SIZE,
|
|
|
+ (uchar *)CONFIG_SYS_NAND_U_BOOT_DST);
|
|
|
|
|
|
#ifdef CONFIG_NAND_ENV_DST
|
|
|
- nand_load(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
|
|
|
- (uchar *)CONFIG_NAND_ENV_DST);
|
|
|
+ nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
|
|
|
+ (uchar *)CONFIG_NAND_ENV_DST);
|
|
|
|
|
|
#ifdef CONFIG_ENV_OFFSET_REDUND
|
|
|
- nand_load(CONFIG_ENV_OFFSET_REDUND, CONFIG_ENV_SIZE,
|
|
|
- (uchar *)CONFIG_NAND_ENV_DST + CONFIG_ENV_SIZE);
|
|
|
+ nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND, CONFIG_ENV_SIZE,
|
|
|
+ (uchar *)CONFIG_NAND_ENV_DST + CONFIG_ENV_SIZE);
|
|
|
#endif
|
|
|
#endif
|
|
|
/*
|