From 0757f7fedca77d169682d41e7b861d86e7308a11 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 19 Dec 2019 20:42:19 +0100 Subject: [PATCH] ath79: harmonize line breaks in image Makefiles This harmonizes the line wrapping in image Makefile device definitions, as those are frequently copy-pasted and are a common subject of review comments. Having the treatment unifying should reduce the cases where adjustment is necessary afterwards. Harmonization is achieved by consistently (read "strictly") applying certain rules: - Never put more than 80 characters into one line - Fill lines up (do not break after 40 chars because of ...) - Use one tab for indent after wrapping by "\" - Only break after pipe "|" for IMAGE variables Signed-off-by: Adrian Schmutzler --- target/linux/ath79/image/common-netgear.mk | 6 +- target/linux/ath79/image/common-tp-link.mk | 34 ++-- target/linux/ath79/image/generic-tp-link.mk | 36 +++-- target/linux/ath79/image/generic-ubnt.mk | 22 ++- target/linux/ath79/image/generic.mk | 168 ++++++++++++-------- target/linux/ath79/image/nand.mk | 33 ++-- target/linux/ath79/image/tiny-netgear.mk | 12 +- target/linux/ath79/image/tiny.mk | 14 +- 8 files changed, 187 insertions(+), 138 deletions(-) diff --git a/target/linux/ath79/image/common-netgear.mk b/target/linux/ath79/image/common-netgear.mk index 8311222a91..8fa6b030fc 100644 --- a/target/linux/ath79/image/common-netgear.mk +++ b/target/linux/ath79/image/common-netgear.mk @@ -37,6 +37,8 @@ define Device/netgear_ath79 DEVICE_VENDOR := NETGEAR KERNEL := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma IMAGES += factory.img - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ + check-size $$$$(IMAGE_SIZE) + IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | \ + check-size $$$$(IMAGE_SIZE) endef diff --git a/target/linux/ath79/image/common-tp-link.mk b/target/linux/ath79/image/common-tp-link.mk index bda81a3e2b..0dc58191a8 100644 --- a/target/linux/ath79/image/common-tp-link.mk +++ b/target/linux/ath79/image/common-tp-link.mk @@ -1,4 +1,5 @@ -DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT TPLINK_HEADER_VERSION TPLINK_BOARD_NAME TPLINK_BOARD_ID +DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT TPLINK_HEADER_VERSION +DEVICE_VARS += TPLINK_BOARD_NAME TPLINK_BOARD_ID define rootfs_align $(patsubst %-256k,0x40000,$(patsubst %-128k,0x20000,$(patsubst %-64k,0x10000,$(patsubst squashfs%,0x4,$(patsubst root.%,%,$(1)))))) @@ -14,12 +15,9 @@ endef # -X reserve bytes in the firmware image (hexval prefixed with 0x) define Build/mktplinkfw -$(STAGING_DIR_HOST)/bin/mktplinkfw \ - -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) \ - -m $(TPLINK_HEADER_VERSION) \ - -k $(IMAGE_KERNEL) \ - -r $@ \ - -o $@.new \ - -j -X 0x40000 \ + -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) \ + -N OpenWrt -V $(REVISION) -m $(TPLINK_HEADER_VERSION) \ + -k $(IMAGE_KERNEL) -r $@ -o $@.new -j -X 0x40000 \ -a $(call rootfs_align,$(FILESYSTEM)) \ $(wordlist 2,$(words $(1)),$(1)) \ $(if $(findstring sysupgrade,$(word 1,$(1))),-s) && mv $@.new $@ || rm -f $@ @@ -30,19 +28,16 @@ endef # -c combined image define Build/mktplinkfw-combined $(STAGING_DIR_HOST)/bin/mktplinkfw \ - -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) $(1) \ - -m $(TPLINK_HEADER_VERSION) \ - -k $@ \ - -o $@.new \ - -s -S \ - -c + -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) \ + -N OpenWrt -V $(REVISION) $(1) -m $(TPLINK_HEADER_VERSION) \ + -k $@ -o $@.new -s -S -c @mv $@.new $@ endef define Build/uImageArcher mkimage -A $(LINUX_KARCH) \ - -O linux -T kernel \ - -C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ + -O linux -T kernel -C $(1) -a $(KERNEL_LOADADDR) \ + -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ -n '$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $@ $@.new @mv $@.new $@ endef @@ -55,7 +50,8 @@ define Device/tplink KERNEL := kernel-bin | append-dtb | lzma KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | tplink-v1-header IMAGES += factory.bin - IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade | append-metadata + IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade | \ + append-metadata IMAGE/factory.bin := append-rootfs | mktplinkfw factory endef @@ -64,7 +60,8 @@ define Device/tplink-nolzma LOADER_FLASH_OFFS := 0x22000 COMPILE := loader-$(1).gz COMPILE/loader-$(1).gz := loader-okli-compile - KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) 7680 + KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 | \ + loader-okli $(1) 7680 KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | tplink-v1-header endef @@ -117,5 +114,6 @@ define Device/tplink-loader-okli LOADER_FLASH_OFFS := 0x43000 COMPILE := loader-$(1).elf COMPILE/loader-$(1).elf := loader-okli-compile - KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) 12288 + KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 | \ + loader-okli $(1) 12288 endef diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index c43927e19b..260e5a37c4 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -6,7 +6,8 @@ define Device/tplink_archer-a7-v5 IMAGE_SIZE := 15104k DEVICE_MODEL := Archer A7 DEVICE_VARIANT := v5 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca988x-ct TPLINK_BOARD_ID := ARCHER-A7-V5 BOARDNAME := ARCHER-A7-V5 SUPPORTED_DEVICES += archer-a7-v5 @@ -41,7 +42,8 @@ define Device/tplink_archer-c5-v1 ATH_SOC := qca9558 DEVICE_MODEL := Archer C5 DEVICE_VARIANT := v1 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca988x-ct TPLINK_HWID := 0xc5000001 SUPPORTED_DEVICES += archer-c5 endef @@ -66,7 +68,8 @@ define Device/tplink_archer-c59-v1 DEVICE_MODEL := Archer C59 DEVICE_VARIANT := v1 TPLINK_BOARD_ID := ARCHER-C59-V1 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca9888-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca9888-ct SUPPORTED_DEVICES += archer-c59-v1 endef TARGET_DEVICES += tplink_archer-c59-v1 @@ -78,7 +81,8 @@ define Device/tplink_archer-c59-v2 DEVICE_MODEL := Archer C59 DEVICE_VARIANT := v2 TPLINK_BOARD_ID := ARCHER-C59-V2 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca9888-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca9888-ct SUPPORTED_DEVICES += archer-c59-v2 endef TARGET_DEVICES += tplink_archer-c59-v2 @@ -148,7 +152,8 @@ define Device/tplink_archer-c7-v2 ATH_SOC := qca9558 DEVICE_MODEL := Archer C7 DEVICE_VARIANT := v2 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca988x-ct TPLINK_HWID := 0xc7000002 SUPPORTED_DEVICES += archer-c7 IMAGES += factory-us.bin factory-eu.bin @@ -163,7 +168,8 @@ define Device/tplink_archer-c7-v4 IMAGE_SIZE := 15104k DEVICE_MODEL := Archer C7 DEVICE_VARIANT := v4 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca988x-ct TPLINK_BOARD_ID := ARCHER-C7-V4 BOARDNAME := ARCHER-C7-V4 SUPPORTED_DEVICES += archer-c7-v4 @@ -176,7 +182,8 @@ define Device/tplink_archer-c7-v5 IMAGE_SIZE := 15360k DEVICE_MODEL := Archer C7 DEVICE_VARIANT := v5 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca988x-ct TPLINK_BOARD_ID := ARCHER-C7-V5 BOARDNAME := ARCHER-C7-V5 SUPPORTED_DEVICES += archer-c7-v5 @@ -188,7 +195,8 @@ define Device/tplink_archer-d50-v1 DEVICE_VENDOR := TP-Link DEVICE_MODEL := Archer D50 DEVICE_VARIANT := v1 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca988x-ct BOARDNAME := ARCHER-D50-V1 IMAGE_SIZE := 7808k TPLINK_HWID := 0xC1200001 @@ -198,10 +206,10 @@ define Device/tplink_archer-d50-v1 TPLINK_HVERSION := 3 KERNEL := kernel-bin | append-dtb | lzma KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | \ - tplink-v2-header -s -V "ver. 1.0" + tplink-v2-header -s -V "ver. 1.0" IMAGES := sysupgrade.bin - IMAGE/sysupgrade.bin := tplink-v2-image -s -V "ver. 2.0" | \ - append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := tplink-v2-image -s -V "ver. 2.0" | append-metadata | \ + check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += tplink_archer-d50-v1 @@ -495,7 +503,7 @@ define Device/tplink_tl-wr2543-v1 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x25430001 IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade -v 3.13.99 | \ - append-metadata | check-size $$$$(IMAGE_SIZE) + append-metadata | check-size $$$$(IMAGE_SIZE) IMAGE/factory.bin := append-rootfs | mktplinkfw factory -v 3.13.99 SUPPORTED_DEVICES += tl-wr2543-v1 endef @@ -568,8 +576,8 @@ define Device/tplink_tl-wr902ac-v1 ATH_SOC := qca9531 DEVICE_MODEL := TL-WR902AC DEVICE_VARIANT := v1 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport \ - kmod-ath10k-ct ath10k-firmware-qca9887-ct -swconfig -uboot-envtools + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca9887-ct -swconfig -uboot-envtools TPLINK_BOARD_ID := TL-WR902AC-V1 IMAGE_SIZE := 7360k TPLINK_HWID := 0x0 diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 59c22b8af4..6deff781f7 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -8,11 +8,9 @@ UBNT_REVISION := $(VERSION_DIST)-$(REVISION) # mkubntimage is using the kernel image direct # routerboard creates partitions out of the ubnt header define Build/mkubntimage - -$(STAGING_DIR_HOST)/bin/mkfwimage \ - -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-$(VERSION_DIST)-$(REVISION) \ - -k $(IMAGE_KERNEL) \ - -r $@ \ - -o $@ + -$(STAGING_DIR_HOST)/bin/mkfwimage -B $(UBNT_BOARD) \ + -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-$(VERSION_DIST)-$(REVISION) \ + -k $(IMAGE_KERNEL) -r $@ -o $@ endef # all UBNT XM/WA devices expect the kernel image to have 1024k while flash, when @@ -21,11 +19,9 @@ define Build/mkubntimage-split -[ -f $@ ] && ( \ dd if=$@ of=$@.old1 bs=1024k count=1; \ dd if=$@ of=$@.old2 bs=1024k skip=1; \ - $(STAGING_DIR_HOST)/bin/mkfwimage \ - -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v$(UBNT_VERSION)-$(UBNT_REVISION) \ - -k $@.old1 \ - -r $@.old2 \ - -o $@; \ + $(STAGING_DIR_HOST)/bin/mkfwimage -B $(UBNT_BOARD) \ + -v $(UBNT_TYPE).$(UBNT_CHIP).v$(UBNT_VERSION)-$(UBNT_REVISION) \ + -k $@.old1 -r $@.old2 -o $@; \ rm $@.old1 $@.old2 ) endef @@ -184,12 +180,14 @@ endef TARGET_DEVICES += ubnt_rocket-m define Device/ubnt_routerstation_common - DEVICE_PACKAGES := -kmod-ath9k -wpad-mini -uboot-envtools kmod-usb-ohci kmod-usb2 fconfig + DEVICE_PACKAGES := -kmod-ath9k -wpad-mini -uboot-envtools kmod-usb-ohci \ + kmod-usb2 fconfig DEVICE_VENDOR := Ubiquiti ATH_SOC := ar7161 IMAGE_SIZE := 16128k IMAGES := factory.bin - IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | \ + check-size $$$$(IMAGE_SIZE) KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE) KERNEL_INITRAMFS := kernel-bin | append-dtb endef diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 865126549a..aa30c7c762 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -82,10 +82,10 @@ define Device/seama # - 28 bytes seama_header # - 36 bytes of META data (4-bytes aligned) IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs - IMAGE/sysupgrade.bin := \ - $$(IMAGE/default) | seama | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := \ - $$(IMAGE/default) | pad-rootfs -x 64 | seama | seama-seal | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := $$(IMAGE/default) | seama | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | pad-rootfs -x 64 | seama | \ + seama-seal | check-size $$$$(IMAGE_SIZE) SEAMA_SIGNATURE := endef @@ -110,7 +110,8 @@ define Device/adtran_bsap1880 IMAGES += kernel.bin rootfs.bin IMAGE/kernel.bin := append-kernel IMAGE/rootfs.bin := append-rootfs | pad-rootfs - IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | \ + check-size $$$$(IMAGE_SIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata endef define Device/adtran_bsap1800-v2 @@ -153,8 +154,8 @@ define Device/avm_fritz300e KERNEL_INITRAMFS := $$(KERNEL) IMAGE_SIZE := 15232k IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | \ - append-squashfs-fakeroot-be | pad-to 256 | \ - append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + append-squashfs-fakeroot-be | pad-to 256 | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := fritz-tffs rssileds -swconfig endef TARGET_DEVICES += avm_fritz300e @@ -167,8 +168,8 @@ define Device/avm_fritz4020 KERNEL := kernel-bin | append-dtb | lzma | eva-image KERNEL_INITRAMFS := $$(KERNEL) IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | \ - append-squashfs-fakeroot-be | pad-to 256 | \ - append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + append-squashfs-fakeroot-be | pad-to 256 | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := fritz-tffs SUPPORTED_DEVICES += fritz4020 endef @@ -181,8 +182,10 @@ define Device/buffalo_bhr-4grv DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport IMAGE_SIZE := 32256k IMAGES += factory.bin tftp.bin - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc BHR-4GRV 1.99 | buffalo-tag BHR-4GRV 3 + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc BHR-4GRV 1.99 | \ + buffalo-tag BHR-4GRV 3 IMAGE/tftp.bin := $$(IMAGE/default) | buffalo-tftp-header SUPPORTED_DEVICES += wzr-hp-g450h endef @@ -202,10 +205,13 @@ define Device/buffalo_wzr-hp-ag300h DEVICE_MODEL := WZR-HP-AG300H IMAGE_SIZE := 32320k IMAGES += factory.bin tftp.bin - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-AG300H 1.99 | buffalo-tag WZR-HP-AG300H 3 + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-AG300H 1.99 | \ + buffalo-tag WZR-HP-AG300H 3 IMAGE/tftp.bin := $$(IMAGE/default) | buffalo-tftp-header - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport kmod-leds-reset kmod-owl-loader + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ + kmod-leds-reset kmod-owl-loader SUPPORTED_DEVICES += wzr-hp-ag300h endef TARGET_DEVICES += buffalo_wzr-hp-ag300h @@ -218,8 +224,10 @@ define Device/buffalo_wzr-hp-g302h-a1a0 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport IMAGE_SIZE := 32128k IMAGES += factory.bin tftp.bin - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-G302H 1.99 | buffalo-tag WZR-HP-G302H 4 + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-G302H 1.99 | \ + buffalo-tag WZR-HP-G302H 4 IMAGE/tftp.bin := $$(IMAGE/default) | buffalo-tftp-header SUPPORTED_DEVICES += wzr-hp-g300nh2 endef @@ -232,8 +240,10 @@ define Device/buffalo_wzr-hp-g450h DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport IMAGE_SIZE := 32256k IMAGES += factory.bin tftp.bin - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-G450H 1.99 | buffalo-tag WZR-HP-G450H 3 + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WZR-HP-G450H 1.99 | \ + buffalo-tag WZR-HP-G450H 3 IMAGE/tftp.bin := $$(IMAGE/default) | buffalo-tftp-header SUPPORTED_DEVICES += wzr-hp-g450h endef @@ -263,8 +273,8 @@ define Device/comfast_cf-e313ac ATH_SOC := qca9531 DEVICE_VENDOR := COMFAST DEVICE_MODEL := CF-E313AC - DEVICE_PACKAGES := rssileds kmod-leds-gpio kmod-ath10k-ct ath10k-firmware-qca9888-ct \ - -swconfig -uboot-envtools + DEVICE_PACKAGES := rssileds kmod-leds-gpio kmod-ath10k-ct \ + ath10k-firmware-qca9888-ct -swconfig -uboot-envtools IMAGE_SIZE := 7936k endef TARGET_DEVICES += comfast_cf-e313ac @@ -369,8 +379,10 @@ define Device/dlink_dir-825-b1 DEVICE_MODEL := DIR-825 DEVICE_VARIANT := B1 IMAGE_SIZE := 6208k - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport kmod-leds-reset kmod-owl-loader + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ + kmod-leds-reset kmod-owl-loader SUPPORTED_DEVICES += dir-825-b1 endef TARGET_DEVICES += dlink_dir-825-b1 @@ -380,14 +392,17 @@ define Device/dlink_dir-825-c1 DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-825 DEVICE_VARIANT := C1 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-leds-reset kmod-owl-loader + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-leds-reset \ + kmod-owl-loader SUPPORTED_DEVICES += dir-825-c1 IMAGE_SIZE := 15936k IMAGES := factory.bin sysupgrade.bin - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs IMAGE/factory.bin := $$(IMAGE/default) | pad-offset $$$$(IMAGE_SIZE) 26 | \ append-string 00DB120AR9344-RT-101214-00 | check-size $$$$(IMAGE_SIZE) - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ + check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += dlink_dir-825-c1 @@ -400,10 +415,12 @@ define Device/dlink_dir-835-a1 SUPPORTED_DEVICES += dir-835-a1 IMAGE_SIZE := 15936k IMAGES := factory.bin sysupgrade.bin - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs IMAGE/factory.bin := $$(IMAGE/default) | pad-offset $$$$(IMAGE_SIZE) 26 | \ append-string 00DB120AR9344-RT-101214-00 | check-size $$$$(IMAGE_SIZE) - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ + check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += dlink_dir-835-a1 @@ -419,11 +436,12 @@ define Device/dlink_dir-842-c # 64 bytes offset: # - 28 bytes seama_header # - 36 bytes of META data (4-bytes aligned) - IMAGE/default := append-kernel | uImage lzma | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs - IMAGE/sysupgrade.bin := \ - $$(IMAGE/default) | seama | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := \ - $$(IMAGE/default) | pad-rootfs -x 64 | seama | seama-seal | check-size $$$$(IMAGE_SIZE) + IMAGE/default := append-kernel | uImage lzma | \ + pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs + IMAGE/sysupgrade.bin := $$(IMAGE/default) | seama | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | pad-rootfs -x 64 | seama | \ + seama-seal | check-size $$$$(IMAGE_SIZE) IMAGE_SIZE := 15680k endef @@ -498,9 +516,10 @@ define Device/engenius_ecb1750 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 15680k IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ - append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ - senao-header -r 0x101 -p 0x6d -t 2 - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ + senao-header -r 0x101 -p 0x6d -t 2 + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += engenius_ecb1750 @@ -532,7 +551,7 @@ define Device/etactica_eg200 DEVICE_VENDOR := eTactica DEVICE_MODEL := EG200 DEVICE_PACKAGES := kmod-usb-chipidea2 kmod-ledtrig-oneshot \ - kmod-usb-serial kmod-usb-serial-ftdi kmod-usb-storage kmod-fs-ext4 + kmod-usb-serial kmod-usb-serial-ftdi kmod-usb-storage kmod-fs-ext4 IMAGE_SIZE := 16000k SUPPORTED_DEVICES += rme-eg200 endef @@ -604,8 +623,8 @@ define Device/iodata_wn-ac1167dgr IMAGE_SIZE := 14656k IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ - append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ - senao-header -r 0x30a -p 0x61 -t 2 + append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ + senao-header -r 0x30a -p 0x61 -t 2 DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct endef TARGET_DEVICES += iodata_wn-ac1167dgr @@ -617,8 +636,8 @@ define Device/iodata_wn-ac1600dgr IMAGE_SIZE := 14656k IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ - append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ - senao-header -r 0x30a -p 0x60 -t 2 -v 200 + append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ + senao-header -r 0x30a -p 0x60 -t 2 -v 200 DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct endef TARGET_DEVICES += iodata_wn-ac1600dgr @@ -629,10 +648,9 @@ define Device/iodata_wn-ac1600dgr2 DEVICE_MODEL := WN-AC1600DGR2/DGR3 IMAGE_SIZE := 14656k IMAGES += dgr2-dgr3-factory.bin - IMAGE/dgr2-dgr3-factory.bin := \ - append-kernel | pad-to $$$$(BLOCKSIZE) | \ - append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ - senao-header -r 0x30a -p 0x60 -t 2 -v 200 + IMAGE/dgr2-dgr3-factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ + append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ + senao-header -r 0x30a -p 0x60 -t 2 -v 200 DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct endef TARGET_DEVICES += iodata_wn-ac1600dgr2 @@ -644,8 +662,8 @@ define Device/iodata_wn-ag300dgr IMAGE_SIZE := 15424k IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ - append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ - senao-header -r 0x30a -p 0x47 -t 2 + append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ + senao-header -r 0x30a -p 0x47 -t 2 DEVICE_PACKAGES := kmod-usb2 endef TARGET_DEVICES += iodata_wn-ag300dgr @@ -683,13 +701,11 @@ define Device/nec_wg1200cr SEAMA_MTDBLOCK := 6 SEAMA_SIGNATURE := wrgac72_necpf.2016gui_wg1200cr IMAGES += factory.bin - IMAGE/default := \ - append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs - IMAGE/sysupgrade.bin := \ - $$(IMAGE/default) | seama | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := \ - $$(IMAGE/default) | pad-rootfs -x 64 | seama | seama-seal | nec-enc 9gsiy9nzep452pad | \ - check-size $$$$(IMAGE_SIZE) + IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs + IMAGE/sysupgrade.bin := $$(IMAGE/default) | seama | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | pad-rootfs -x 64 | seama | \ + seama-seal | nec-enc 9gsiy9nzep452pad | check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct endef TARGET_DEVICES += nec_wg1200cr @@ -701,9 +717,8 @@ define Device/nec_wg800hp IMAGE_SIZE := 7104k IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ - append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ - xor-image -p 6A57190601121E4C004C1E1201061957 -x | \ - nec-fw LASER_ATERM + append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ + xor-image -p 6A57190601121E4C004C1E1201061957 -x | nec-fw LASER_ATERM DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct-htt endef TARGET_DEVICES += nec_wg800hp @@ -714,7 +729,8 @@ define Device/netgear_ex6400_ex7300 NETGEAR_BOARD_ID := EX7300series NETGEAR_HW_ID := 29765104+16+0+128 IMAGE_SIZE := 15552k - IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | netgear-rootfs | pad-rootfs + IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | \ + netgear-rootfs | pad-rootfs DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca99x0-ct $(Device/netgear_ath79) endef @@ -733,8 +749,10 @@ TARGET_DEVICES += netgear_ex7300 define Device/netgear_wndr3x00 ATH_SOC := ar7161 - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport kmod-leds-reset kmod-owl-loader + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \ + append-rootfs | pad-rootfs + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ + kmod-leds-reset kmod-owl-loader $(Device/netgear_ath79) endef @@ -746,7 +764,8 @@ define Device/netgear_wndr3700 NETGEAR_BOARD_ID := WNDR3700 IMAGE_SIZE := 7680k IMAGES += factory-NA.img - IMAGE/factory-NA.img := $$(IMAGE/default) | netgear-dni NA | check-size $$$$(IMAGE_SIZE) + IMAGE/factory-NA.img := $$(IMAGE/default) | netgear-dni NA | \ + check-size $$$$(IMAGE_SIZE) SUPPORTED_DEVICES += wndr3700 endef TARGET_DEVICES += netgear_wndr3700 @@ -826,7 +845,8 @@ define Device/ocedo_koala DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct SUPPORTED_DEVICES += koala IMAGE_SIZE := 7424k - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += ocedo_koala @@ -835,7 +855,8 @@ define Device/ocedo_raccoon DEVICE_VENDOR := Ocedo DEVICE_MODEL := Raccoon IMAGE_SIZE := 7424k - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += ocedo_raccoon @@ -845,7 +866,8 @@ define Device/ocedo_ursus DEVICE_MODEL := Ursus DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 7424k - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += ocedo_ursus @@ -893,7 +915,8 @@ define Device/phicomm_k2t DEVICE_VENDOR := Phicomm DEVICE_MODEL := K2T IMAGE_SIZE := 15744k - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := kmod-leds-reset kmod-ath10k-ct ath10k-firmware-qca9888-ct endef TARGET_DEVICES += phicomm_k2t @@ -918,7 +941,8 @@ define Device/pisen_wmb001n LOADER_FLASH_OFFS := 0x20000 COMPILE := loader-$(1).bin loader-$(1).uImage COMPILE/loader-$(1).bin := loader-okli-compile - COMPILE/loader-$(1).uImage := append-loader-okli $(1) | pad-to 64k | lzma | uImage lzma + COMPILE/loader-$(1).uImage := append-loader-okli $(1) | pad-to 64k | lzma | \ + uImage lzma KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 IMAGES += factory.bin IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pisen_wmb001n-factory $(1) @@ -940,7 +964,8 @@ define Device/qihoo_c301 ATH_SOC := ar9344 DEVICE_VENDOR := Qihoo DEVICE_MODEL := C301 - DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct uboot-envtools + DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct \ + uboot-envtools IMAGE_SIZE := 15744k SEAMA_SIGNATURE := wrgac26_qihoo360_360rg SUPPORTED_DEVICES += qihoo-c301 @@ -979,10 +1004,12 @@ define Device/trendnet_tew-823dru SUPPORTED_DEVICES += tew-823dru IMAGE_SIZE := 15296k IMAGES := factory.bin sysupgrade.bin - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs IMAGE/factory.bin := $$(IMAGE/default) | pad-offset $$$$(IMAGE_SIZE) 26 | \ append-string 00AP135AR9558-RT-131129-00 | check-size $$$$(IMAGE_SIZE) - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ + check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += trendnet_tew-823dru @@ -1017,7 +1044,8 @@ define Device/winchannel_wb2000 DEVICE_VENDOR := Winchannel DEVICE_MODEL := WB2000 IMAGE_SIZE := 15872k - DEVICE_PACKAGES := kmod-i2c-core kmod-i2c-gpio kmod-rtc-ds1307 kmod-usb2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-i2c-core kmod-i2c-gpio kmod-rtc-ds1307 kmod-usb2 \ + kmod-usb-ledtrig-usbport endef TARGET_DEVICES += winchannel_wb2000 @@ -1068,6 +1096,6 @@ define Device/zbtlink_zbt-wd323 DEVICE_MODEL := WD323 IMAGE_SIZE := 16000k DEVICE_PACKAGES := kmod-usb2 kmod-i2c-core kmod-i2c-gpio kmod-rtc-pcf8563 \ - kmod-usb-serial kmod-usb-serial-cp210x uqmi + kmod-usb-serial kmod-usb-serial-cp210x uqmi endef TARGET_DEVICES += zbtlink_zbt-wd323 diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index 19c2d42142..50cf6831cc 100644 --- a/target/linux/ath79/image/nand.mk +++ b/target/linux/ath79/image/nand.mk @@ -40,7 +40,8 @@ define Device/aerohive_hiveap-121 UBINIZE_OPTS := -E 5 SUPPORTED_DEVICES += hiveap-121 IMAGES += factory.bin - IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \ + check-size $$$$(IMAGE_SIZE) IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += aerohive_hiveap-121 @@ -79,8 +80,8 @@ define Device/glinet_gl-ar750s-common ATH_SOC := qca9563 DEVICE_VENDOR := GL.iNet DEVICE_MODEL := GL-AR750S - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct \ - kmod-usb2 kmod-usb-storage block-mount + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-usb2 \ + kmod-usb-storage block-mount KERNEL_SIZE := 4096k IMAGE_SIZE := 16000k PAGESIZE := 2048 @@ -115,13 +116,15 @@ define Device/netgear_ath79_nand PAGESIZE := 2048 IMAGE_SIZE := 25600k KERNEL := kernel-bin | append-dtb | lzma -d20 | \ - pad-offset $$(KERNEL_SIZE) 129 | \ - netgear-uImage lzma | append-string -e '\xff' | \ + pad-offset $$(KERNEL_SIZE) 129 | netgear-uImage lzma | \ + append-string -e '\xff' | \ append-uImage-fakehdr filesystem $$(NETGEAR_KERNEL_MAGIC) KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma IMAGES := sysupgrade.bin factory.img - IMAGE/factory.img := append-kernel | append-ubi | netgear-dni | check-size $$$$(IMAGE_SIZE) - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.img := append-kernel | append-ubi | netgear-dni | \ + check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata | \ + check-size $$$$(IMAGE_SIZE) UBINIZE_OPTS := -E 5 endef @@ -152,19 +155,23 @@ define Device/zyxel_nbg6716 ATH_SOC := qca9558 DEVICE_VENDOR := ZyXEL DEVICE_MODEL := NBG6716 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \ + ath10k-firmware-qca988x-ct RAS_BOARD := NBG6716 RAS_ROOTFS_SIZE := 29696k RAS_VERSION := "OpenWrt Linux-$(LINUX_VERSION)" KERNEL_SIZE := 4096k BLOCKSIZE := 128k PAGESIZE := 2048 - KERNEL := kernel-bin | append-dtb | uImage none | \ - zyxel-buildkerneljffs | check-size 4096k + KERNEL := kernel-bin | append-dtb | uImage none | zyxel-buildkerneljffs | \ + check-size 4096k IMAGES := sysupgrade.tar sysupgrade-4M-Kernel.bin factory.bin - IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-to $$$$(BLOCKSIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata - IMAGE/sysupgrade-4M-Kernel.bin/squashfs := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | pad-to 263192576 | gzip - IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | zyxel-factory + IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-to $$$$(BLOCKSIZE) | \ + sysupgrade-tar rootfs=$$$$@ | append-metadata + IMAGE/sysupgrade-4M-Kernel.bin/squashfs := append-kernel | \ + pad-to $$$$(KERNEL_SIZE) | append-ubi | pad-to 263192576 | gzip + IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \ + zyxel-factory UBINIZE_OPTS := -E 5 endef TARGET_DEVICES += zyxel_nbg6716 diff --git a/target/linux/ath79/image/tiny-netgear.mk b/target/linux/ath79/image/tiny-netgear.mk index d257ddd0ec..a65468522d 100644 --- a/target/linux/ath79/image/tiny-netgear.mk +++ b/target/linux/ath79/image/tiny-netgear.mk @@ -5,7 +5,8 @@ define Device/netgear_ar7240 NETGEAR_KERNEL_MAGIC := 0x32303631 KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma IMAGE_SIZE := 3712k - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \ + append-rootfs | pad-rootfs $(Device/netgear_ath79) endef @@ -36,7 +37,8 @@ define Device/netgear_wnr1000-v2 NETGEAR_BOARD_ID := WNR1000V2 NETGEAR_HW_ID := 29763331+4+32 IMAGE_SIZE := 3712k - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \ + append-rootfs | pad-rootfs SUPPORTED_DEVICES += wnr1000-v2 $(Device/netgear_ath79) endef @@ -50,9 +52,11 @@ define Device/netgear_wnr2000-v3 NETGEAR_BOARD_ID := WNR2000V3 NETGEAR_HW_ID := 29763551+04+32 IMAGE_SIZE := 3712k - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \ + append-rootfs | pad-rootfs IMAGES += factory-NA.img - IMAGE/factory-NA.img := $$(IMAGE/default) | netgear-dni NA | check-size $$$$(IMAGE_SIZE) + IMAGE/factory-NA.img := $$(IMAGE/default) | netgear-dni NA | \ + check-size $$$$(IMAGE_SIZE) SUPPORTED_DEVICES += wnr2000-v3 $(Device/netgear_ath79) endef diff --git a/target/linux/ath79/image/tiny.mk b/target/linux/ath79/image/tiny.mk index 5f6adeac86..039925e019 100644 --- a/target/linux/ath79/image/tiny.mk +++ b/target/linux/ath79/image/tiny.mk @@ -6,8 +6,10 @@ define Device/buffalo_whr-g301n DEVICE_MODEL := WHR-G301N IMAGE_SIZE := 3712k IMAGES += factory.bin tftp.bin - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WHR-G301N 1.99 | buffalo-tag WHR-G301N 3 + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | buffalo-enc WHR-G301N 1.99 | \ + buffalo-tag WHR-G301N 3 IMAGE/tftp.bin := $$(IMAGE/default) | buffalo-tftp-header SUPPORTED_DEVICES += whr-g301n endef @@ -22,9 +24,11 @@ define Device/dlink_dir-615-e4 FACTORY_IMAGE_SIZE := 3456k IMAGES += factory.bin IMAGE/default := append-kernel | append-rootfs | pad-rootfs - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := $$(IMAGE/default) | check-size $$$$(FACTORY_IMAGE_SIZE) | \ - pad-to $$$$(FACTORY_IMAGE_SIZE) | append-string "AP99-AR7240-RT-091105-05" + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ + check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/default) | \ + check-size $$$$(FACTORY_IMAGE_SIZE) | pad-to $$$$(FACTORY_IMAGE_SIZE) | \ + append-string "AP99-AR7240-RT-091105-05" SUPPORTED_DEVICES += dir-615-e4 endef TARGET_DEVICES += dlink_dir-615-e4 -- 2.30.2