diff options
| author | Yangbo Lu <yangbo.lu@nxp.com> | 2018-01-22 16:33:29 +0800 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-02-13 10:01:51 +0100 |
| commit | e547bd36bd3942e2b94d542567a07cb70b072ce6 (patch) | |
| tree | a6254f759e03714f7d5c9c297ca4383396a74f1b /package/boot/uboot-layerscape | |
| parent | 1079a03886807557e3a21cbe6266a7ad21106720 (diff) | |
| download | upstream-e547bd36bd3942e2b94d542567a07cb70b072ce6.tar.gz upstream-e547bd36bd3942e2b94d542567a07cb70b072ce6.tar.bz2 upstream-e547bd36bd3942e2b94d542567a07cb70b072ce6.zip | |
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>
Diffstat (limited to 'package/boot/uboot-layerscape')
4 files changed, 12 insertions, 12 deletions
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 d7a6e053e5..f2e72870e7 100644 --- 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 e8bbe7faa3..f9f1ed41a4 100644 --- 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 eaf0da2833..6ce71f2c66 100644 --- 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 45010a2108..524b7f4506 100644 --- 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 && " \ |