From eb45022c4c798388c89bb2ca4735ae58e3f9d436 Mon Sep 17 00:00:00 2001 From: Chin Liang See Date: Tue, 22 Dec 2015 15:32:34 +0800 Subject: arm: socfpga: sr1500: Enable ubiload console command Enabling ubiload command to load kernel image and device tree from mtd part labeled "UBI". ubiload command will search the file from directory /boot. Signed-off-by: Chin Liang See Cc: Dinh Nguyen Cc: Dinh Nguyen Cc: Pavel Machek Cc: Marek Vasut Cc: Stefan Roese --- include/configs/socfpga_sr1500.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/configs/socfpga_sr1500.h') diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index 5bd29563b8..f37d005883 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -74,7 +74,10 @@ "qspirootfstype=jffs2\0" \ "qspiboot=setenv bootargs " CONFIG_BOOTARGS \ " root=${qspiroot} rw rootfstype=${qspirootfstype};"\ - "bootm ${loadaddr} - ${fdt_addr}\0" + "bootm ${loadaddr} - ${fdt_addr}\0" \ + "ubiload=ubi part UBI && ubifsmount ubi0 && " \ + "ubifsload ${loadaddr} /boot/${bootimage} && " \ + "ubifsload ${fdt_addr} /boot/${fdtimage}\0" /* Environment */ #define CONFIG_ENV_IS_IN_SPI_FLASH -- cgit v1.2.1 From b3bb1110cf8d2c43f15841151af0d560dc74c7b8 Mon Sep 17 00:00:00 2001 From: Chin Liang See Date: Tue, 22 Dec 2015 15:32:38 +0800 Subject: arm: socfpga: sr1500: Enable qspiload console command Enabling qspiload command which will load the kernel image and dtb from UBIFS within MTD partition labeled UBI. Signed-off-by: Chin Liang See Cc: Dinh Nguyen Cc: Dinh Nguyen Cc: Pavel Machek Cc: Marek Vasut Cc: Stefan Roese --- include/configs/socfpga_sr1500.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/configs/socfpga_sr1500.h') diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index f37d005883..0ebea13f58 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -70,6 +70,7 @@ "mmcload=mmc rescan;" \ "load mmc 0:1 ${loadaddr} ${bootimage};" \ "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ + "qspiload=sf probe && mtdparts default && run ubiload\0" \ "qspiroot=/dev/mtdblock0\0" \ "qspirootfstype=jffs2\0" \ "qspiboot=setenv bootargs " CONFIG_BOOTARGS \ -- cgit v1.2.1 From 94f53a7ddfaf9af844121e3437031a07297c478e Mon Sep 17 00:00:00 2001 From: Chin Liang See Date: Tue, 22 Dec 2015 15:32:42 +0800 Subject: arm: socfpga: sr1500: Update qspiboot to use UBIFS Update the qspiboot console command to use UBIFS instead of old jffs2 file system. Signed-off-by: Chin Liang See Cc: Dinh Nguyen Cc: Dinh Nguyen Cc: Pavel Machek Cc: Marek Vasut Cc: Stefan Roese --- include/configs/socfpga_sr1500.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include/configs/socfpga_sr1500.h') diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index 0ebea13f58..fdf67ca098 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -71,11 +71,9 @@ "load mmc 0:1 ${loadaddr} ${bootimage};" \ "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ "qspiload=sf probe && mtdparts default && run ubiload\0" \ - "qspiroot=/dev/mtdblock0\0" \ - "qspirootfstype=jffs2\0" \ "qspiboot=setenv bootargs " CONFIG_BOOTARGS \ - " root=${qspiroot} rw rootfstype=${qspirootfstype};"\ - "bootm ${loadaddr} - ${fdt_addr}\0" \ + " ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\ + "bootz ${loadaddr} - ${fdt_addr}\0" \ "ubiload=ubi part UBI && ubifsmount ubi0 && " \ "ubifsload ${loadaddr} /boot/${bootimage} && " \ "ubifsload ${fdt_addr} /boot/${fdtimage}\0" -- cgit v1.2.1