From dd31079edef6703a2ed0e5b1747b2db19e3ec13c Mon Sep 17 00:00:00 2001 From: "Khoronzhuk, Ivan" Date: Tue, 4 Nov 2014 16:52:35 +0200 Subject: [PATCH] keystone2: config: align names of images with MCSDK 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 Reviewed-by: Tom Rini --- 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(-) diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index 6b87f6c5eb..d83e07e242 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 diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index 33e43eb08b..ffddf1391c 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 diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index 07326fc7f5..805164a679 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 diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h index def52748ef..39973e805d 100644 --- a/include/configs/ks2_evm.h +++ b/include/configs/ks2_evm.h @@ -258,8 +258,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" \ -- 2.30.2