From: Adrian Schmutzler Date: Sun, 25 Oct 2020 16:58:49 +0000 (+0100) Subject: layerscape: harmonize wrapping for IMAGE/* definitions X-Git-Tag: v21.02.0-rc1~1281 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=46fd198338bec45915dc8a882d0b1826490f6842;p=openwrt%2Fstaging%2Fchunkeey.git layerscape: harmonize wrapping for IMAGE/* definitions Always keep the first line empty for multi-line IMAGE/* definitions. Signed-off-by: Adrian Schmutzler --- diff --git a/target/linux/layerscape/image/armv7.mk b/target/linux/layerscape/image/armv7.mk index 33bf145332..776a6e5ac2 100644 --- a/target/linux/layerscape/image/armv7.mk +++ b/target/linux/layerscape/image/armv7.mk @@ -16,7 +16,8 @@ define Device/Default DEVICE_DTS = $(lastword $(subst _, ,$(1))) SUPPORTED_DEVICES = $(subst _,$(comma),$(1)) IMAGE_SIZE := 64m - IMAGE/sysupgrade.bin = ls-append-dtb $$(DEVICE_DTS) | pad-to 1M | \ + IMAGE/sysupgrade.bin = \ + ls-append-dtb $$(DEVICE_DTS) | pad-to 1M | \ append-kernel | pad-to 17M | \ append-rootfs | pad-rootfs | \ check-size $(LS_SYSUPGRADE_IMAGE_SIZE) | append-metadata diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk index e9304c5101..23af3e26a0 100644 --- a/target/linux/layerscape/image/armv8_64b.mk +++ b/target/linux/layerscape/image/armv8_64b.mk @@ -15,7 +15,8 @@ define Device/Default DEVICE_DTS = freescale/$(subst _,-,$(1)) SUPPORTED_DEVICES = $(subst _,$(comma),$(1)) IMAGE_SIZE := 64m - IMAGE/sysupgrade.bin = ls-append-dtb $$(DEVICE_DTS) | pad-to 1M | \ + IMAGE/sysupgrade.bin = \ + ls-append-dtb $$(DEVICE_DTS) | pad-to 1M | \ append-kernel | pad-to 17M | \ append-rootfs | pad-rootfs | \ check-size $(LS_SYSUPGRADE_IMAGE_SIZE) | append-metadata @@ -45,7 +46,8 @@ define Device/fsl_ls1012a-frdm ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ append-kernel | pad-to $$(BLOCKSIZE) | \ append-rootfs | pad-rootfs | check-size - IMAGE/sysupgrade.bin := append-kernel | pad-to $$(BLOCKSIZE) | \ + IMAGE/sysupgrade.bin := \ + append-kernel | pad-to $$(BLOCKSIZE) | \ append-rootfs | pad-rootfs | \ check-size $(LS_SYSUPGRADE_IMAGE_SIZE) | append-metadata KERNEL := kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb