]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
am335x_evm: nand: Fix boot from NAND
authorRoger Quadros <rogerq@ti.com>
Fri, 5 Jun 2015 09:42:21 +0000 (12:42 +0300)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 8 Sep 2015 22:42:50 +0000 (00:42 +0200)
Use the correct partition names from with the Device Tree blob
and the kernel is picked up. Also use partition name instead of
number for the root filesystem in the kernel boot arguments.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
include/configs/am335x_evm.h

index 1c6cbd787d12d8727eba8f89fb0e7f358aa58c1b..a5f1f06c2216a11b0cb255c7e5f510ea84cccf9f 100644 (file)
                "${optargs} " \
                "root=${nandroot} " \
                "rootfstype=${nandrootfstype}\0" \
-       "nandroot=ubi0:rootfs rw ubi.mtd=9,2048\0" \
+       "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,2048\0" \
        "nandrootfstype=ubifs rootwait=1\0" \
        "nandboot=echo Booting from nand ...; " \
                "run nandargs; " \
-               "nand read ${fdtaddr} u-boot-spl-os; " \
-               "nand read ${loadaddr} kernel; " \
+               "nand read ${fdtaddr} NAND.u-boot-spl-os; " \
+               "nand read ${loadaddr} NAND.kernel; " \
                "bootz ${loadaddr} - ${fdtaddr}\0"
 #else
 #define NANDARGS ""