EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

layerscape: convert to squashfs rootfs for QSPI NOR boot

Browse Source 
There had been an issue in Layerscape QSPI driver for very long
time, which made squashfs,jffs2 rootfs not work on QSPI NOR.
And the ubifs had been used as a workaround.
Now the issue has been fixed. So convert to use squashfs,jffs2
rootfs on QSPI NOR for Layerscape boards (LS1012ARDB/LS1046ARDB/
LS1088ARDB), and update u-boot bootargs for booting.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
This commit is contained in:
Yangbo Lu 2020-05-27 11:10:19 +08:00 committed by Petr Štetiar
parent eb24a57b7f
commit 5ca8903631
4 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/boot/uboot-layerscape/files/ls1012ardb-uEnv.txt
View File

@ -3,6 +3,6 @@ loadaddr=0x81000000
fdt_high=0xffffffffffffffff fdt_high=0xffffffffffffffff
initrd_high=0xffffffffffffffff initrd_high=0xffffffffffffffff
qspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000 1000000;bootm $loadaddr - $fdtaddr qspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000 1000000;bootm $loadaddr - $fdtaddr
bootargs=ubi.mtd=8 root=ubi0:rootfs rw rootfstype=ubifs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=1550000.spi:1m(bl2),4m(fip),1m(u-boot-env),4m(reserved-1),3m(pfe),2m(reserved-2),1m(dtb),16m(kernel),32m(ubifs) bootargs=root=/dev/mtdblock8 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=1550000.spi:1m(bl2),4m(fip),1m(u-boot-env),4m(reserved-1),3m(pfe),2m(reserved-2),1m(dtb),16m(kernel),32m(rootfs)
bootcmd=echo starting openwrt ...;pfe stop;run qspi_boot bootcmd=echo starting openwrt ...;pfe stop;run qspi_boot
bootdelay=3 bootdelay=3

2
package/boot/uboot-layerscape/files/ls1046ardb-uEnv.txt
View File

@ -4,6 +4,6 @@ fdt_high=0xffffffffffffffff
initrd_high=0xffffffffffffffff initrd_high=0xffffffffffffffff
hwconfig=fsl_ddr:bank_intlv=auto hwconfig=fsl_ddr:bank_intlv=auto
qspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000 1000000;bootm $loadaddr - $fdtaddr qspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000 1000000;bootm $loadaddr - $fdtaddr
bootargs=ubi.mtd=9 root=ubi0:rootfs rw rootfstype=ubifs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=1550000.spi-0:1m(bl2),4m(fip),1m(u-boot-env),3m(reserved-1),256k(fman),5888k(reserved-2),1m(dtb),16m(kernel),32m(ubifs) bootargs=root=/dev/mtdblock9 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=1550000.spi-0:1m(bl2),4m(fip),1m(u-boot-env),3m(reserved-1),256k(fman),5888k(reserved-2),1m(dtb),16m(kernel),32m(rootfs)
bootcmd=echo starting openwrt ...;run qspi_boot bootcmd=echo starting openwrt ...;run qspi_boot
bootdelay=3 bootdelay=3

2
package/boot/uboot-layerscape/files/ls1088ardb-uEnv.txt
View File

@ -5,6 +5,6 @@ initrd_high=0xffffffffffffffff
hwconfig=fsl_ddr:bank_intlv=auto hwconfig=fsl_ddr:bank_intlv=auto
mc_init=sf probe 0:0;sf read 80000000 a00000 300000;sf read 80300000 e00000 100000;fsl_mc start mc 80000000 80300000;sf read 80400000 d00000 100000;fsl_mc apply dpl 80400000 mc_init=sf probe 0:0;sf read 80000000 a00000 300000;sf read 80300000 e00000 100000;fsl_mc start mc 80000000 80300000;sf read 80400000 d00000 100000;fsl_mc apply dpl 80400000
qspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000 1000000;bootm $loadaddr - $fdtaddr qspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000 1000000;bootm $loadaddr - $fdtaddr
bootargs=ubi.mtd=10 root=ubi0:rootfs rw rootfstype=ubifs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=20c0000.spi-0:1m(bl2),4m(fip),1m(u-boot-env),4m(reserved-1),3m(mc),1m(dpl),1m(dpc),1m(dtb),16m(kernel),32m(ubifs) bootargs=root=/dev/mtdblock10 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=20c0000.spi-0:1m(bl2),4m(fip),1m(u-boot-env),4m(reserved-1),3m(mc),1m(dpl),1m(dpc),1m(dtb),16m(kernel),32m(rootfs)
bootcmd=echo starting openwrt ...;run mc_init;run qspi_boot bootcmd=echo starting openwrt ...;run mc_init;run qspi_boot
bootdelay=3 bootdelay=3

22
target/linux/layerscape/image/armv8_64b.mk
View File

