Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit e52a884cc39990565999c039f5465ae9933ff2fd

Authored by Carlos Hernandez
Committed by Lokesh Vutla
1 parent e48e4d8dd5
Exists in v2015.07-smarct4x and in 3 other branches ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc

ti_armv7_keystone2: env: Update UBIFS image paths 

UBI images created by OE does not contain boot partition by default,
instead kernel and dtb are placed in /boot directory inside rootfs
partition. So update env commands to load files from correct
location.

Signed-off-by: Carlos Hernandez <ceh@ti.com>

Showing 1 changed file with 5 additions and 4 deletions Side-by-side Diff

include/configs/ti_armv7_keystone2.h
Diff comments   View file @ e52a884
... ... @@ -220,6 +220,7 @@
220 220 DEFAULT_LINUX_BOOT_ENV \
221 221 CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
222 222 "boot=ubi\0" \
  223 + "bootdir=/boot\0" \
223 224 "tftp_root=/\0" \
224 225 "nfs_root=/export\0" \
225 226 "mem_lpae=1\0" \
226 227  
227 228  
228 229  
... ... @@ -231,14 +232,14 @@
231 232 "run_kern=bootz ${loadaddr} - ${fdtaddr}\0" \
232 233 "init_net=run args_all args_net\0" \
233 234 "init_ubi=run args_all args_ubi; " \
234   - "ubi part ubifs; ubifsmount ubi:boot;" \
  235 + "ubi part ubifs; ubifsmount ubi:rootfs;" \
235 236 "ubifsload ${addr_secdb_key} securedb.key.bin;\0" \
236 237 "get_fdt_net=dhcp ${fdtaddr} ${tftp_root}/${name_fdt}\0" \
237   - "get_fdt_ubi=ubifsload ${fdtaddr} ${name_fdt}name_fdt}\0" \" \
  238 + "get_fdt_ubi=ubifsload ${fdtaddr} ${bootdir}/${name_fdt}name_fdt}\0" \" \
238 239 "get_kern_net=dhcp ${loadaddr} ${tftp_root}/${name_kern}\0" \
239   - "get_kern_ubi=ubifsload ${loadaddr} ${name_kern}name_kern}\0" \" \
  240 + "get_kern_ubi=ubifsload ${loadaddr} ${bootdir}/${name_kern}name_kern}\0" \" \
240 241 "get_mon_net=dhcp ${addr_mon} ${tftp_root}/${name_mon}\0" \
241   - "get_mon_ubi=ubifsload ${addr_mon} ${name_mon}name_mon}\0" \" \
  242 + "get_mon_ubi=ubifsload ${addr_mon} ${bootdir}/${name_mon}name_mon}\0" \" \
242 243 "get_uboot_net=dhcp ${loadaddr} ${tftp_root}/${name_uboot}\0" \
243 244 "burn_uboot_spi=sf probe; sf erase 0 0x100000; " \
244 245 "sf write ${loadaddr} 0 ${filesize}\0" \