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>

diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 7af3989bea3459fb38cb76b17ca8c7dbc078e3bf..1fd3097d757d7c271ca5cd526e23d090058cbedc 100644 (file)
--- 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 6fb0253888838c1e22e6c1826023073f58861abf..da0ead9adb53cb4c155241103431cf5b9edbace3 100644 (file)
--- 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 " \