Patchwork [U-Boot,V4,5/5] ARM: OMAP4/5: Make bootz as the default boot command

login
register
mail settings
Submitter SRICHARAN R
Date April 1, 2013, 3:52 p.m.
Message ID <1364831562-28868-6-git-send-email-r.sricharan@ti.com>
Download mbox | patch
Permalink /patch/232774/
State Deferred
Delegated to: Tom Rini
Headers show

Comments

SRICHARAN R - April 1, 2013, 3:52 p.m.
So with OMAP added to multi platform kernel,
the uImage no more contains a valid load address.
With the uboot already supporting zImage,
change the default boot command to bootz
instead.

Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Sricharan R <r.sricharan@ti.com>
Tested-by: Nishanth Menon <nm@ti.com>
---
 include/configs/omap4_common.h |    4 ++--
 include/configs/omap5_common.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 18cd98f..5ad606e 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -152,7 +152,7 @@ 
 	"fdtaddr=0x80f80000\0" \
 	"bootpart=0:1\0" \
 	"bootdir=\0" \
-	"bootfile=uImage\0" \
+	"bootfile=zImage\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
 	"mmcdev=0\0" \
@@ -171,7 +171,7 @@ 
 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
-		"bootm ${loadaddr} - ${fdtaddr}\0" \
+		"bootz ${loadaddr} - ${fdtaddr}\0" \
 	"findfdt="\
 		"if test $board_name = sdp4430; then " \
 			"setenv fdtfile omap4-sdp.dtb; fi; " \
diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h
index 24c9ecc..44c35b1 100644
--- a/include/configs/omap5_common.h
+++ b/include/configs/omap5_common.h
@@ -151,7 +151,7 @@ 
 	"fdtaddr=0x80f80000\0" \
 	"bootpart=0:1\0" \
 	"bootdir=\0" \
-	"bootfile=uImage\0" \
+	"bootfile=zImage\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
 	"mmcdev=0\0" \
@@ -170,7 +170,7 @@ 
 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
-		"bootm ${loadaddr} - ${fdtaddr}\0" \
+		"bootz ${loadaddr} - ${fdtaddr}\0" \
 	"findfdt="\
 		"if test $board_name = omap5_uevm; then " \
 			"setenv fdtfile omap5-uevm.dtb; fi;\0 " \