diff options
| author | Nishanth Menon <nm@ti.com> | 2015-07-22 18:05:47 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-27 15:03:12 -0400 |
| commit | bad773f486296df236fefe3c33363ccf44bf411d (patch) | |
| tree | b7a5b2fef72712ad435cc7631d8962867b968d27 /include | |
| parent | fd72d31897fa89086ca0c8876b1c960284d5038a (diff) | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/k2e_evm.h | 2 | ||||
| -rw-r--r-- | include/configs/k2hk_evm.h | 2 | ||||
| -rw-r--r-- | include/configs/k2l_evm.h | 2 | ||||
| -rw-r--r-- | 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 f1e650141a..afb289ca4b 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 f8e83de64b..c2d3ec7c70 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 395608a5f6..1957287a57 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 19771070ac..2b6a2297e6 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -211,7 +211,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 \ @@ -222,9 +221,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;" \ |