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>
This commit is contained in:
Yangbo Lu 2018-01-22 16:33:29 +08:00 committed by John Crispin
parent 1079a03886
commit e547bd36bd
5 changed files with 15 additions and 15 deletions

View file

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

View file

@ -21,12 +21,12 @@ index d163347..d26147b 100644
+ " bootm $load_addr#$board\0" \ + " bootm $load_addr#$board\0" \
+ "lede_setenv=setenv loadaddr 82000000 && " \ + "lede_setenv=setenv loadaddr 82000000 && " \
+ "setenv fdtaddr 8f000000 && " \ + "setenv fdtaddr 8f000000 && " \
+ "setenv bootargs root=/dev/mtdblock9 " \ + "setenv bootargs ubi.mtd=9 root=ubi0:rootfs rw " \
+ "rootfstype=ext4 noinitrd " \ + "rootfstype=ubifs noinitrd " \
+ "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \ + "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \
+ "mtdparts=1550000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \ + "mtdparts=1550000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \
+ "5M(reserved-1),256k(fman),5888k(reserved-2),1M(dtb)," \ + "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 && " \ + "lede_run=sf probe 0:0 && " \
+ "sf read $fdtaddr f00000 100000 && " \ + "sf read $fdtaddr f00000 100000 && " \
+ "sf read $loadaddr 1000000 1000000 && " \ + "sf read $loadaddr 1000000 1000000 && " \

View file

@ -20,12 +20,12 @@ index 5fe3218..242cdf0 100644
+ "bootm $load_addr#$board\0" \ + "bootm $load_addr#$board\0" \
+ "lede_setenv=setenv loadaddr 82000000 && " \ + "lede_setenv=setenv loadaddr 82000000 && " \
+ "setenv fdtaddr 8f000000 && " \ + "setenv fdtaddr 8f000000 && " \
+ "setenv bootargs root=/dev/mtdblock8 " \ + "setenv bootargs ubi.mtd=8 root=ubi0:rootfs rw " \
+ "rootfstype=ext4 noinitrd " \ + "rootfstype=ubifs noinitrd " \
+ "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \ + "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \
+ "mtdparts=1550000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \ + "mtdparts=1550000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \
+ "5M(reserved-1),256k(fman),5888k(reserved-2),1M(dtb)," \ + "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 && " \ + "lede_run=pfe stop && sf probe 0:0 && " \
+ "sf read $fdtaddr f00000 100000 && " \ + "sf read $fdtaddr f00000 100000 && " \
+ "sf read $loadaddr 1000000 1000000 && " \ + "sf read $loadaddr 1000000 1000000 && " \

View file

@ -20,12 +20,12 @@ index 7bd152d..4cefa40 100644
+ "bootm $load_addr#$BOARD\0" \ + "bootm $load_addr#$BOARD\0" \
+ "lede_setenv=setenv loadaddr 82000000 && " \ + "lede_setenv=setenv loadaddr 82000000 && " \
+ "setenv fdtaddr 8f000000 && " \ + "setenv fdtaddr 8f000000 && " \
+ "setenv bootargs root=/dev/mtdblock10 " \ + "setenv bootargs ubi.mtd=10 root=ubi0:rootfs rw " \
+ "rootfstype=ext4 noinitrd " \ + "rootfstype=ubifs noinitrd " \
+ "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \ + "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \
+ "mtdparts=20c0000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \ + "mtdparts=20c0000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \
+ "6M(reserved-1),3M(mc),1M(dpl),1M(dpc),1M(dtb)," \ + "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 && " \ + "lede_run=sf probe 0:0 && " \
+ "sf read $fdtaddr f00000 100000 && " \ + "sf read $fdtaddr f00000 100000 && " \
+ "sf read $loadaddr 1000000 1000000 && " \ + "sf read $loadaddr 1000000 1000000 && " \

View file

@ -18,12 +18,12 @@ index a3f8824d27..36dff19bdd 100644
"$kernel_addr $kernel_size && bootm $load_addr#$board\0" \ "$kernel_addr $kernel_size && bootm $load_addr#$board\0" \
+ "lede_setenv=setenv loadaddr 82000000 && " \ + "lede_setenv=setenv loadaddr 82000000 && " \
+ "setenv fdtaddr 8f000000 && " \ + "setenv fdtaddr 8f000000 && " \
+ "setenv bootargs root=/dev/mtdblock8 " \ + "setenv bootargs ubi.mtd=8 root=ubi0:rootfs rw " \
+ "rootfstype=ext4 noinitrd " \ + "rootfstype=ubifs noinitrd " \
+ "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \ + "earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 " \
+ "mtdparts=1550000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \ + "mtdparts=1550000.quadspi:1M(rcw),2M(u-boot),1M(u-boot-env)," \
+ "5M(reserved-1),256k(fman),5888k(reserved-2),1M(dtb)," \ + "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 && " \ + "lede_run=pfe stop && sf probe 0:0 && " \
+ "sf read $fdtaddr f00000 100000 && " \ + "sf read $fdtaddr f00000 100000 && " \
+ "sf read $loadaddr 1000000 1000000 && " \ + "sf read $loadaddr 1000000 1000000 && " \