diff mbox

[U-Boot,U-boot,2/2] keystone2: config: align names of images with MCSDK

Message ID 1415112755-3099-3-git-send-email-ivan.khoronzhuk@ti.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Ivan Khoronzhuk Nov. 4, 2014, 2:52 p.m. UTC 
The Multicore Software Development Kit (MCSDK) provides foundational
software for TI KeyStone II device platforms. It's supposed to be used
with uboot, and it's convenient to have the same names for images, so
correct environment image names according to the last MCSDK3.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
 include/configs/k2e_evm.h  | 5 +++--
 include/configs/k2hk_evm.h | 5 +++--
 include/configs/k2l_evm.h  | 5 +++--
 include/configs/ks2_evm.h  | 3 +--
 4 files changed, 10 insertions(+), 8 deletions(-)

Comments

Tom Rini Nov. 4, 2014, 4:46 p.m. UTC | #1 
On Tue, Nov 04, 2014 at 04:52:35PM +0200, Ivan Khoronzhuk wrote:

> The Multicore Software Development Kit (MCSDK) provides foundational
> software for TI KeyStone II device platforms. It's supposed to be used
> with uboot, and it's convenient to have the same names for images, so
> correct environment image names according to the last MCSDK3.
> 
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>

Reviewed-by: Tom Rini <trini@ti.com>
Tom Rini Nov. 5, 2014, 9:32 p.m. UTC | #2 
On Tue, Nov 04, 2014 at 04:52:35PM +0200, Khoronzhuk, Ivan wrote:

> The Multicore Software Development Kit (MCSDK) provides foundational
> software for TI KeyStone II device platforms. It's supposed to be used
> with uboot, and it's convenient to have the same names for images, so
> correct environment image names according to the last MCSDK3.
> 
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
> Reviewed-by: Tom Rini <trini@ti.com>

Applied to u-boot-ti/master, thanks!
diff mbox

Patch

diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index 6b87f6c..d83e07e 100644
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -21,10 +21,11 @@ 
 	"addr_mon=0x0c140000\0"						\
 	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
 	"root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,2048\0"		\
-	"name_fdt=k2e-evm.dtb\0"					\
+	"name_fdt=uImage-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"
+	"name_uboot=u-boot-spi-k2e-evm.gph\0"				\
+	"name_fs=arago-console-image-k2e-evm.cpio.gz\0"
 
 #include <configs/ks2_evm.h>
 
diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index 33e43eb..ffddf13 100644
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -21,10 +21,11 @@ 
 	"addr_mon=0x0c5f0000\0"						\
 	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
 	"root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,2048\0"		\
-	"name_fdt=k2hk-evm.dtb\0"					\
+	"name_fdt=uImage-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"
+	"name_uboot=u-boot-spi-k2hk-evm.gph\0"				\
+	"name_fs=arago-console-image-k2hk-evm.cpio.gz\0"
 
 #include <configs/ks2_evm.h>
 
diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index 07326fc..805164a 100644
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -21,10 +21,11 @@ 
 	"addr_mon=0x0c140000\0"						\
 	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
 	"root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,4096\0"		\
-	"name_fdt=k2l-evm.dtb\0"					\
+	"name_fdt=uImage-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"
+	"name_uboot=u-boot-spi-k2l-evm.gph\0"				\
+	"name_fs=arago-console-image-k2l-evm.cpio.gz\0"
 
 #include <configs/ks2_evm.h>
 
diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h
index 19273d9..e4890ba 100644
--- a/include/configs/ks2_evm.h
+++ b/include/configs/ks2_evm.h
@@ -260,8 +260,7 @@ 
 	"addr_ubi=0x82000000\0"						\
 	"addr_secdb_key=0xc000000\0"					\
 	"fdt_high=0xffffffff\0"						\
-	"name_fs=arago-console-image.cpio.gz\0"				\
-	"name_kern=uImage\0"						\
+	"name_kern=uImage-keystone-evm.bin\0"				\
 	"run_mon=mon_install ${addr_mon}\0"				\
 	"run_kern=bootm ${addr_kern} - ${addr_fdt}\0"			\
 	"init_net=run args_all args_net\0"				\