From: Mathias Kresin Date: Sun, 11 Sep 2016 17:05:20 +0000 (+0200) Subject: image: remove padding parameter from append-kernel/append-rootfs X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=61c2a7339a70b34cc357f9f190921365c39073f9;p=openwrt%2Fstaging%2Fjow.git image: remove padding parameter from append-kernel/append-rootfs Using pad-to instead of passing the optional padding to append-kernel or append-rootfs. It could be that the value of a variable is passed. In case the variable is empty no error is thrown. Furthermore the purpose of the extra parameter is hard to get without reading the code. Signed-off-by: Mathias Kresin --- diff --git a/include/image-commands.mk b/include/image-commands.mk index 7ff4c217a3..6386e55b79 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -103,11 +103,11 @@ define Build/patch-cmdline endef define Build/append-kernel - dd if=$(IMAGE_KERNEL) $(if $(1),bs=$(1) conv=sync) >> $@ + dd if=$(IMAGE_KERNEL) >> $@ endef define Build/append-rootfs - dd if=$(IMAGE_ROOTFS) $(if $(1),bs=$(1) conv=sync) >> $@ + dd if=$(IMAGE_ROOTFS) >> $@ endef define Build/append-ubi diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index a8c215b36d..bce5cd3774 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -94,7 +94,7 @@ define Device/Default KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma COMPILE := IMAGES := sysupgrade.bin - IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) endef $(eval $(call BuildImage)) diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index bd92a8413d..dc2b43cbe9 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -106,7 +106,7 @@ define Device/wndr3700 MTDPARTS = spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,7680k(firmware),64k(art)ro IMAGES := sysupgrade.bin factory.img factory-NA.img KERNEL := kernel-bin | patch-cmdline | lzma -d20 | netgear-uImage lzma - IMAGE/default = append-kernel $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs + IMAGE/default = append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs IMAGE/sysupgrade.bin = $$(IMAGE/default) | check-size $$$$(IMAGE_SIZE) IMAGE/factory.img = $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE) IMAGE/factory-NA.img = $$(IMAGE/default) | netgear-dni NA | check-size $$$$(IMAGE_SIZE) @@ -410,7 +410,7 @@ define Device/NBG6616 CMDLINE += mem=128M IMAGES := sysupgrade.bin KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma | jffs2 boot/vmlinux.lzma.uImage - IMAGE/sysupgrade.bin = append-kernel $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) # We cannot currently build a factory image. It is the sysupgrade image # prefixed with a header (which is actually written into the MTD device). # The header is 2kiB and is filled with 0xff. The format seems to be: @@ -443,7 +443,7 @@ define Device/c-55 KERNEL_SIZE = 2048k IMAGE_SIZE = 15872k MTDPARTS = spi0.0:256k(u-boot)ro,128k(u-boot-env)ro,2048k(kernel),13824k(rootfs),13824k(opt)ro,2624k(failsafe)ro,64k(art)ro,15872k@0x60000(firmware) - IMAGE/sysupgrade.bin = append-kernel $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += c-55 diff --git a/target/linux/ar71xx/image/ubnt.mk b/target/linux/ar71xx/image/ubnt.mk index 98c9ca0066..5a4dc82c4f 100644 --- a/target/linux/ar71xx/image/ubnt.mk +++ b/target/linux/ar71xx/image/ubnt.mk @@ -48,7 +48,7 @@ define Device/ubnt-xm UBNT_CHIP := ar7240 IMAGES := sysupgrade.bin factory.bin IMAGE/factory.bin = $$(IMAGE/sysupgrade.bin) | mkubntimage-split - IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) endef define Device/ubnt-xw @@ -61,7 +61,7 @@ define Device/ubnt-xw UBNT_CHIP := ar934x IMAGES := sysupgrade.bin factory.bin IMAGE/factory.bin = $$(IMAGE/sysupgrade.bin) | mkubntimage-split - IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) endef define Device/ubnt-bz @@ -74,7 +74,7 @@ define Device/ubnt-bz UBNT_CHIP := ar934x IMAGES := sysupgrade.bin factory.bin IMAGE/factory.bin = $$(IMAGE/sysupgrade.bin) | mkubntimage-split - IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) endef define Device/ubnt-unifiac @@ -83,7 +83,7 @@ define Device/ubnt-unifiac IMAGE_SIZE := 7744k MTDPARTS = spi0.0:384k(u-boot)ro,64k(u-boot-env)ro,7744k(firmware),7744k(ubnt-airos)ro,128k(bs)ro,256k(cfg)ro,64k(EEPROM)ro IMAGES := sysupgrade.bin - IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) endef define Device/rw2458n @@ -261,7 +261,7 @@ define Device/ubnt-uap-pro DEVICE_PROFILE := UBNT UAPPRO KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma | jffs2 kernel0 IMAGES := sysupgrade.bin factory.bin - IMAGE/sysupgrade.bin = append-kernel $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) IMAGE/factory.bin = $$(IMAGE/sysupgrade.bin) | mkubntimage2 endef diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index 12d2a311ef..80bd01942e 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -59,7 +59,7 @@ define Device/linksys-audi FILESYSTEMS := squashfs PROFILES := Generic AUDI IMAGES += factory.bin - IMAGE/factory.bin := append-kernel $$$$(KERNEL_SIZE) | append-ubi + IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi endef define Device/linksys-viper @@ -68,7 +68,7 @@ define Device/linksys-viper FILESYSTEMS := squashfs PROFILES := Generic VIPER IMAGES += factory.bin - IMAGE/factory.bin := append-kernel $$$$(KERNEL_SIZE) | append-ubi + IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi endef define Image/BuildKernel/Template diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index 2c3d6589fe..9509c1902f 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -71,7 +71,7 @@ define Device/UBI-factory $(Device/UBI) UBINIZE_OPTS := -E 5 IMAGES += factory.img - IMAGE/factory.img := append-kernel $$$$(KERNEL_SIZE) | append-ubi | pad-to $$$$(PAGESIZE) + IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | pad-to $$$$(PAGESIZE) endef define Device/NAND-128K @@ -167,7 +167,7 @@ TARGET_DEVICES += armada-370-db armada-370-rd armada-xp-db armada-xp-gp define Device/armada-388-rd DEVICE_TITLE := Marvell Armada 388 RD (RD-88F6820-AP) IMAGES := firmware.bin - IMAGE/firmware.bin := append-kernel 256k | append-rootfs | pad-rootfs + IMAGE/firmware.bin := append-kernel | pad-to 256k | append-rootfs | pad-rootfs endef TARGET_DEVICES += armada-388-rd