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>

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>
Roger Quadros · Tom Rini
1 parent 9ddef489c4
Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff
include/configs/am335x_evm.h
@@ -54,12 +54,12 @@
 		"${optargs} " \
 		"root=${nandroot} " \
 		"rootfstype=${nandrootfstype}\0" \
-	"nandroot=ubi0:rootfs rw ubi.mtd=9,2048,2048\0" \" \
+	"nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,2048,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 ""
...	...	@@ -54,12 +54,12 @@
54	54	"${optargs} " \
55	55	"root=${nandroot} " \
56	56	"rootfstype=${nandrootfstype}\0" \
57		- "nandroot=ubi0:rootfs rw ubi.mtd=9,2048,2048\0" \" \
	57	+ "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,2048,2048\0" \" \
58	58	"nandrootfstype=ubifs rootwait=1\0" \
59	59	"nandboot=echo Booting from nand ...; " \
60	60	"run nandargs; " \
61		- "nand read ${fdtaddr} u-boot-spl-os; " \
62		- "nand read ${loadaddr} kernel; " \
	61	+ "nand read ${fdtaddr} NAND.u-boot-spl-os; " \
	62	+ "nand read ${loadaddr} NAND.kernel; " \
63	63	"bootz ${loadaddr} - ${fdtaddr}\0"
64	64	#else
65	65	#define NANDARGS ""