[U-Boot] [PATCH V3 6/8] ti_armv7_keystone2: switch to using kernel zImage

[Murali Karicheri <m-karicheri2@ti.com>]

On 07/18/2015 12:40 PM, Nishanth Menon wrote:
> 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.
>
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---
> New patch.
>
>   include/configs/k2e_evm.h            | 2 +-
>   include/configs/k2hk_evm.h           | 2 +-
>   include/configs/k2l_evm.h            | 2 +-
>   include/configs/ti_armv7_keystone2.h | 5 ++---
>   4 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
> index f1e650141ae1..afb289ca4bad 100644
> --- a/include/configs/k2e_evm.h
> +++ b/include/configs/k2e_evm.h
> @@ -19,7 +19,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 f8e83de64b63..c2d3ec7c70cb 100644
> --- a/include/configs/k2hk_evm.h
> +++ b/include/configs/k2hk_evm.h
> @@ -19,7 +19,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 395608a5f6db..1957287a57c7 100644
> --- a/include/configs/k2l_evm.h
> +++ b/include/configs/k2l_evm.h
> @@ -19,7 +19,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 ddc2e23f1370..e327f3e03073 100644
> --- 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;"			\
>
Reviewed-by: Murali Karicheri <m-karicheri2@ti.com>

-- 
Murali Karicheri
Linux Kernel, Keystone