diff mbox

[U-Boot,02/10] ti_armv7_keystone2: env: Update UBIFS image paths

Message ID 1457518179-25947-3-git-send-email-lokeshvutla@ti.com
State Accepted
Commit 48dc1657a7f32d4d61010e6e6bee58bcddc04864
Delegated to: Tom Rini
Headers show

Commit Message

Lokesh Vutla March 9, 2016, 10:09 a.m. UTC 
From: Carlos Hernandez <ceh@ti.com>

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>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
 include/configs/ti_armv7_keystone2.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Tom Rini March 11, 2016, 5:07 p.m. UTC | #1 
On Wed, Mar 09, 2016 at 03:39:31PM +0530, Lokesh Vutla wrote:

> From: Carlos Hernandez <ceh@ti.com>
> 
> 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>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

Reviewed-by: Tom Rini <trini@konsulko.com>
Tom Rini March 17, 2016, 2:03 a.m. UTC | #2 
On Wed, Mar 09, 2016 at 03:39:31PM +0530, Lokesh Vutla wrote:

> From: Carlos Hernandez <ceh@ti.com>
> 
> 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>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>

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

Patch

diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 39e9852..85f5d64 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -240,6 +240,7 @@ 
 	DEFAULT_LINUX_BOOT_ENV						\
 	CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS				\
 	"boot=ubi\0"							\
+	"bootdir=/boot\0" \
 	"tftp_root=/\0"							\
 	"nfs_root=/export\0"						\
 	"mem_lpae=1\0"							\
@@ -251,14 +252,14 @@ 
 	"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;"			\
+		"ubi part ubifs; ubifsmount ubi:rootfs;"			\
 		"ubifsload ${addr_secdb_key} securedb.key.bin;\0"       \
 	"get_fdt_net=dhcp ${fdtaddr} ${tftp_root}/${name_fdt}\0"	\
-	"get_fdt_ubi=ubifsload ${fdtaddr} ${name_fdt}\0"		\
+	"get_fdt_ubi=ubifsload ${fdtaddr} ${bootdir}/${name_fdt}\0"		\
 	"get_kern_net=dhcp ${loadaddr} ${tftp_root}/${name_kern}\0"	\
-	"get_kern_ubi=ubifsload ${loadaddr} ${name_kern}\0"		\
+	"get_kern_ubi=ubifsload ${loadaddr} ${bootdir}/${name_kern}\0"		\
 	"get_mon_net=dhcp ${addr_mon} ${tftp_root}/${name_mon}\0"	\
-	"get_mon_ubi=ubifsload ${addr_mon} ${name_mon}\0"		\
+	"get_mon_ubi=ubifsload ${addr_mon} ${bootdir}/${name_mon}\0"		\
 	"get_uboot_net=dhcp ${loadaddr} ${tftp_root}/${name_uboot}\0"	\
 	"burn_uboot_spi=sf probe; sf erase 0 0x80000; "		\
 		"sf write ${loadaddr} 0 ${filesize}\0"		\