Commit dd31079edef6703a2ed0e5b1747b2db19e3ec13c

Authored by Khoronzhuk, Ivan
Committed by Tom Rini
1 parent 349c26dd06

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 <ivan.khoronzhuk@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>

Showing 4 changed files with 10 additions and 8 deletions Side-by-side Diff

include/configs/k2e_evm.h
... ... @@ -21,10 +21,11 @@
21 21 "addr_mon=0x0c140000\0" \
22 22 "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
23 23 "root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,2048\0" \
24   - "name_fdt=k2e-evm.dtbk2e-evm.dtb\0" \" \
  24 + "name_fdt=uImage-k2e-evm.dtbk2e-evm.dtb\0" \" \
25 25 "name_mon=skern-k2e-evm.bin\0" \
26 26 "name_ubi=k2e-evm-ubifs.ubi\0" \
27   - "name_uboot=u-boot-spi-k2e-evm.gph\0"
  27 + "name_uboot=u-boot-spi-k2e-evm.gph\0" \
  28 + "name_fs=arago-console-image-k2e-evm.cpio.gz\0"
28 29  
29 30 #include <configs/ks2_evm.h>
30 31  
include/configs/k2hk_evm.h
... ... @@ -21,10 +21,11 @@
21 21 "addr_mon=0x0c5f0000\0" \
22 22 "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
23 23 "root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,2048\0" \
24   - "name_fdt=k2hk-evm.dtb\0" \
  24 + "name_fdt=uImage-k2hk-evm.dtb\0" \
25 25 "name_mon=skern-k2hk-evm.bin\0" \
26 26 "name_ubi=k2hk-evm-ubifs.ubi\0" \
27   - "name_uboot=u-boot-spi-k2hk-evm.gph\0"
  27 + "name_uboot=u-boot-spi-k2hk-evm.gph\0" \
  28 + "name_fs=arago-console-image-k2hk-evm.cpio.gz\0"
28 29  
29 30 #include <configs/ks2_evm.h>
30 31  
include/configs/k2l_evm.h
... ... @@ -21,10 +21,11 @@
21 21 "addr_mon=0x0c140000\0" \
22 22 "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
23 23 "root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,4096\0" \
24   - "name_fdt=k2l-evm.dtbk2l-evm.dtb\0" \" \
  24 + "name_fdt=uImage-k2l-evm.dtbk2l-evm.dtb\0" \" \
25 25 "name_mon=skern-k2l-evm.bin\0" \
26 26 "name_ubi=k2l-evm-ubifs.ubi\0" \
27   - "name_uboot=u-boot-spi-k2l-evm.gph\0"
  27 + "name_uboot=u-boot-spi-k2l-evm.gph\0" \
  28 + "name_fs=arago-console-image-k2l-evm.cpio.gz\0"
28 29  
29 30 #include <configs/ks2_evm.h>
30 31  
include/configs/ks2_evm.h
... ... @@ -258,8 +258,7 @@
258 258 "addr_ubi=0x82000000\0" \
259 259 "addr_secdb_key=0xc000000\0" \
260 260 "fdt_high=0xffffffff\0" \
261   - "name_fs=arago-console-image.cpio.gz\0" \
262   - "name_kern=uImage\0" \
  261 + "name_kern=uImage-keystone-evm.bin\0" \
263 262 "run_mon=mon_install ${addr_mon}\0" \
264 263 "run_kern=bootm ${addr_kern} - ${addr_fdt}\0" \
265 264 "init_net=run args_all args_net\0" \