Patchwork [U-Boot,2/2] tricorder: Load kernel from ubifs

login
register
mail settings
Submitter Thomas Weber
Date April 3, 2012, 10:37 a.m.
Message ID <1333449424-7554-2-git-send-email-weber@corscience.de>
Download mbox | patch
Permalink /patch/150400/
State Accepted
Commit 008ec95054c170859e7a2dfdf87ce15e2e6cd017
Delegated to: Tom Rini
Headers show

Comments

Thomas Weber - April 3, 2012, 10:37 a.m.
From: Bernhard Walle <walle@corscience.de>

Signed-off-by: Bernhard Walle <walle@corscience.de>
---
 include/configs/tricorder.h |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

Patch

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index d826e19..801a24f 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -182,7 +182,8 @@ 
 		"setenv bootargs ${bootargs} " \
 		"omapfb.mode=lcd:${lcdmode} " \
 		"omapdss.def_disp=${defaultdisplay} " \
-		"root=ubi0:rootfs " \
+		"root=ubi0:root " \
+		"ubi.mtd=4 " \
 		"rootfstype=ubifs " \
 		"${kernelopts}\0" \
 	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
@@ -193,9 +194,13 @@ 
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
 		"bootm ${loadaddr}\0" \
+	"loaduimage_ubi=mtd default; " \
+		"ubi part fs; " \
+		"ubifsmount root; " \
+		"ubifsload ${loadaddr} /boot/uImage\0" \
 	"nandboot=echo Booting from nand ...; " \
 		"run nandargs; " \
-		"nand read ${loadaddr} 280000 400000; " \
+		"run loaduimage_ubi; " \
 		"bootm ${loadaddr}\0" \
 	"autoboot=if mmc rescan ${mmcdev}; then " \
 			"if run loadbootscript; then " \