@ -8,8 +8,7 @@
define Device/Default define Device/Default
PROFILES := Default PROFILES := Default
IMAGES := firmware.bin IMAGES := firmware.bin
FILESYSTEMS := ubifs FILESYSTEMS := squashfs
MKUBIFS_OPTS := -m 1 -e 262016 -c 128
KERNEL := kernel-bin | gzip | uImage gzip KERNEL := kernel-bin | gzip | uImage gzip
KERNEL_LOADADDR := 0x80080000 KERNEL_LOADADDR := 0x80080000
KERNEL_ENTRY_POINT := 0x80080000 KERNEL_ENTRY_POINT := 0x80080000
@ -24,7 +23,6 @@ define Device/ls1012afrdm
kmod-ppfe kmod-ppfe
DEVICE_DTS := freescale/fsl-ls1012a-frdm DEVICE_DTS := freescale/fsl-ls1012a-frdm
BLOCKSIZE := 256KiB BLOCKSIZE := 256KiB
FILESYSTEMS := squashfs
IMAGES += sysupgrade.bin IMAGES += sysupgrade.bin
IMAGE/firmware.bin := \ IMAGE/firmware.bin := \
ls-clean | \ ls-clean | \
@ -51,9 +49,6 @@ define Device/ls1012ardb
tfa-ls1012ardb \ tfa-ls1012ardb \
kmod-ppfe kmod-ppfe
DEVICE_DTS := freescale/fsl-ls1012a-rdb DEVICE_DTS := freescale/fsl-ls1012a-rdb
UBINIZE_OPTS := -E 5
BLOCKSIZE := 256KiB
PAGESIZE := 1
IMAGE/firmware.bin := \ IMAGE/firmware.bin := \
ls-clean | \ ls-clean | \
ls-append $(1)-bl2.pbl | pad-to 1M | \ ls-append $(1)-bl2.pbl | pad-to 1M | \
@ -62,7 +57,7 @@ define Device/ls1012ardb
ls-append pfe.itb | pad-to 15M | \ ls-append pfe.itb | pad-to 15M | \
ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
append-kernel | pad-to 32M | \ append-kernel | pad-to 32M | \
append-ubi | check-size 67108865 append-rootfs | pad-rootfs | check-size 67108865
endef endef
TARGET_DEVICES += ls1012ardb TARGET_DEVICES += ls1012ardb
@ -101,7 +96,6 @@ define Device/ls1043ardb
tfa-ls1043ardb \ tfa-ls1043ardb \
fmc fmc-eth-config fmc fmc-eth-config
DEVICE_DTS := freescale/fsl-ls1043a-rdb-sdk DEVICE_DTS := freescale/fsl-ls1043a-rdb-sdk
FILESYSTEMS := squashfs
IMAGE/firmware.bin := \ IMAGE/firmware.bin := \
ls-clean | \ ls-clean | \
ls-append $(1)-bl2.pbl | pad-to 1M | \ ls-append $(1)-bl2.pbl | pad-to 1M | \
@ -147,9 +141,6 @@ define Device/ls1046ardb
tfa-ls1046ardb \ tfa-ls1046ardb \
fmc fmc-eth-config fmc fmc-eth-config
DEVICE_DTS := freescale/fsl-ls1046a-rdb-sdk DEVICE_DTS := freescale/fsl-ls1046a-rdb-sdk
UBINIZE_OPTS := -E 5
BLOCKSIZE := 256KiB
PAGESIZE := 1
IMAGE/firmware.bin := \ IMAGE/firmware.bin := \
ls-clean | \ ls-clean | \
ls-append $(1)-bl2.pbl | pad-to 1M | \ ls-append $(1)-bl2.pbl | pad-to 1M | \
@ -158,7 +149,7 @@ define Device/ls1046ardb
ls-append $(1)-fman.bin | pad-to 15M | \ ls-append $(1)-fman.bin | pad-to 15M | \
ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
append-kernel | pad-to 32M | \ append-kernel | pad-to 32M | \
append-ubi | check-size 67108865 append-rootfs | pad-rootfs | check-size 67108865
endef endef
TARGET_DEVICES += ls1046ardb TARGET_DEVICES += ls1046ardb
@ -196,9 +187,6 @@ define Device/ls1088ardb
tfa-ls1088ardb \ tfa-ls1088ardb \
restool restool
DEVICE_DTS := freescale/fsl-ls1088a-rdb DEVICE_DTS := freescale/fsl-ls1088a-rdb
UBINIZE_OPTS := -E 5
BLOCKSIZE := 256KiB
PAGESIZE := 1
IMAGE/firmware.bin := \ IMAGE/firmware.bin := \
ls-clean | \ ls-clean | \
ls-append $(1)-bl2.pbl | pad-to 1M | \ ls-append $(1)-bl2.pbl | pad-to 1M | \
@ -209,7 +197,7 @@ define Device/ls1088ardb
ls-append $(1)-dpc.dtb | pad-to 15M | \ ls-append $(1)-dpc.dtb | pad-to 15M | \
ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
append-kernel | pad-to 32M | \ append-kernel | pad-to 32M | \
append-ubi | check-size 67108865 append-rootfs | pad-rootfs | check-size 67108865
endef endef
TARGET_DEVICES += ls1088ardb TARGET_DEVICES += ls1088ardb
@ -249,7 +237,6 @@ define Device/ls2088ardb
tfa-ls2088ardb \ tfa-ls2088ardb \
restool restool
DEVICE_DTS := freescale/fsl-ls2088a-rdb DEVICE_DTS := freescale/fsl-ls2088a-rdb
FILESYSTEMS := squashfs
IMAGE/firmware.bin := \ IMAGE/firmware.bin := \
ls-clean | \ ls-clean | \
ls-append $(1)-bl2.pbl | pad-to 1M | \ ls-append $(1)-bl2.pbl | pad-to 1M | \
@ -272,6 +259,7 @@ define Device/traverse-ls1043
KERNEL_INSTALL := 1 KERNEL_INSTALL := 1
FDT_LOADADDR = 0x90000000 FDT_LOADADDR = 0x90000000
FILESYSTEMS := ubifs FILESYSTEMS := ubifs
MKUBIFS_OPTS := -m 1 -e 262016 -c 128
DEVICE_PACKAGES += \ DEVICE_PACKAGES += \
layerscape-fman \ layerscape-fman \
uboot-envtools \ uboot-envtools \