[ELDK] [PATCH 02/10] META-ELDK: u-boot: Adjust loading from UBI on M53EVK

[Marek Vasut]

This patch adjusts two things. First of all, it adjusts the 'nandload' command
to load the kernel from UBIFS instead of raw NAND. Having the kernel on UBIFS
is very important, since even thought the M53 uses SLC NAND, the NAND is still
very prone to data corruption and bitrot. Placing the kernel into UBI/UBIFS
partition mitigates the data corruption.

Moreover, to reflect that we no longer load the kernel from raw NAND, rename
the 'nand.*' commands to 'ubi.*' to be consistent with their true function.

Signed-off-by: Marek Vasut <marex at denx.de>
Cc: Wolfgang Denk <wd at denx.de>
---
 ...003-ARM-m53evk-Update-default-environment.patch | 32 ++++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/meta-eldk/recipes-bsp/uboot/u-boot/m53evk/0003-ARM-m53evk-Update-default-environment.patch b/meta-eldk/recipes-bsp/uboot/u-boot/m53evk/0003-ARM-m53evk-Update-default-environment.patch
index 2b0e305..2a4841e 100644
--- a/meta-eldk/recipes-bsp/uboot/u-boot/m53evk/0003-ARM-m53evk-Update-default-environment.patch
+++ b/meta-eldk/recipes-bsp/uboot/u-boot/m53evk/0003-ARM-m53evk-Update-default-environment.patch
@@ -7,8 +7,8 @@ Signed-off-by: Marek Vasut <marex at denx.de>
 Signed-off-by: Lothar Rubusch <lothar at denx.de>
 Signed-off-by: Wolfgang Denk <wd at denx.de>
 ---
- include/configs/m53evk.h | 85 +++++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 84 insertions(+), 1 deletion(-)
+ include/configs/m53evk.h | 87 +++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 86 insertions(+), 1 deletion(-)
 
 diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
 index 7f33b8e..169baf0 100644
@@ -34,7 +34,7 @@ index 7f33b8e..169baf0 100644
  #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
  #define CONFIG_OF_LIBFDT
  
-@@ -268,4 +270,85 @@
+@@ -268,4 +270,87 @@
  #define CONFIG_SYS_NAND_SIZE		(256 * 1024 * 1024)
  #define CONFIG_SYS_NAND_BAD_BLOCK_POS	0
  
@@ -73,12 +73,14 @@ index 7f33b8e..169baf0 100644
 +	"mmcload="							\
 +		"mmc rescan ; "						\
 +		"ext4load mmc 0:1 ${kernel_addr_r} ${bootfile}\0"	\
-+	"nandload=nand read ${kernel_addr_r} kernel\0"			\
++	"ubiload="							\
++		"ubi part UBI ; ubifsmount ubi0:rootfs ; "		\
++		"ubifsload ${kernel_addr_r} /boot/${bootfile}\0"	\
 +	"netload="							\
 +		"tftp ${kernel_addr_r} ${hostname}/${bootfile}\0"	\
 +	"miscargs=nohlt panic=1\0"					\
 +	"mmcargs=setenv bootargs root=${rootdev} rw rootwait\0"		\
-+	"nandargs="							\
++	"ubiargs="							\
 +		"setenv bootargs ubi.mtd=5 "				\
 +		"root=ubi0:rootfs rootfstype=ubifs\0"			\
 +	"nfsargs="							\
@@ -87,26 +89,26 @@ index 7f33b8e..169baf0 100644
 +	"mmc_mmc="							\
 +		"run mmcload mmcargs addargs ; "			\
 +		"bootm ${kernel_addr_r}\0"				\
-+	"mmc_nand="							\
-+		"run mmcload nandargs addargs ; "			\
++	"mmc_ubi="							\
++		"run mmcload ubiargs addargs ; "			\
 +		"bootm ${kernel_addr_r}\0"				\
 +	"mmc_nfs="							\
 +		"run mmcload nfsargs addip addargs ; "			\
 +		"bootm ${kernel_addr_r}\0"				\
-+	"nand_mmc="							\
-+		"run nandload mmcargs addargs ; "			\
++	"ubi_mmc="							\
++		"run ubiload mmcargs addargs ; "			\
 +		"bootm ${kernel_addr_r}\0"				\
-+	"nand_nand="							\
-+		"run nandload nandargs addargs ; "			\
++	"ubi_ubi="							\
++		"run ubiload ubiargs addargs ; "			\
 +		"bootm ${kernel_addr_r}\0"				\
-+	"nand_nfs="							\
-+		"run nandload nfsargs addip addargs ; "			\
++	"ubi_nfs="							\
++		"run ubiload nfsargs addip addargs ; "			\
 +		"bootm ${kernel_addr_r}\0"				\
 +	"net_mmc="							\
 +		"run netload mmcargs addargs ; "			\
 +		"bootm ${kernel_addr_r}\0"				\
-+	"net_nand="							\
-+		"run netload nandargs addargs ; "			\
++	"net_ubi="							\
++		"run netload ubiargs addargs ; "			\
 +		"bootm ${kernel_addr_r}\0"				\
 +	"net_nfs="							\
 +		"run netload nfsargs addip addargs ; "			\
-- 
1.9.0