From: Nishanth Menon <nm@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH V4 7/8] configs: ti_armv7_keystone2: switch to using kernel zImage
Date: Wed, 22 Jul 2015 18:05:47 -0500 [thread overview]
Message-ID: <1437606348-14067-8-git-send-email-nm@ti.com> (raw)
In-Reply-To: <1437606348-14067-1-git-send-email-nm@ti.com>
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>
---
V4: no change. only picked up reviewed-bys
V3: https://patchwork.ozlabs.org/patch/497390/
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;" \
--
2.1.4
next prev parent reply other threads:[~2015-07-22 23:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-22 23:05 [U-Boot] [PATCH V4 0/8] configs: make keystone2 configs start using armv7 common header Nishanth Menon
2015-07-22 23:05 ` [U-Boot] [PATCH V4 1/8] configs: split ti_armv7_common into a omap generic header Nishanth Menon
2015-07-28 15:00 ` [U-Boot] [U-Boot, V4, " Tom Rini
2015-07-22 23:05 ` [U-Boot] [PATCH V4 2/8] configs: ti: armv7_common: enable Thumb mode for all Nishanth Menon
2015-07-23 21:00 ` Tom Rini
2015-07-28 15:00 ` [U-Boot] [U-Boot, V4, " Tom Rini
2015-07-22 23:05 ` [U-Boot] [PATCH V4 3/8] board: ks2_evm: get rid of bogus CONFIG_LINUX_BOOT_PARAM_ADDR Nishanth Menon
2015-07-28 15:00 ` [U-Boot] [U-Boot, V4, " Tom Rini
2015-07-22 23:05 ` [U-Boot] [PATCH V4 4/8] configs: rename ks2_evm into ti_armv7_keystone2 Nishanth Menon
2015-07-28 15:00 ` [U-Boot] [U-Boot, V4, " Tom Rini
2015-07-22 23:05 ` [U-Boot] [PATCH V4 5/8] configs: ti_armv7_keystone2: start using armv7_common Nishanth Menon
2015-07-23 21:01 ` Tom Rini
2015-07-28 15:00 ` [U-Boot] [U-Boot, V4, " Tom Rini
2015-07-22 23:05 ` [U-Boot] [PATCH V4 6/8] configs: ti_armv7_keystone2: switch addresses to generic addresses Nishanth Menon
2015-07-28 15:00 ` [U-Boot] [U-Boot, V4, " Tom Rini
2015-07-22 23:05 ` Nishanth Menon [this message]
2015-07-28 15:00 ` [U-Boot] [U-Boot, V4, 7/8] configs: ti_armv7_keystone2: switch to using kernel zImage Tom Rini
2015-07-22 23:05 ` [U-Boot] [PATCH V4 8/8] configs: k2*_evm: rename skernel binary names to generated file names Nishanth Menon
2015-07-28 15:00 ` [U-Boot] [U-Boot, V4, " Tom Rini
2015-07-23 13:34 ` [U-Boot] [PATCH V4 0/8] configs: make keystone2 configs start using armv7 common header Murali Karicheri
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437606348-14067-8-git-send-email-nm@ti.com \
--to=nm@ti.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox