From: Yutang Jiang Date: Wed, 9 Nov 2016 15:51:48 +0000 (+0800) Subject: layerscape: ls1012ardb: only reserve ext4 fs as default firmware.bin X-Git-Tag: v17.01.0-rc1~848 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4162a7eba629bd93ddacfbfbb1c1402ded8a56b0;p=oweals%2Fopenwrt.git layerscape: ls1012ardb: only reserve ext4 fs as default firmware.bin In Device/ls1012ardb IMAGES variable, there are two separate firmware references to the same packages, while do mult-job compile, the same package build process will arise conflict occasionally. So, only reserve one ext4 fs as the default firmware.bin. Signed-off-by: Yutang Jiang --- diff --git a/target/linux/layerscape/image/Makefile b/target/linux/layerscape/image/Makefile index 6005e91cc4..bb94ff863f 100644 --- a/target/linux/layerscape/image/Makefile +++ b/target/linux/layerscape/image/Makefile @@ -72,10 +72,6 @@ ifeq ($(SUBTARGET),32b) DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1012a-rdb endif IMAGE/firmware.bin = append-ls-rcw $(1) | pad-to 1M | append-ls-uboot $(1) | pad-to 3M | \ - append-ls-dtb $$(DEVICE_DTS) | pad-to 4M | append-kernel | pad-to 9M | \ - append-rootfs | pad-to 32M | check-size 33554433 - IMAGES += firmware.ext4.bin - IMAGE/firmware.ext4.bin = append-ls-rcw $(1) | pad-to 1M | append-ls-uboot $(1) | pad-to 3M | \ append-ls-dtb $$(DEVICE_DTS) | pad-to 4M | append-kernel | pad-to 9M | \ append-ls-rootfs-ext4 $(1) 23M | check-size 33554433 endef