From 63f5268c7ffc774da6f1c3e2fa4bab15527a5632 Mon Sep 17 00:00:00 2001 From: Tomasz Maciej Nowak Date: Tue, 25 Feb 2020 20:07:38 +0100 Subject: [PATCH] layerscape: ls1012afrdm: convert image to squashfs This commit replaces UBIFS root partition with squashfs+overlay. It's preparation for introducing dynamic partitioning. Signed-off-by: Tomasz Maciej Nowak --- package/boot/uboot-layerscape/files/ls1012afrdm-uEnv.txt | 2 +- target/linux/layerscape/image/armv8_64b.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/boot/uboot-layerscape/files/ls1012afrdm-uEnv.txt b/package/boot/uboot-layerscape/files/ls1012afrdm-uEnv.txt index ccc98dd299..0f213d85e8 100644 --- a/package/boot/uboot-layerscape/files/ls1012afrdm-uEnv.txt +++ b/package/boot/uboot-layerscape/files/ls1012afrdm-uEnv.txt @@ -3,6 +3,6 @@ loadaddr=0x81000000 fdt_high=0xffffffffffffffff initrd_high=0xffffffffffffffff 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.quadspi:1m(bl2),4m(fip),1m(u-boot-env),4m(reserved-1),3m(pfe),2m(reserved-2),1m(dtb),16m(kernel),32m(ubifs) +bootargs=rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=1550000.quadspi: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 bootdelay=3 diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk index c2e091fb2a..70af95aa28 100644 --- a/target/linux/layerscape/image/armv8_64b.mk +++ b/target/linux/layerscape/image/armv8_64b.mk @@ -23,9 +23,8 @@ define Device/ls1012afrdm tfa-ls1012afrdm \ kmod-ppfe DEVICE_DTS := freescale/fsl-ls1012a-frdm - UBINIZE_OPTS := -E 5 BLOCKSIZE := 256KiB - PAGESIZE := 1 + FILESYSTEMS := squashfs IMAGE/firmware.bin := \ ls-clean | \ ls-append $(1)-bl2.pbl | pad-to 1M | \ @@ -34,7 +33,7 @@ define Device/ls1012afrdm ls-append pfe.itb | pad-to 15M | \ ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ append-kernel | pad-to 32M | \ - append-ubi | check-size 67108865 + append-rootfs | pad-rootfs | check-size 67108865 KERNEL_INITRAMFS := kernel-bin | fit none $$(DTS_DIR)/$$(DEVICE_DTS).dtb endef TARGET_DEVICES += ls1012afrdm