From: Sanchayan Maity <maitysanchayan@gmail.com>
Date: Fri, 25 Nov 2016 10:49:17 +0000 (+0530)
Subject: colibri_vf: Read kernel and device tree from static UBI volumes
X-Git-Tag: v2017.01-rc1~156^2~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3ed82d6f9bcb3dd2403d432af28787ba1d83fe1b;p=oweals%2Fu-boot.git

colibri_vf: Read kernel and device tree from static UBI volumes

Our update scripts write the kernel and device tree in seperate
UBI volumes. This allows to use a lot less UBI/UBIFS support in
U-Boot, which should lower the risk of hitting bugs in this area.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
---

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 0cd77fff51..d58145e59d 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -116,9 +116,9 @@
 	"ubiboot=run setup; " \
 	"setenv bootargs ${defargs} ${ubiargs} ${mtdparts} "   \
 	"${setupargs} ${vidargs}; echo Booting from NAND...; " \
-	"ubi part ubi && ubifsmount ubi0:rootfs && " \
-	"ubifsload ${kernel_addr_r} /boot/${kernel_file} && " \
-	"ubifsload ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \
+	"ubi part ubi && " \
+	"ubi read ${kernel_addr_r} kernel && " \
+	"ubi read ${fdt_addr_r} dtb && " \
 	"bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
 
 #define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot"