layerscape: support ubifs rootfs in u-boot env

ls1012ardb/ls1012afrdm/ls1046ardb/ls1088ardb firmwares now use ubifs
rootfs. So u-boot env should be set accordingly.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>

diff --git a/package/boot/uboot-layerscape-armv8_32b/Makefile b/package/boot/uboot-layerscape-armv8_32b/Makefile
index d02b15193d32f180abd89e503c334791dfb25518..3d3b684dc1be62cc8630f484c3d519a3b757be10 100644 (file)
--- a/package/boot/uboot-layerscape-armv8_32b/Makefile
+++ b/package/boot/uboot-layerscape-armv8_32b/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uboot-layerscape-armv8_32b
-PKG_SOURCE_DATE:=2018-01-19
+PKG_SOURCE_DATE:=2018-01-22
 PKG_RELEASE:=1
 
 # Layerscape ARMv8 platforms use 64-bit u-boot to support both 32-bit and 64-bit
@@ -17,8 +17,8 @@ PKG_RELEASE:=1
 # uboot-layerscape's source code.
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/yangbolu1991/u-boot-lede.git
-PKG_SOURCE_VERSION:=9fbc70acb44171a3a9be232c17dbed6067a22dfb
-PKG_MIRROR_HASH:=4ad42eb27952fc427e5763295b530b43d29894b9fe9b2cc34b66216ba0cdad70
+PKG_SOURCE_VERSION:=40a40dfd8136fcc314dd442a3b24a41b1e5652dd
+PKG_MIRROR_HASH:=3dde5a33d19c573cbdce74f5d7edb6c5ca2a26a39d503c3efe5d5ad06f01e9f5
 
 PKG_MAINTAINER:=Yangbo Lu <yangbo.lu@nxp.com>
 

diff --git a/package/boot/uboot-layerscape/patches/0002-armv8-ls1046ardb-add-LEDE-boot-support-in-environmen.patch b/package/boot/uboot-layerscape/patches/0002-armv8-ls1046ardb-add-LEDE-boot-support-in-environmen.patch
index d7a6e053e51274525140353f2f1b03cd40377ec4..f2e72870e756a9942e41dc20a91100eb2bb6313b 100644 (file)
--- a/package/boot/uboot-layerscape/patches/0002-armv8-ls1046ardb-add-LEDE-boot-support-in-environmen.patch
+++ b/package/boot/uboot-layerscape/patches/0002-armv8-ls1046ardb-add-LEDE-boot-support-in-environmen.patch
@@ -21,12 +21,12 @@ index d163347..d26147b 100644
 +              " bootm $load_addr#$board\0" \
 +      "lede_setenv=setenv loadaddr 82000000 && " \
 +              "setenv fdtaddr 8f000000 && " \
-+              "setenv bootargs root=/dev/mtdblock9 " \
-+              "rootfstype=ext4 noinitrd " \
++              "setenv bootargs ubi.mtd=9 root=ubi0:rootfs rw " \
++              "rootfstype=ubifs noinitrd " \
 +              "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \
 +              "mtdparts=1550000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \
 +              "5M(reserved-1),256k(fman),5888k(reserved-2),1M(dtb)," \
-+              "16M(kernel),30M(ext4rfs),2M(user)\0" \
++              "16M(kernel),32M(ubifs)\0" \
 +      "lede_run=sf probe 0:0 && " \
 +              "sf read $fdtaddr f00000 100000 && " \
 +              "sf read $loadaddr 1000000 1000000 && " \

diff --git a/package/boot/uboot-layerscape/patches/0003-armv8-ls1012ardb-add-LEDE-boot-support-in-environmen.patch b/package/boot/uboot-layerscape/patches/0003-armv8-ls1012ardb-add-LEDE-boot-support-in-environmen.patch
index e8bbe7faa386b4debd61767ea6167b5d9d6188e2..f9f1ed41a486af4fb01cbe139593c60cbf41acd3 100644 (file)
--- a/package/boot/uboot-layerscape/patches/0003-armv8-ls1012ardb-add-LEDE-boot-support-in-environmen.patch
+++ b/package/boot/uboot-layerscape/patches/0003-armv8-ls1012ardb-add-LEDE-boot-support-in-environmen.patch
@@ -20,12 +20,12 @@ index 5fe3218..242cdf0 100644
 +              "bootm $load_addr#$board\0" \
 +      "lede_setenv=setenv loadaddr 82000000 && " \
 +              "setenv fdtaddr 8f000000 && " \
-+              "setenv bootargs root=/dev/mtdblock8 " \
-+              "rootfstype=ext4 noinitrd " \
++              "setenv bootargs ubi.mtd=8 root=ubi0:rootfs rw " \
++              "rootfstype=ubifs noinitrd " \
 +              "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \
 +              "mtdparts=1550000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \
 +              "5M(reserved-1),256k(fman),5888k(reserved-2),1M(dtb)," \
-+              "16M(kernel),30M(ext4rfs),2M(user)\0" \
++              "16M(kernel),32M(ubifs)\0" \
 +      "lede_run=pfe stop && sf probe 0:0 && " \
 +              "sf read $fdtaddr f00000 100000 && " \
 +              "sf read $loadaddr 1000000 1000000 && " \

diff --git a/package/boot/uboot-layerscape/patches/0004-armv8-ls1088ardb-add-LEDE-boot-support-in-environmen.patch b/package/boot/uboot-layerscape/patches/0004-armv8-ls1088ardb-add-LEDE-boot-support-in-environmen.patch
index eaf0da28337224b48a0c8cf6f77ac9f97c1fafb6..6ce71f2c667d4c1dd979856d87a32909ed972790 100644 (file)
--- a/package/boot/uboot-layerscape/patches/0004-armv8-ls1088ardb-add-LEDE-boot-support-in-environmen.patch
+++ b/package/boot/uboot-layerscape/patches/0004-armv8-ls1088ardb-add-LEDE-boot-support-in-environmen.patch
@@ -20,12 +20,12 @@ index 7bd152d..4cefa40 100644
 +              "bootm $load_addr#$BOARD\0"                     \
 +      "lede_setenv=setenv loadaddr 82000000 && " \
 +              "setenv fdtaddr 8f000000 && " \
-+              "setenv bootargs root=/dev/mtdblock10 " \
-+              "rootfstype=ext4 noinitrd " \
++              "setenv bootargs ubi.mtd=10 root=ubi0:rootfs rw " \
++              "rootfstype=ubifs noinitrd " \
 +              "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \
 +              "mtdparts=20c0000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \
 +              "6M(reserved-1),3M(mc),1M(dpl),1M(dpc),1M(dtb)," \
-+              "16M(kernel),30M(ext4rfs),2M(user)\0" \
++              "16M(kernel),32M(ubifs)\0" \
 +      "lede_run=sf probe 0:0 && " \
 +              "sf read $fdtaddr f00000 100000 && " \
 +              "sf read $loadaddr 1000000 1000000 && " \

diff --git a/package/boot/uboot-layerscape/patches/0006-armv8-ls1012afrdm-add-LEDE-boot-support-in-environme.patch b/package/boot/uboot-layerscape/patches/0006-armv8-ls1012afrdm-add-LEDE-boot-support-in-environme.patch
index 45010a210834265fda58cb7d8a63179fe2790b97..524b7f45062c098d85a9f5faffc5475a577dadaf 100644 (file)
--- a/package/boot/uboot-layerscape/patches/0006-armv8-ls1012afrdm-add-LEDE-boot-support-in-environme.patch
+++ b/package/boot/uboot-layerscape/patches/0006-armv8-ls1012afrdm-add-LEDE-boot-support-in-environme.patch
@@ -18,12 +18,12 @@ index a3f8824d27..36dff19bdd 100644
                "$kernel_addr $kernel_size && bootm $load_addr#$board\0" \
 +      "lede_setenv=setenv loadaddr 82000000 && " \
 +              "setenv fdtaddr 8f000000 && " \
-+              "setenv bootargs root=/dev/mtdblock8 " \
-+              "rootfstype=ext4 noinitrd " \
++              "setenv bootargs ubi.mtd=8 root=ubi0:rootfs rw " \
++              "rootfstype=ubifs noinitrd " \
 +              "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \
 +              "mtdparts=1550000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \
 +              "5M(reserved-1),256k(fman),5888k(reserved-2),1M(dtb)," \
-+              "16M(kernel),30M(ext4rfs),2M(user)\0" \
++              "16M(kernel),32M(ubifs)\0" \
 +      "lede_run=pfe stop && sf probe 0:0 && " \
 +              "sf read $fdtaddr f00000 100000 && " \
 +              "sf read $loadaddr 1000000 1000000 && " \