From 0c7ec26c43a42bc36dd0062844d2a09e8a054e90 Mon Sep 17 00:00:00 2001 From: Dominik Sliwa Date: Fri, 20 May 2016 14:12:51 +0200 Subject: colibri_t20: read kernel and device tree from static UBI volumes With the next release 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. Boot times are also slightly faster (measurements showed an improvement of ~150ms). Signed-off-by: Dominik Sliwa Acked-by: Max Krummenacher --- include/configs/colibri_t20.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 694c9278d8..703e20b14d 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -171,11 +171,13 @@ "ubi.fm_autoconvert=1\0" \ "ubiboot=run setup; setenv bootargs ${defargs} ${ubiargs} ${mtdparts}" \ " ${setupargs} ${vidargs}; echo Booting from NAND...; " \ - "ubi part ubi && ubifsmount ubi0:rootfs && run ubidtbload; " \ - "ubifsload ${kernel_addr_r} /boot/${boot_file} && " \ - "bootz ${kernel_addr_r} - ${dtbparam}\0" \ - "ubidtbload=setenv dtbparam; ubifsload ${fdt_addr_r} " \ - "/boot/${soc}-colibri-${fdt_board}.dtb && " \ + "ubi part ubi && " \ + "ubi read ${kernel_addr_r} kernel &&" \ + "run ubidtbload; " \ + "bootz ${kernel_addr_r} - ${dtbparam}; " \ + "bootz ${kernel_addr_r} - \0" \ + "ubidtbload=setenv dtbparam; " \ + "ubi read ${fdt_addr_r} dtb && " \ "setenv dtbparam ${fdt_addr_r}\0" #define USB_BOOTCMD \ -- cgit v1.2.3