From 3f14f034fb5e191f4a537998379d8e922ec31e8a Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Tue, 10 Mar 2020 22:58:27 +0900 Subject: treewide: omit IMAGE_SIZE argument from check-size Now that check-size uses IMAGE_SIZE by default, we can skip the argument from image recipes to reduce redundancy. Signed-off-by: Sungbo Eo [do not touch ar71xx] Signed-off-by: Adrian Schmutzler --- target/linux/ramips/image/Makefile | 6 ++-- target/linux/ramips/image/common-tp-link.mk | 6 ++-- target/linux/ramips/image/mt7620.mk | 38 ++++++++++++------------ target/linux/ramips/image/mt7621.mk | 34 ++++++++++----------- target/linux/ramips/image/mt76x8.mk | 6 ++-- target/linux/ramips/image/rt288x.mk | 4 +-- target/linux/ramips/image/rt305x.mk | 46 ++++++++++++++--------------- target/linux/ramips/image/rt3883.mk | 8 ++--- 8 files changed, 74 insertions(+), 74 deletions(-) (limited to 'target/linux/ramips/image') diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index e34bf37210..7c1f7c6c0b 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -29,7 +29,7 @@ define Device/Default IMAGES := sysupgrade.bin SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) sysupgrade_bin := append-kernel | append-rootfs | pad-rootfs - 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 endef define Device/seama @@ -41,9 +41,9 @@ define Device/seama # - 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/default) | seama | pad-rootfs | append-metadata | check-size IMAGE/factory.bin := \ - $$(IMAGE/default) | pad-rootfs -x 64 | seama | seama-seal | check-size $$$$(IMAGE_SIZE) + $$(IMAGE/default) | pad-rootfs -x 64 | seama | seama-seal | check-size SEAMA_SIGNATURE := endef diff --git a/target/linux/ramips/image/common-tp-link.mk b/target/linux/ramips/image/common-tp-link.mk index 587ef89fc1..07ad1ea250 100644 --- a/target/linux/ramips/image/common-tp-link.mk +++ b/target/linux/ramips/image/common-tp-link.mk @@ -12,7 +12,7 @@ define Device/tplink-v1 IMAGES += factory.bin IMAGE/factory.bin := tplink-v1-image factory -e -O IMAGE/sysupgrade.bin := tplink-v1-image sysupgrade -e -O | append-metadata | \ - check-size $$$$(IMAGE_SIZE) + check-size endef define Device/tplink-v2 @@ -27,7 +27,7 @@ define Device/tplink-v2 IMAGES += factory.bin IMAGE/factory.bin := tplink-v2-image -e IMAGE/sysupgrade.bin := tplink-v2-image -s -e | append-metadata | \ - check-size $$$$(IMAGE_SIZE) + check-size endef define Device/tplink-safeloader @@ -39,6 +39,6 @@ define Device/tplink-safeloader KERNEL := $(KERNEL_DTB) | tplink-v1-header -e -O IMAGES += factory.bin IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \ - append-metadata | check-size $$$$(IMAGE_SIZE) + append-metadata | check-size IMAGE/factory.bin := append-rootfs | tplink-safeloader factory endef diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index 339cd150e0..552879e02f 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -298,7 +298,7 @@ define Device/edimax_br-6478ac-v2 IMAGE_SIZE := 7744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m RN68 -f 0x70000 -S 0x01100000 | pad-rootfs | \ - append-metadata | check-size $$$$(IMAGE_SIZE) + append-metadata | check-size DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci \ kmod-usb-ledtrig-usbport endef @@ -312,7 +312,7 @@ define Device/edimax_ew-7476rpc IMAGE_SIZE := 7744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m RN79 -f 0x70000 -S 0x01100000 | pad-rootfs | \ - append-metadata | check-size $$$$(IMAGE_SIZE) + append-metadata | check-size DEVICE_PACKAGES := kmod-mt76x2 kmod-phy-realtek endef TARGET_DEVICES += edimax_ew-7476rpc @@ -325,7 +325,7 @@ define Device/edimax_ew-7478ac IMAGE_SIZE := 7744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m RN70 -f 0x70000 -S 0x01100000 | pad-rootfs | \ - append-metadata | check-size $$$$(IMAGE_SIZE) + append-metadata | check-size DEVICE_PACKAGES := kmod-mt76x2 kmod-phy-realtek endef TARGET_DEVICES += edimax_ew-7478ac @@ -338,7 +338,7 @@ define Device/edimax_ew-7478apc IMAGE_SIZE := 7744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m RN75 -f 0x70000 -S 0x01100000 | pad-rootfs | \ - append-metadata | check-size $$$$(IMAGE_SIZE) + append-metadata | check-size DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci \ kmod-usb-ledtrig-usbport endef @@ -348,7 +348,7 @@ define Device/elecom_wrh-300cr SOC := mt7620n IMAGE_SIZE := 14272k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elecom-header DEVICE_VENDOR := Elecom DEVICE_MODEL := WRH-300CR @@ -362,7 +362,7 @@ define Device/engenius_esr600 BLOCKSIZE := 64k IMAGE_SIZE := 15616k IMAGES += factory.dlf - IMAGE/factory.dlf := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.dlf := $$(sysupgrade_bin) | check-size | \ senao-header -r 0x101 -p 0x57 -t 2 DEVICE_VENDOR := EnGenius DEVICE_MODEL := ESR600 @@ -379,7 +379,7 @@ define Device/fon_fon2601 DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci KERNEL_INITRAMFS := $$(KERNEL) | fonfxcimage IMAGE/sysupgrade.bin := append-kernel | append-rootfs | fonfxcimage | \ - pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + pad-rootfs | append-metadata | check-size endef TARGET_DEVICES += fon_fon2601 @@ -471,7 +471,7 @@ define Device/iodata_wn-ac1167gr DEVICE_MODEL := WN-AC1167GR IMAGE_SIZE := 6864k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elx-header 01040016 8844A2D168B45A2D DEVICE_PACKAGES := kmod-mt76x2 endef @@ -483,7 +483,7 @@ define Device/iodata_wn-ac733gr3 DEVICE_MODEL := WN-AC733GR3 IMAGE_SIZE := 6992k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elx-header 01040006 8844A2D168B45A2D DEVICE_PACKAGES := kmod-mt76x0e kmod-switch-rtl8367b endef @@ -579,7 +579,7 @@ define Device/linksys_e1700 SOC := mt7620a IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ umedia-header 0x013326 DEVICE_VENDOR := Linksys DEVICE_MODEL := E1700 @@ -606,7 +606,7 @@ define Device/netgear_ex2700 IMAGES += factory.bin KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | \ append-uImage-fakehdr filesystem - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ netgear-dni DEVICE_VENDOR := NETGEAR DEVICE_MODEL := EX2700 @@ -621,7 +621,7 @@ define Device/netgear_ex3700 BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGES += factory.chk - IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.chk := $$(sysupgrade_bin) | check-size | \ netgear-chk DEVICE_PACKAGES := kmod-mt76x2 DEVICE_VENDOR := NETGEAR @@ -636,7 +636,7 @@ define Device/netgear_ex6130 BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGES += factory.chk - IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.chk := $$(sysupgrade_bin) | check-size | \ netgear-chk DEVICE_PACKAGES := kmod-mt76x2 DEVICE_VENDOR := NETGEAR @@ -653,7 +653,7 @@ define Device/netgear_wn3000rp-v3 IMAGES += factory.bin KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | \ append-uImage-fakehdr filesystem - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ netgear-dni DEVICE_VENDOR := NETGEAR DEVICE_MODEL := WN3000RP @@ -667,7 +667,7 @@ define Device/nexx_wt3020-4m BLOCKSIZE := 4k IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ poray-header -B WT3020 -F 4M DEVICE_VENDOR := Nexx DEVICE_MODEL := WT3020 @@ -680,7 +680,7 @@ define Device/nexx_wt3020-8m SOC := mt7620n IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ poray-header -B WT3020 -F 8M DEVICE_VENDOR := Nexx DEVICE_MODEL := WT3020 @@ -1126,7 +1126,7 @@ define Device/zyxel_keenetic-omni DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | \ - check-size $$$$(IMAGE_SIZE) | zyimage -d 4882 -v "ZyXEL Keenetic Omni" + check-size | zyimage -d 4882 -v "ZyXEL Keenetic Omni" SUPPORTED_DEVICES += kn_rc endef TARGET_DEVICES += zyxel_keenetic-omni @@ -1139,7 +1139,7 @@ define Device/zyxel_keenetic-omni-ii DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | \ - check-size $$$$(IMAGE_SIZE) | \ + check-size | \ zyimage -d 2102034 -v "ZyXEL Keenetic Omni II" SUPPORTED_DEVICES += kn_rf endef @@ -1154,7 +1154,7 @@ define Device/zyxel_keenetic-viva kmod-switch-rtl8366-smi kmod-switch-rtl8367b IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | \ - check-size $$$$(IMAGE_SIZE) | zyimage -d 8997 -v "ZyXEL Keenetic Viva" + check-size | zyimage -d 8997 -v "ZyXEL Keenetic Viva" SUPPORTED_DEVICES += kng_rc endef TARGET_DEVICES += zyxel_keenetic-viva diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index e9572a70fc..b2590c5759 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -165,7 +165,7 @@ define Device/asus_rt-ac65p IMAGES += factory.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ - check-size $$$$(IMAGE_SIZE) + check-size DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e wpad-basic uboot-envtools endef TARGET_DEVICES += asus_rt-ac65p @@ -181,7 +181,7 @@ define Device/asus_rt-ac85p IMAGES += factory.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ - check-size $$$$(IMAGE_SIZE) + check-size DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e wpad-basic uboot-envtools endef TARGET_DEVICES += asus_rt-ac85p @@ -245,7 +245,7 @@ define Device/edimax_ra21s DEVICE_ALT0_VENDOR := Edimax DEVICE_ALT0_MODEL := Gemini RA21S IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elx-header 02020040 8844A2D168B45A2D DEVICE_PACKAGES := kmod-mt7615e wpad-basic endef @@ -256,7 +256,7 @@ define Device/edimax_rg21s DEVICE_VENDOR := Edimax DEVICE_MODEL := Gemini AC2600 RG21S IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elx-header 02020038 8844A2D168B45A2D DEVICE_PACKAGES := kmod-mt7615e wpad-basic endef @@ -267,7 +267,7 @@ define Device/elecom_wrc-1167ghbk2-s DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-1167GHBK2-S IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elecom-wrc-factory WRC-1167GHBK2-S 0.00 DEVICE_PACKAGES := kmod-mt7615e wpad-basic endef @@ -278,7 +278,7 @@ define Device/elecom_wrc-1900gst DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-1900GST IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elecom-gst-factory WRC-1900GST 0.00 endef TARGET_DEVICES += elecom_wrc-1900gst @@ -288,7 +288,7 @@ define Device/elecom_wrc-2533gst DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-2533GST IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elecom-gst-factory WRC-2533GST 0.00 endef TARGET_DEVICES += elecom_wrc-2533gst @@ -337,7 +337,7 @@ define Device/hiwifi_hc5962 IMAGES += factory.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ - check-size $$$$(IMAGE_SIZE) + check-size DEVICE_VENDOR := HiWiFi DEVICE_MODEL := HC5962 DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-basic @@ -402,7 +402,7 @@ define Device/iodata_wnpr2600g DEVICE_MODEL := WNPR2600G IMAGE_SIZE := 13952k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elx-header 0104003a 8844A2D168B45A2D DEVICE_PACKAGES := kmod-mt7615e wpad-basic endef @@ -429,7 +429,7 @@ TARGET_DEVICES += iptime_a8004t define Device/jcg_jhr-ac876m IMAGE_SIZE := 16064k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ jcg-header 89.1 JCG_MAXSIZE := 16064k DEVICE_VENDOR := JCG @@ -484,7 +484,7 @@ define Device/MikroTik KERNEL := $(KERNEL_DTB) | loader-kernel IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 | \ pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | append-metadata | \ - check-size $$$$(IMAGE_SIZE) + check-size endef define Device/mikrotik_rb750gr3 @@ -534,7 +534,7 @@ define Device/netgear_ex6150 NETGEAR_BOARD_ID := U12H318T00_NETGEAR IMAGE_SIZE := 14848k IMAGES += factory.chk - IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.chk := $$(sysupgrade_bin) | check-size | \ netgear-chk endef TARGET_DEVICES += netgear_ex6150 @@ -550,7 +550,7 @@ define Device/netgear_sercomm_nand zip $$$$(SERCOMM_HWNAME).bin | sercom-seal IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/kernel.bin := append-kernel - IMAGE/rootfs.bin := append-ubi | check-size $$$$(IMAGE_SIZE) + IMAGE/rootfs.bin := append-ubi | check-size DEVICE_VENDOR := NETGEAR DEVICE_PACKAGES := kmod-mt7603 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic endef @@ -642,7 +642,7 @@ define Device/netgear_wndr3700-v5 IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ pad-rootfs IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ - check-size $$$$(IMAGE_SIZE) + check-size IMAGE/factory.img := pad-extra 320k | $$(IMAGE/default) | \ pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \ zip WNDR3700v5.bin | sercom-seal @@ -667,7 +667,7 @@ define Device/netis_wf2881 IMAGES += factory.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \ - check-size $$$$(IMAGE_SIZE) + check-size DEVICE_VENDOR := NETIS DEVICE_MODEL := WF2881 DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic @@ -849,7 +849,7 @@ define Device/xiaomi_mir3g UBINIZE_OPTS := -E 5 IMAGES += kernel1.bin rootfs0.bin IMAGE/kernel1.bin := append-kernel - IMAGE/rootfs0.bin := append-ubi | check-size $$$$(IMAGE_SIZE) + IMAGE/rootfs0.bin := append-ubi | check-size IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_VENDOR := Xiaomi DEVICE_MODEL := Mi Router 3G @@ -883,7 +883,7 @@ define Device/xiaomi_mir3p IMAGES += factory.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ - check-size $$$$(IMAGE_SIZE) + check-size DEVICE_PACKAGES := kmod-mt7615e kmod-usb3 kmod-usb-ledtrig-usbport \ wpad-basic uboot-envtools endef diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index 51f630f42a..e2890c98e6 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -34,7 +34,7 @@ TARGET_DEVICES += buffalo_wcr-1166ds define Device/cudy_wr1000 IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ jcg-header 92.122 JCG_MAXSIZE := 7872k DEVICE_VENDOR := Cudy @@ -180,7 +180,7 @@ define Device/netgear_r6120 IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE)| append-rootfs | \ pad-rootfs IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ - check-size $$$$(IMAGE_SIZE) + check-size IMAGE/factory.img := pad-extra 576k | $$(IMAGE/default) | \ pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | zip R6120.bin | \ sercom-seal @@ -592,6 +592,6 @@ define Device/zyxel_keenetic-extra-ii kmod-usb-ledtrig-usbport IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to $$$$(BLOCKSIZE) | \ - check-size $$$$(IMAGE_SIZE) | zyimage -d 6162 -v "ZyXEL Keenetic Extra II" + check-size | zyimage -d 6162 -v "ZyXEL Keenetic Extra II" endef TARGET_DEVICES += zyxel_keenetic-extra-ii diff --git a/target/linux/ramips/image/rt288x.mk b/target/linux/ramips/image/rt288x.mk index 800dc553a2..720ff65741 100644 --- a/target/linux/ramips/image/rt288x.mk +++ b/target/linux/ramips/image/rt288x.mk @@ -18,7 +18,7 @@ define Device/airlink101_ar670w IMAGE_SIZE := 3840k KERNEL := $(KERNEL_DTB) | pad-to $$(BLOCKSIZE) IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ wrg-header wrgn16a_airlink_ar670w SUPPORTED_DEVICES += ar670w endef @@ -87,7 +87,7 @@ define Device/dlink_dap-1522-a1 IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-offset $$$$(BLOCKSIZE) 96 | \ append-rootfs | pad-rootfs -x 96 | wrg-header wapnd01_dlink_dap1522 | \ - check-size $$$$(IMAGE_SIZE) + check-size endef TARGET_DEVICES += dlink_dap-1522-a1 diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk index 155e86e3d3..33f94edf3f 100644 --- a/target/linux/ramips/image/rt305x.mk +++ b/target/linux/ramips/image/rt305x.mk @@ -301,7 +301,7 @@ define Device/buffalo_whr-g300n DEVICE_VENDOR := Buffalo DEVICE_MODEL := WHR-G300N IMAGES += tftp.bin - IMAGE/tftp.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/tftp.bin := $$(sysupgrade_bin) | check-size | \ buffalo-tftp-header SUPPORTED_DEVICES += whr-g300n endef @@ -311,9 +311,9 @@ define Device/dlink_dap-1350 SOC := rt3052 IMAGES += factory.bin factory-NA.bin IMAGE_SIZE := 7488k - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ dap-header -s RT3052-AP-DAP1350WW-3 - IMAGE/factory-NA.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory-NA.bin := $$(sysupgrade_bin) | check-size | \ dap-header -s RT3052-AP-DAP1350-3 DEVICE_VENDOR := D-Link DEVICE_MODEL := DAP-1350 @@ -348,7 +348,7 @@ define Device/dlink_dir-300-b1 SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ wrg-header wrgn23_dlwbr_dir300b DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-300 @@ -382,7 +382,7 @@ define Device/dlink_dir-600-b1 SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ wrg-header wrgn23_dlwbr_dir600b DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-600 @@ -410,7 +410,7 @@ define Device/dlink_dir-615-d SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ wrg-header wrgn23_dlwbr_dir615d DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-615 @@ -486,7 +486,7 @@ define Device/edimax_3g-6200n IMAGE_SIZE := 3648k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \ - append-metadata | check-size $$$$(IMAGE_SIZE) + append-metadata | check-size DEVICE_VENDOR := Edimax DEVICE_MODEL := 3g-6200n SUPPORTED_DEVICES += 3g-6200n @@ -498,7 +498,7 @@ define Device/edimax_3g-6200nl IMAGE_SIZE := 3648k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \ - append-metadata | check-size $$$$(IMAGE_SIZE) + append-metadata | check-size DEVICE_VENDOR := Edimax DEVICE_MODEL := 3g-6200nl SUPPORTED_DEVICES += 3g-6200nl @@ -568,7 +568,7 @@ define Device/hilink_hlk-rm04 SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ hilink-header DEVICE_VENDOR := Hi-Link DEVICE_MODEL := HLK-RM04 @@ -621,7 +621,7 @@ define Device/jcg_jhr-n805r SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ jcg-header 29.24 DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-N805R @@ -633,7 +633,7 @@ define Device/jcg_jhr-n825r SOC := rt3052 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ jcg-header 23.24 DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-N825R @@ -645,7 +645,7 @@ define Device/jcg_jhr-n926r SOC := rt3052 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ jcg-header 25.24 DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-N926R @@ -676,9 +676,9 @@ define Device/netgear_wnce2001 SOC := rt3052 IMAGE_SIZE := 3392k IMAGES += factory.bin factory-NA.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ dap-header -s RT3052-AP-WNCE2001-3 -r WW -v 1.0.0.99 - IMAGE/factory-NA.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory-NA.bin := $$(sysupgrade_bin) | check-size | \ dap-header -s RT3052-AP-WNCE2001-3 -r NA -v 1.0.0.99 DEVICE_VENDOR := NETGEAR DEVICE_MODEL := WNCE2001 @@ -699,7 +699,7 @@ define Device/nexx_wt1520-4m SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ poray-header -B WT1520 -F 4M DEVICE_VENDOR := Nexx DEVICE_MODEL := WT1520 @@ -712,7 +712,7 @@ define Device/nexx_wt1520-8m SOC := rt5350 IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ poray-header -B WT1520 -F 8M DEVICE_VENDOR := Nexx DEVICE_MODEL := WT1520 @@ -840,7 +840,7 @@ define Device/poray_m3 SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ poray-header -B M3 -F 4M DEVICE_VENDOR := Poray DEVICE_MODEL := M3 @@ -853,7 +853,7 @@ define Device/poray_m4-4m SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ poray-header -B M4 -F 4M DEVICE_VENDOR := Poray DEVICE_MODEL := M4 @@ -867,7 +867,7 @@ define Device/poray_m4-8m SOC := rt5350 IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ poray-header -B M4 -F 8M DEVICE_VENDOR := Poray DEVICE_MODEL := M4 @@ -881,7 +881,7 @@ define Device/poray_x5 SOC := rt5350 IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ poray-header -B X5 -F 8M DEVICE_VENDOR := Poray DEVICE_MODEL := X5/X6 @@ -894,7 +894,7 @@ define Device/poray_x8 SOC := rt5350 IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ poray-header -B X8 -F 8M DEVICE_VENDOR := Poray DEVICE_MODEL := X8 @@ -1013,7 +1013,7 @@ define Device/trendnet_tew-638apb-v2 BLOCKSIZE := 64k IMAGE_SIZE := 3776k IMAGE/sysupgrade.bin := $$(sysupgrade_bin) | umedia-header 0x026382 | \ - append-metadata | check-size $$$$(IMAGE_SIZE) + append-metadata | check-size DEVICE_VENDOR := TRENDnet DEVICE_MODEL := TEW-638APB DEVICE_VARIANT := v2 @@ -1034,7 +1034,7 @@ define Device/unbranded_a5-v11 SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ poray-header -B A5-V11 -F 4M DEVICE_VENDOR := DEVICE_MODEL := A5-V11 diff --git a/target/linux/ramips/image/rt3883.mk b/target/linux/ramips/image/rt3883.mk index ca6a713c4d..c8757bb386 100644 --- a/target/linux/ramips/image/rt3883.mk +++ b/target/linux/ramips/image/rt3883.mk @@ -51,7 +51,7 @@ define Device/edimax_br-6475nd IMAGE_SIZE := 7744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m RN54 -f 0x70000 -S 0x01100000 | pad-rootfs | \ - append-metadata | check-size $$$$(IMAGE_SIZE) + append-metadata | check-size DEVICE_VENDOR := Edimax DEVICE_MODEL := BR-6475nD DEVICE_PACKAGES := swconfig @@ -99,7 +99,7 @@ define Device/sitecom_wlr-6000 BLOCKSIZE := 4k IMAGE_SIZE := 7244k IMAGES += factory.dlf - IMAGE/factory.dlf := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.dlf := $$(sysupgrade_bin) | check-size | \ senao-header -r 0x0202 -p 0x41 -t 2 DEVICE_VENDOR := Sitecom DEVICE_MODEL := WLR-6000 @@ -113,7 +113,7 @@ define Device/trendnet_tew-691gr BLOCKSIZE := 64k IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ umedia-header 0x026910 DEVICE_VENDOR := TRENDnet DEVICE_MODEL := TEW-691GR @@ -127,7 +127,7 @@ define Device/trendnet_tew-692gr BLOCKSIZE := 64k IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ umedia-header 0x026920 DEVICE_VENDOR := TRENDnet DEVICE_MODEL := TEW-692GR -- cgit v1.2.3