diff options
| author | SRICHARAN R <r.sricharan@ti.com> | 2013-04-04 23:39:47 +0000 | 
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-04-08 11:29:05 -0400 | 
| commit | aaed0a23c9300c6f7b6b78e791f9bb5fbf22d074 (patch) | |
| tree | 151c5820aee464d83bba4809f413995813c2bc64 /include | |
| parent | 143070df8e382f22f1df884213dc048cbd52af8a (diff) | |
| download | olio-uboot-2014.01-aaed0a23c9300c6f7b6b78e791f9bb5fbf22d074.tar.xz olio-uboot-2014.01-aaed0a23c9300c6f7b6b78e791f9bb5fbf22d074.zip | |
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')
| -rw-r--r-- | include/configs/omap4_common.h | 4 | ||||
| -rw-r--r-- | include/configs/omap5_common.h | 4 | 
2 files changed, 4 insertions, 4 deletions
| diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h index 7af3989be..1fd3097d7 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 6fb025388..da0ead9ad 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 " \ |