From: Roger Quadros <rogerq@ti.com>
Date: Fri, 5 Jun 2015 09:42:21 +0000 (+0300)
Subject: am335x_evm: nand: Fix boot from NAND
X-Git-Tag: v2015.07-rc3~60
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cda6017629bb82f7a3b9a4718764e2217c3df4d8;p=oweals%2Fu-boot.git

am335x_evm: nand: Fix boot from NAND

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>
---

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 1c6cbd787d..a5f1f06c22 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -54,12 +54,12 @@
 		"${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 ""