summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSin Hui Kho <sin.hui.kho@intel.com>2021-08-31 22:45:12 +0800
committerSin Hui Kho <sin.hui.kho@intel.com>2021-10-23 01:19:30 +0800
commit95a5e26e8dc073df06a1e98dcb0fcd2e447e1ed1 (patch)
tree342f6b512ab85af978737ac5180b7a5bec22d457
parent96bf5b91d32cd69d38b473d348b29e993198264a (diff)
downloadu-boot-socfpga-socfpga_v2021.07_RC.tar.gz
HSD #14014983934-4: arm: socfpga: soc64: Load and boot for NAND flash with UBI and UBIFS in enviromentrel_socfpga_v2021.07_RC_21.11.02_prsocfpga_v2021.07_RC
Load kernel and device tree from UBI volume. Set root file system type for NAND boot as UBIFS located at UBI volume on MTD partition 1 or namely "root". Signed-off-by: Sin Hui Kho <sin.hui.kho@intel.com>
-rw-r--r--include/configs/socfpga_soc64_common.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index 63d813bf3b..95f641a5a8 100644
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -149,15 +149,15 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
"scriptfile=u-boot.scr\0" \
"fatscript=if fatload mmc 0:1 ${scriptaddr} ${scriptfile};" \
"then source ${scriptaddr}:script; fi\0" \
- "nandroot=/dev/mtdblock5\0" \
- "nandload=nand read ${loadaddr} kernel; nand read ${fdt_addr} dtb\0" \
+ "nandroot=ubi0:rootfs\0" \
+ "nandload=ubi part root; ubi readvol ${loadaddr} kernel; ubi readvol ${fdt_addr} dtb\0" \
"nandboot=setenv bootargs " CONFIG_BOOTARGS \
- " root=${nandroot} rw rootwait rootfstype=jffs2; " \
+ " root=${nandroot} rw rootwait rootfstype=ubifs ubi.mtd=1; " \
"booti ${loadaddr} - ${fdt_addr}\0" \
"nandfitboot=setenv bootargs " CONFIG_BOOTARGS \
- " root=${nandroot} rw rootwait rootfstype=jffs2; " \
+ " root=${nandroot} rw rootwait rootfstype=ubifs ubi.mtd=1; " \
"bootm ${loadaddr}\0" \
- "nandfitload=nand read ${loadaddr} kernel\0" \
+ "nandfitload=ubi part root; ubi readvol ${loadaddr} kernel\0" \
"socfpga_legacy_reset_compat=1\0" \
"rsu_status=rsu dtb; rsu display_dcmf_version; "\
"rsu display_dcmf_status; rsu display_max_retry\0" \