[U-Boot] [PATCH] keystone2: switch to zImage boot on K2 devices

[Vitaly Andrianov]

This patch switch default boot mode to use bootz command instead of
bootm as in OMAP devices. Also fix the address for fdt and kernel to
a higher address to support this boot. Also fix the image name
to remove the uImage/zImage prefix and evm.bin suffix. Fix name of
skern image to skern-k2g.bin

Signed-off-by: Murali Karicheri <m-karicheri2 at ti.com>
Signed-off-by: Vitaly Andrianov <vitalya at ti.com>
---
 include/configs/k2e_evm.h  | 4 ++--
 include/configs/k2hk_evm.h | 4 ++--
 include/configs/k2l_evm.h  | 4 ++--
 include/configs/ks2_evm.h  | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index 1a3c34c..654c1ff 100644
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -21,8 +21,8 @@
 	"addr_mon=0x0c140000\0"						\
 	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
 	"root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,2048\0"		\
-	"name_fdt=uImage-k2e-evm.dtb\0"					\
-	"name_mon=skern-k2e-evm.bin\0"					\
+	"name_fdt=k2e-evm.dtb\0"					\
+	"name_mon=skern-k2e.bin\0"					\
 	"name_ubi=k2e-evm-ubifs.ubi\0"					\
 	"name_uboot=u-boot-spi-k2e-evm.gph\0"				\
 	"name_fs=arago-console-image-k2e-evm.cpio.gz\0"
diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index ffddf13..255dce3 100644
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -21,8 +21,8 @@
 	"addr_mon=0x0c5f0000\0"						\
 	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
 	"root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,2048\0"		\
-	"name_fdt=uImage-k2hk-evm.dtb\0"				\
-	"name_mon=skern-k2hk-evm.bin\0"					\
+	"name_fdt=k2hk-evm.dtb\0"				\
+	"name_mon=skern-k2hk.bin\0"					\
 	"name_ubi=k2hk-evm-ubifs.ubi\0"					\
 	"name_uboot=u-boot-spi-k2hk-evm.gph\0"				\
 	"name_fs=arago-console-image-k2hk-evm.cpio.gz\0"
diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index bdfbef2..b60ac62 100644
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -21,8 +21,8 @@
 	"addr_mon=0x0c140000\0"						\
 	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
 	"root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,4096\0"		\
-	"name_fdt=uImage-k2l-evm.dtb\0"					\
-	"name_mon=skern-k2l-evm.bin\0"					\
+	"name_fdt=k2l-evm.dtb\0"					\
+	"name_mon=skern-k2l.bin\0"					\
 	"name_ubi=k2l-evm-ubifs.ubi\0"					\
 	"name_uboot=u-boot-spi-k2l-evm.gph\0"				\
 	"name_fs=arago-console-image-k2l-evm.cpio.gz\0"
diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h
index f1517eb..6ca5319 100644
--- a/include/configs/ks2_evm.h
+++ b/include/configs/ks2_evm.h
@@ -249,16 +249,16 @@
 	"nfs_root=/export\0"						\
 	"mem_lpae=1\0"							\
 	"mem_reserve=512M\0"						\
-	"addr_fdt=0x87000000\0"						\
-	"addr_kern=0x88000000\0"					\
+	"addr_fdt=0x81800000\0"						\
+	"addr_kern=0x81000000\0"					\
 	"addr_uboot=0x87000000\0"					\
 	"addr_fs=0x82000000\0"						\
 	"addr_ubi=0x82000000\0"						\
 	"addr_secdb_key=0xc000000\0"					\
 	"fdt_high=0xffffffff\0"						\
-	"name_kern=uImage-keystone-evm.bin\0"				\
+	"name_kern=zImage\0"						\
 	"run_mon=mon_install ${addr_mon}\0"				\
-	"run_kern=bootm ${addr_kern} - ${addr_fdt}\0"			\
+	"run_kern=bootz ${addr_kern} - ${addr_fdt}\0"			\
 	"init_net=run args_all args_net\0"				\
 	"init_ubi=run args_all args_ubi; "				\
 		"ubi part ubifs; ubifsmount ubi:boot;"			\
-- 
1.9.1