summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorSRICHARAN R <r.sricharan@ti.com>2013-04-04 23:39:47 +0000
committerTom Rini <trini@ti.com>2013-04-08 11:29:05 -0400
commitaaed0a23c9300c6f7b6b78e791f9bb5fbf22d074 (patch)
tree151c5820aee464d83bba4809f413995813c2bc64 /include/configs
parent143070df8e382f22f1df884213dc048cbd52af8a (diff)
downloadu-boot-imx-aaed0a23c9300c6f7b6b78e791f9bb5fbf22d074.zip
u-boot-imx-aaed0a23c9300c6f7b6b78e791f9bb5fbf22d074.tar.gz
u-boot-imx-aaed0a23c9300c6f7b6b78e791f9bb5fbf22d074.tar.bz2
ARM: OMAP4/5: Make bootz as the default boot command
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>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/omap4_common.h4
-rw-r--r--include/configs/omap5_common.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 7af3989..1fd3097 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -152,7 +152,7 @@
"fdtaddr=0x80f80000\0" \
"bootpart=0:2\0" \
"bootdir=/boot\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 6fb0253..da0ead9 100644
--- a/include/configs/omap5_common.h
+++ b/include/configs/omap5_common.h
@@ -151,7 +151,7 @@
"fdtaddr=0x80f80000\0" \
"bootpart=0:2\0" \
"bootdir=/boot\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 " \