From: Simon Schwarz <simonschwarz...@googlemail.com>

This implements booting of Linux from NAND in SPL

Related config parameters:
CONFIG_SYS_NAND_SPL_KERNEL_OFFS
        Offset in NAND of direct boot kernel image to use in SPL
CONFIG_SYS_SPL_ARGS_ADDR
        Address where the kernel boot arguments are expected - this is
        normally RAM-start + 0x100 (on ARM)

Signed-off-by: Simon Schwarz <simonschwarz...@gmail.com>
CC: Tom Rini <tom.r...@gmail.com>
CC: Stefano Babic <sba...@denx.de>
CC: Wolfgang Denk <w...@denx.de>
---
V2 changes:
nothing

V3 changes:
nothing

V4 changes:
ADD define description to commit message
CHG renaming some defines - renaming SAVEBP SPL

V5 changes:
nothing

V6 changes:
nothing

V7 changes:
nothing

V8 changes:
FIX multiline comment style
REBASE on u-boot

V9 changes:
nothing

V10 changes:
ADD unused __attribute__ to src and dst because they provoked a warning
        if SPL os boot was not active

V11 changes:
nothing

V12 changes:
nothing

 arch/arm/cpu/armv7/omap-common/spl_nand.c |   66 ++++++++++++++++++++++-------
 1 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c 
b/arch/arm/cpu/armv7/omap-common/spl_nand.c
index 38d06b1..2a66214 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_nand.c
+++ b/arch/arm/cpu/armv7/omap-common/spl_nand.c
@@ -24,6 +24,7 @@
 #include <asm/u-boot.h>
 #include <asm/utils.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/io.h>
 #include <nand.h>
 #include <version.h>
 #include <asm/omap_common.h>
@@ -32,6 +33,9 @@
 void spl_nand_load_image(void)
 {
        struct image_header *header;
+       int *src __attribute__((unused));
+       int *dst __attribute__((unused));
+
        switch (omap_boot_mode()) {
        case NAND_MODE_HW_ECC:
                debug("spl: nand - using hw ecc\n");
@@ -45,26 +49,56 @@ void spl_nand_load_image(void)
 
        /*use CONFIG_SYS_TEXT_BASE as temporary storage area */
        header = (struct image_header *)(CONFIG_SYS_TEXT_BASE);
+#ifdef CONFIG_SPL_OS_BOOT
+       if (!spl_uboot_key()) {
+               /*
+                * load parameter image
+                * load to temp position since nand_spl_load_image reads
+                * a whole block which is typically larger than
+                * CONFIG_CMD_SAVEBP_WRITE_SIZE therefore may overwrite
+                * following sections like BSS
+                */
+               nand_spl_load_image(CONFIG_CMD_SPL_NAND_OFS,
+                       CONFIG_CMD_SPL_WRITE_SIZE,
+                       (void *)CONFIG_SYS_TEXT_BASE);
+               /* copy to destintion */
+               for (dst = (int *)CONFIG_SYS_SPL_ARGS_ADDR,
+                               src = (int *)CONFIG_SYS_TEXT_BASE;
+                               src < (int *)(CONFIG_SYS_TEXT_BASE +
+                               CONFIG_CMD_SPL_WRITE_SIZE);
+                               src++, dst++) {
+                       writel(readl(src), dst);
+               }
 
+               /* load linux */
+               nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS,
+                       CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
+               spl_parse_image_header(header);
+               nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS,
+                       spl_image.size, (void *)spl_image.load_addr);
+       } else
+#endif
+       {
 #ifdef CONFIG_NAND_ENV_DST
-       nand_spl_load_image(CONFIG_ENV_OFFSET,
-               CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
-       spl_parse_image_header(header);
-       nand_spl_load_image(CONFIG_ENV_OFFSET, spl_image.size,
-               (void *)image_load_addr);
+               nand_spl_load_image(CONFIG_ENV_OFFSET,
+                       CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
+               spl_parse_image_header(header);
+               nand_spl_load_image(CONFIG_ENV_OFFSET, spl_image.size,
+                       (void *)spl_image.load_addr);
 #ifdef CONFIG_ENV_OFFSET_REDUND
-       nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND,
-               CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
-       spl_parse_image_header(header);
-       nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND, spl_image.size,
-               (void *)image_load_addr);
+               nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND,
+                       CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
+               spl_parse_image_header(header);
+               nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND, spl_image.size,
+                       (void *)spl_image.load_addr);
 #endif
 #endif
-       /* Load u-boot */
-       nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
-               CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
-       spl_parse_image_header(header);
-       nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
-               spl_image.size, (void *)spl_image.load_addr);
+               /* Load u-boot */
+               nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
+                       CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
+               spl_parse_image_header(header);
+               nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
+                       spl_image.size, (void *)spl_image.load_addr);
+       }
        nand_deselect();
 }
-- 
1.7.5.4

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to