configs: ti_armv7_keystone2: switch to using kernel zImage

Switch to using zImage instead of uImage. and while at it, start using
bootz as default. While at it, get rid of BOOTIMAGE define and start
using Linux upstream dtb file names.

Reviewed-by: Murali Karicheri <m-karicheri2@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Nishanth Menon <nm@ti.com>

diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index e609df906dc64d049afcb8f1f6531698f754c8dd..3b8a98be22a7a8479a30c862eb71c7be6986071d 100644 (file)
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -18,7 +18,7 @@
        "addr_mon=0x0c140000\0"                                         \
        "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "        \
        "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0"       \
-       "name_fdt=uImage-k2e-evm.dtb\0"                                 \
+       "name_fdt=k2e-evm.dtb\0"                                        \
        "name_mon=skern-k2e-evm.bin\0"                                  \
        "name_ubi=k2e-evm-ubifs.ubi\0"                                  \
        "name_uboot=u-boot-spi-k2e-evm.gph\0"                           \

diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index 338f9383a37ae2cb0f23686ae231899122411b99..2373bd923b6c57ff675c3c095e4b8610039d17b6 100644 (file)
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -18,7 +18,7 @@
        "addr_mon=0x0c5f0000\0"                                         \
        "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "        \
        "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0"       \
-       "name_fdt=uImage-k2hk-evm.dtb\0"                                \
+       "name_fdt=k2hk-evm.dtb\0"                               \
        "name_mon=skern-k2hk-evm.bin\0"                                 \
        "name_ubi=k2hk-evm-ubifs.ubi\0"                                 \
        "name_uboot=u-boot-spi-k2hk-evm.gph\0"                          \

diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index 58a0256288f299e202eada6e3db77659b59a1d74..b90b85280964de9f65a33cad000c3ee7a64d3ad2 100644 (file)
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -18,7 +18,7 @@
        "addr_mon=0x0c140000\0"                                         \
        "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "        \
        "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,4096\0"       \
-       "name_fdt=uImage-k2l-evm.dtb\0"                                 \
+       "name_fdt=k2l-evm.dtb\0"                                        \
        "name_mon=skern-k2l-evm.bin\0"                                  \
        "name_ubi=k2l-evm-ubifs.ubi\0"                                  \
        "name_uboot=u-boot-spi-k2l-evm.gph\0"                           \

diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 8e3f7f6ddc7e7bd19fc2e660596c17ae8a6fd02f..c705ffff8d4a0baf708091007512d3953a857d77 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -210,7 +210,6 @@
 /* EDMA3 */
 #define CONFIG_TI_EDMA3
 
-#define CONFIG_BOOTFILE                        "uImage"
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        DEFAULT_LINUX_BOOT_ENV                                          \
        CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS                             \
@@ -221,9 +220,9 @@
        "mem_reserve=512M\0"                                            \
        "addr_ubi=0x82000000\0"                                         \
        "addr_secdb_key=0xc000000\0"                                    \
-       "name_kern=uImage-keystone-evm.bin\0"                           \
+       "name_kern=zImage\0"                                            \
        "run_mon=mon_install ${addr_mon}\0"                             \
-       "run_kern=bootm ${loadaddr} - ${fdtaddr}\0"                     \
+       "run_kern=bootz ${loadaddr} - ${fdtaddr}\0"                     \
        "init_net=run args_all args_net\0"                              \
        "init_ubi=run args_all args_ubi; "                              \
                "ubi part ubifs; ubifsmount ubi:boot;"                  \