From: Adrian Schmutzler Date: Thu, 19 Dec 2019 18:40:33 +0000 (+0100) Subject: ramips: harmonize line breaks in image Makefiles X-Git-Tag: v21.02.0-rc1~4318 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e417ff88f19b90fc7badbb67b2e8c1760dd024dc;p=openwrt%2Fstaging%2Fhauke.git ramips: 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 --- diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index e8169c2294..5cd964691a 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -40,7 +40,8 @@ define Device/alfa-network_r36m-e4g IMAGE_SIZE := 16064k DEVICE_VENDOR := ALFA Network DEVICE_MODEL := R36M-E4G - DEVICE_PACKAGES := kmod-i2c-ralink kmod-usb2 kmod-usb-ohci uboot-envtools uqmi + DEVICE_PACKAGES := kmod-i2c-ralink kmod-usb2 kmod-usb-ohci uboot-envtools \ + uqmi endef TARGET_DEVICES += alfa-network_r36m-e4g @@ -49,8 +50,8 @@ define Device/alfa-network_tube-e4g IMAGE_SIZE := 16064k DEVICE_VENDOR := ALFA Network DEVICE_MODEL := Tube-E4G - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci uboot-envtools uqmi \ - -iwinfo -kmod-rt2800-soc -wpad-basic + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci uboot-envtools uqmi -iwinfo \ + -kmod-rt2800-soc -wpad-basic endef TARGET_DEVICES += alfa-network_tube-e4g @@ -89,7 +90,8 @@ define Device/asus_rt-ac51u IMAGE_SIZE := 16064k DEVICE_VENDOR := Asus DEVICE_MODEL := RT-AC51U - DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci \ + kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += rt-ac51u endef TARGET_DEVICES += asus_rt-ac51u @@ -118,7 +120,8 @@ define Device/bdcom_wap2100-sk IMAGE_SIZE := 15808k DEVICE_VENDOR := BDCOM DEVICE_MODEL := WAP2100-SK (ZTE ZXECS EBG3130) - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76x2 kmod-mt76x0e kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76x2 kmod-mt76x0e \ + kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport endef TARGET_DEVICES += bdcom_wap2100-sk @@ -306,7 +309,8 @@ define Device/edimax_br-6478ac-v2 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) - DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci \ + kmod-usb-ledtrig-usbport endef TARGET_DEVICES += edimax_br-6478ac-v2 @@ -317,8 +321,8 @@ define Device/edimax_ew-7476rpc BLOCKSIZE := 4k 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) + edimax-header -s CSYS -m RN79 -f 0x70000 -S 0x01100000 | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := kmod-mt76x2 kmod-phy-realtek endef TARGET_DEVICES += edimax_ew-7476rpc @@ -330,8 +334,8 @@ define Device/edimax_ew-7478ac BLOCKSIZE := 4k 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) + edimax-header -s CSYS -m RN70 -f 0x70000 -S 0x01100000 | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := kmod-mt76x2 kmod-phy-realtek endef TARGET_DEVICES += edimax_ew-7478ac @@ -343,9 +347,10 @@ define Device/edimax_ew-7478apc BLOCKSIZE := 4k 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) - DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport + edimax-header -s CSYS -m RN75 -f 0x70000 -S 0x01100000 | pad-rootfs | \ + append-metadata | check-size $$$$(IMAGE_SIZE) + DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci \ + kmod-usb-ledtrig-usbport endef TARGET_DEVICES += edimax_ew-7478apc @@ -368,10 +373,11 @@ define Device/engenius_esr600 IMAGE_SIZE := 15616k IMAGES += factory.dlf IMAGE/factory.dlf := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ - senao-header -r 0x101 -p 0x57 -t 2 + senao-header -r 0x101 -p 0x57 -t 2 DEVICE_VENDOR := EnGenius DEVICE_MODEL := ESR600 - DEVICE_PACKAGES += kmod-rt2800-pci kmod-usb-storage kmod-usb-ohci kmod-usb-ehci + DEVICE_PACKAGES += kmod-rt2800-pci kmod-usb-storage kmod-usb-ohci \ + kmod-usb-ehci endef TARGET_DEVICES += engenius_esr600 @@ -382,9 +388,8 @@ define Device/fon_fon2601 DEVICE_MODEL := 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) + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | fonfxcimage | \ + pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += fon_fon2601 @@ -424,7 +429,7 @@ define Device/head-weblink_hdrm200 DEVICE_VENDOR := Head Weblink DEVICE_MODEL := HDRM2000 DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 \ - uqmi kmod-usb-serial kmod-usb-serial-option + uqmi kmod-usb-serial kmod-usb-serial-option endef TARGET_DEVICES += head-weblink_hdrm200 @@ -443,7 +448,8 @@ define Device/hiwifi_hc5761 IMAGE_SIZE := 15872k DEVICE_VENDOR := HiWiFi DEVICE_MODEL := HC5761 - DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 \ + kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += hc5761 endef TARGET_DEVICES += hiwifi_hc5761 @@ -453,7 +459,8 @@ define Device/hiwifi_hc5861 IMAGE_SIZE := 15872k DEVICE_VENDOR := HiWiFi DEVICE_MODEL := HC5861 - DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 \ + kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += hc5861 endef TARGET_DEVICES += hiwifi_hc5861 @@ -474,9 +481,8 @@ define Device/iodata_wn-ac1167gr DEVICE_MODEL := WN-AC1167GR IMAGE_SIZE := 6864k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ - elx-header 01040016 8844A2D168B45A2D + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + elx-header 01040016 8844A2D168B45A2D DEVICE_PACKAGES := kmod-mt76x2 endef TARGET_DEVICES += iodata_wn-ac1167gr @@ -487,9 +493,8 @@ define Device/iodata_wn-ac733gr3 DEVICE_MODEL := WN-AC733GR3 IMAGE_SIZE := 6992k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ - elx-header 01040006 8844A2D168B45A2D + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + elx-header 01040006 8844A2D168B45A2D DEVICE_PACKAGES := kmod-mt76x0e kmod-switch-rtl8367b endef TARGET_DEVICES += iodata_wn-ac733gr3 @@ -500,7 +505,8 @@ define Device/iptime_a104ns UIMAGE_NAME := a104ns DEVICE_VENDOR := ipTIME DEVICE_MODEL := A104ns - DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci \ + kmod-usb-ledtrig-usbport endef TARGET_DEVICES += iptime_a104ns @@ -511,7 +517,7 @@ define Device/kimax_u25awf-h1 DEVICE_MODEL := U25AWF DEVICE_VARIANT := H1 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-storage kmod-scsi-core \ - kmod-fs-ext4 kmod-fs-vfat block-mount + kmod-fs-ext4 kmod-fs-vfat block-mount SUPPORTED_DEVICES += u25awf-h1 endef TARGET_DEVICES += kimax_u25awf-h1 @@ -522,7 +528,7 @@ define Device/kimax_u35wf DEVICE_VENDOR := Kimax DEVICE_MODEL := U35WF DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-storage kmod-scsi-core \ - kmod-fs-ext4 kmod-fs-vfat block-mount + kmod-fs-ext4 kmod-fs-vfat block-mount endef TARGET_DEVICES += kimax_u35wf @@ -608,7 +614,8 @@ define Device/netgear_ex2700 BLOCKSIZE := 4k IMAGE_SIZE := 3776k IMAGES += factory.bin - KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-uImage-fakehdr filesystem + KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | \ + append-uImage-fakehdr filesystem IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ netgear-dni DEVICE_VENDOR := NETGEAR @@ -623,7 +630,8 @@ define Device/netgear_ex3700 BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGES += factory.chk - IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | netgear-chk + IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + netgear-chk DEVICE_PACKAGES := kmod-mt76x2 DEVICE_VENDOR := NETGEAR DEVICE_MODEL := EX3700/EX3800 @@ -637,7 +645,8 @@ define Device/netgear_ex6130 BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGES += factory.chk - IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | netgear-chk + IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + netgear-chk DEVICE_PACKAGES := kmod-mt76x2 DEVICE_VENDOR := NETGEAR DEVICE_MODEL := EX6130 @@ -651,7 +660,8 @@ define Device/netgear_wn3000rp-v3 NETGEAR_BOARD_ID := WN3000RPv3 BLOCKSIZE := 4k IMAGES += factory.bin - KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-uImage-fakehdr filesystem + KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | \ + append-uImage-fakehdr filesystem IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ netgear-dni DEVICE_VENDOR := NETGEAR @@ -745,9 +755,8 @@ define Device/planex_cs-qr10 IMAGE_SIZE := 7872k DEVICE_VENDOR := Planex DEVICE_MODEL := CS-QR10 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci \ - kmod-sound-core kmod-sound-mt7620 \ - kmod-i2c-ralink kmod-sdhci-mt7620 + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sound-core \ + kmod-sound-mt7620 kmod-i2c-ralink kmod-sdhci-mt7620 SUPPORTED_DEVICES += cs-qr10 endef TARGET_DEVICES += planex_cs-qr10 @@ -880,7 +889,8 @@ define Device/tplink_archer-c20-v1 IMAGES += factory.bin DEVICE_MODEL := Archer C20 DEVICE_VARIANT := v1 - DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci \ + kmod-usb-ledtrig-usbport endef TARGET_DEVICES += tplink_archer-c20-v1 @@ -894,7 +904,8 @@ define Device/tplink_archer-c2-v1 IMAGES += factory.bin DEVICE_MODEL := Archer C2 DEVICE_VARIANT := v1 - DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b + DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci \ + kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b endef TARGET_DEVICES += tplink_archer-c2-v1 @@ -920,7 +931,8 @@ define Device/tplink_archer-mr200 TPLINK_FLASHLAYOUT := 8MLmtk TPLINK_HWID := 0xd7500001 TPLINK_HWREV := 0x4a - DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-net kmod-usb-net-rndis kmod-usb-serial kmod-usb-serial-option adb-enablemodem + DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-net kmod-usb-net-rndis \ + kmod-usb-serial kmod-usb-serial-option adb-enablemodem DEVICE_MODEL := Archer MR200 SUPPORTED_DEVICES += mr200 endef @@ -960,7 +972,8 @@ define Device/youku_yk1 IMAGE_SIZE := 32448k DEVICE_VENDOR := YOUKU DEVICE_MODEL := YK1 - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 \ + kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += youku-yk1 endef TARGET_DEVICES += youku_yk1 @@ -1064,7 +1077,7 @@ define Device/zbtlink_zbt-we826-e DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE826-E DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 uqmi \ - kmod-usb-serial kmod-usb-serial-option + kmod-usb-serial kmod-usb-serial-option endef TARGET_DEVICES += zbtlink_zbt-we826-e @@ -1095,8 +1108,8 @@ define Device/zyxel_keenetic-omni DEVICE_MODEL := Keenetic Omni DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport IMAGES += factory.bin - IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \ - zyimage -d 4882 -v "ZyXEL Keenetic Omni" + IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | \ + check-size $$$$(IMAGE_SIZE) | zyimage -d 4882 -v "ZyXEL Keenetic Omni" SUPPORTED_DEVICES += kn_rc endef TARGET_DEVICES += zyxel_keenetic-omni @@ -1108,7 +1121,8 @@ define Device/zyxel_keenetic-omni-ii DEVICE_MODEL := Keenetic Omni II DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport IMAGES += factory.bin - IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \ + IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | \ + check-size $$$$(IMAGE_SIZE) | \ zyimage -d 2102034 -v "ZyXEL Keenetic Omni II" SUPPORTED_DEVICES += kn_rf endef @@ -1119,10 +1133,11 @@ define Device/zyxel_keenetic-viva IMAGE_SIZE := 16064k DEVICE_VENDOR := ZyXEL DEVICE_MODEL := Keenetic Viva - DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \ + 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" + IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | \ + check-size $$$$(IMAGE_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 e9190844ac..0b178a8d6e 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -89,9 +89,8 @@ define Device/afoundry_ew1200 IMAGE_SIZE := 16064k DEVICE_VENDOR := AFOUNDRY DEVICE_MODEL := EW1200 - DEVICE_PACKAGES := \ - kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-mt7603 kmod-usb3 \ - kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-mt7603 \ + kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += ew1200 endef TARGET_DEVICES += afoundry_ew1200 @@ -111,8 +110,7 @@ define Device/asiarf_ap7621-001 IMAGE_SIZE := 16000k DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AP7621-001 - DEVICE_PACKAGES := \ - kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 + DEVICE_PACKAGES := kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 endef TARGET_DEVICES += asiarf_ap7621-001 @@ -121,8 +119,7 @@ define Device/asiarf_ap7621-nv1 IMAGE_SIZE := 16000k DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AP7621-NV1 - DEVICE_PACKAGES := \ - kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 + DEVICE_PACKAGES := kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 endef TARGET_DEVICES += asiarf_ap7621-nv1 @@ -131,7 +128,8 @@ define Device/asus_rt-ac57u DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AC57U IMAGE_SIZE := 16064k - DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += asus_rt-ac57u @@ -146,7 +144,8 @@ define Device/asus_rt-ac65p KERNEL_SIZE := 4096k 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) + IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ + check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e wpad-basic uboot-envtools endef TARGET_DEVICES += asus_rt-ac65p @@ -162,7 +161,8 @@ define Device/asus_rt-ac85p KERNEL_SIZE := 4096k 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) + IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ + check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e wpad-basic uboot-envtools endef TARGET_DEVICES += asus_rt-ac85p @@ -208,8 +208,8 @@ define Device/d-team_newifi-d2 IMAGE_SIZE := 32448k DEVICE_VENDOR := Newifi DEVICE_MODEL := D2 - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += d-team_newifi-d2 @@ -218,9 +218,8 @@ define Device/d-team_pbr-m1 IMAGE_SIZE := 16064k DEVICE_VENDOR := PandoraBox DEVICE_MODEL := PBR-M1 - DEVICE_PACKAGES := \ - kmod-ata-core kmod-ata-ahci kmod-mt7603 kmod-mt76x2 kmod-sdhci-mt7620 \ - kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-mt7603 kmod-mt76x2 \ + kmod-sdhci-mt7620 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += pbr-m1 endef TARGET_DEVICES += d-team_pbr-m1 @@ -231,11 +230,9 @@ define Device/edimax_rg21s DEVICE_VENDOR := Edimax DEVICE_MODEL := Gemini AC2600 RG21S IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ - elx-header 02020038 8844A2D168B45A2D - DEVICE_PACKAGES := \ - kmod-mt7615e wpad-basic + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + elx-header 02020038 8844A2D168B45A2D + DEVICE_PACKAGES := kmod-mt7615e wpad-basic endef TARGET_DEVICES += edimax_rg21s @@ -245,8 +242,8 @@ 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) |\ - elecom-wrc-factory WRC-1167GHBK2-S 0.00 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + elecom-wrc-factory WRC-1167GHBK2-S 0.00 DEVICE_PACKAGES := kmod-mt7615e wpad-basic endef TARGET_DEVICES += elecom_wrc-1167ghbk2-s @@ -257,8 +254,8 @@ define Device/elecom_wrc-1900gst DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-1900GST IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) |\ - elecom-gst-factory WRC-1900GST 0.00 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + elecom-gst-factory WRC-1900GST 0.00 endef TARGET_DEVICES += elecom_wrc-1900gst @@ -268,8 +265,8 @@ define Device/elecom_wrc-2533gst DEVICE_VENDOR := ELECOM DEVICE_MODEL := WRC-2533GST IMAGES += factory.bin - IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) |\ - elecom-gst-factory WRC-2533GST 0.00 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + elecom-gst-factory WRC-2533GST 0.00 endef TARGET_DEVICES += elecom_wrc-2533gst @@ -288,8 +285,8 @@ define Device/gehua_ghl-r-001 IMAGE_SIZE := 32448k DEVICE_VENDOR := GeHua DEVICE_MODEL := GHL-R-001 - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += gehua_ghl-r-001 @@ -320,7 +317,8 @@ define Device/hiwifi_hc5962 IMAGE_SIZE := 32768k 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) + IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ + check-size $$$$(IMAGE_SIZE) DEVICE_VENDOR := HiWiFi DEVICE_MODEL := HC5962 DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-basic @@ -332,7 +330,7 @@ define Device/iodata_wn-ax1167gr MTK_SOC := mt7621 IMAGE_SIZE := 15552k KERNEL_INITRAMFS := $$(KERNEL) | \ - iodata-factory 7864320 4 0x1055 $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.bin + iodata-factory 7864320 4 0x1055 $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.bin DEVICE_VENDOR := I-O DATA DEVICE_MODEL := WN-AX1167GR DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic @@ -354,9 +352,8 @@ define Device/iodata_wnpr2600g DEVICE_MODEL := WNPR2600G IMAGE_SIZE := 13952k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ - elx-header 0104003a 8844A2D168B45A2D + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + elx-header 0104003a 8844A2D168B45A2D DEVICE_PACKAGES := kmod-mt7615e wpad-basic endef TARGET_DEVICES += iodata_wnpr2600g @@ -375,8 +372,8 @@ define Device/jcg_jhr-ac876m MTK_SOC := mt7621 IMAGE_SIZE := 16064k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 89.1 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + jcg-header 89.1 JCG_MAXSIZE := 16064k DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-AC876M @@ -389,8 +386,8 @@ define Device/lenovo_newifi-d1 IMAGE_SIZE := 32448k DEVICE_VENDOR := Newifi DEVICE_MODEL := D1 - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 \ + kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += newifi-d1 endef TARGET_DEVICES += lenovo_newifi-d1 @@ -433,8 +430,9 @@ define Device/MikroTik LOADER_TYPE := elf PLATFORM := mt7621 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) + IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 | \ + pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | append-metadata | \ + check-size $$$$(IMAGE_SIZE) endef define Device/mikrotik_rb750gr3 @@ -462,9 +460,8 @@ define Device/mqmaker_witi IMAGE_SIZE := 16064k DEVICE_VENDOR := MQmaker DEVICE_MODEL := WiTi - DEVICE_PACKAGES := \ - kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620 kmod-usb3 \ - kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-mt76x2 \ + kmod-sdhci-mt7620 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += witi mqmaker,witi-256m mqmaker,witi-512m endef TARGET_DEVICES += mqmaker_witi @@ -475,8 +472,8 @@ define Device/mtc_wr1201 DEVICE_VENDOR := MTC DEVICE_MODEL := Wireless Router WR1201 KERNEL_INITRAMFS := $(KERNEL_DTB) | wr1201-factory-header - DEVICE_PACKAGES := \ - kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += mtc_wr1201 @@ -488,7 +485,8 @@ define Device/netgear_ex6150 NETGEAR_BOARD_ID := U12H318T00_NETGEAR IMAGE_SIZE := 14848k IMAGES += factory.chk - IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | netgear-chk + IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + netgear-chk endef TARGET_DEVICES += netgear_ex6150 @@ -499,8 +497,8 @@ define Device/netgear_sercomm_nand KERNEL_SIZE := 4096k UBINIZE_OPTS := -E 5 IMAGES += factory.img kernel.bin rootfs.bin - IMAGE/factory.img := pad-extra 2048k | append-kernel | pad-to 6144k | append-ubi | \ - pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \ + IMAGE/factory.img := pad-extra 2048k | append-kernel | pad-to 6144k | \ + append-ubi | pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \ zip $$$$(SERCOMM_HWNAME).bin | sercom-seal IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/kernel.bin := append-kernel @@ -568,15 +566,18 @@ define Device/netgear_wndr3700-v5 SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x1054 IMAGES += factory.img - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.img := pad-extra 320k | $$(IMAGE/default) | pad-to $$$$(BLOCKSIZE) | \ - sercom-footer | pad-to 128 | zip WNDR3700v5.bin | sercom-seal + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ + pad-rootfs + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ + check-size $$$$(IMAGE_SIZE) + IMAGE/factory.img := pad-extra 320k | $$(IMAGE/default) | \ + pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \ + zip WNDR3700v5.bin | sercom-seal DEVICE_VENDOR := NETGEAR DEVICE_MODEL := WNDR3700 DEVICE_VARIANT := v5 - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += wndr3700v5 endef TARGET_DEVICES += netgear_wndr3700-v5 @@ -589,7 +590,8 @@ define Device/netis_wf-2881 IMAGE_SIZE := 129280k KERNEL := $(KERNEL_DTB) | pad-offset $$(BLOCKSIZE) 64 | uImage lzma UBINIZE_OPTS := -E 5 - IMAGE/sysupgrade.bin := append-kernel | append-ubi | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | append-ubi | append-metadata | \ + check-size $$$$(IMAGE_SIZE) DEVICE_VENDOR := NETIS DEVICE_MODEL := WF-2881 DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic @@ -624,9 +626,8 @@ define Device/samknows_whitebox-v8 IMAGE_SIZE := 16064k DEVICE_VENDOR := SamKnows DEVICE_MODEL := Whitebox 8 - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport \ - uboot-envtools wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport uboot-envtools wpad-basic SUPPORTED_DEVICES += sk-wb8 endef TARGET_DEVICES += samknows_whitebox-v8 @@ -719,7 +720,8 @@ define Device/ubiquiti_edgerouterx IMAGE_SIZE := 256768k FILESYSTEMS := squashfs KERNEL_SIZE := 3145728 - KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar + KERNEL_INITRAMFS := $$(KERNEL) | \ + ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_VENDOR := Ubiquiti DEVICE_MODEL := EdgeRouter X @@ -764,7 +766,8 @@ define Device/wevo_11acnas UIMAGE_NAME := 11AC-NAS-Router(0.0.0) DEVICE_VENDOR := WeVO DEVICE_MODEL := 11AC NAS Router - DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += 11acnas endef TARGET_DEVICES += wevo_11acnas @@ -776,8 +779,8 @@ define Device/wevo_w2914ns-v2 DEVICE_VENDOR := WeVO DEVICE_MODEL := W2914NS DEVICE_VARIANT := v2 - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += w2914nsv2 endef TARGET_DEVICES += wevo_w2914ns-v2 @@ -797,9 +800,8 @@ define Device/xiaomi_mir3g DEVICE_MODEL := Mi Router 3G SUPPORTED_DEVICES += R3G SUPPORTED_DEVICES += mir3g - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic \ - uboot-envtools + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic uboot-envtools endef TARGET_DEVICES += xiaomi_mir3g @@ -827,10 +829,10 @@ define Device/xiaomi_mir3p DEVICE_MODEL := Mi Router 3 Pro 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) - DEVICE_PACKAGES := \ - kmod-mt7615e kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic \ - uboot-envtools + IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ + check-size $$$$(IMAGE_SIZE) + DEVICE_PACKAGES := kmod-mt7615e kmod-usb3 kmod-usb-ledtrig-usbport \ + wpad-basic uboot-envtools endef TARGET_DEVICES += xiaomi_mir3p @@ -848,9 +850,8 @@ define Device/xzwifi_creativebox-v1 IMAGE_SIZE := 32448k DEVICE_VENDOR := CreativeBox DEVICE_MODEL := v1 - DEVICE_PACKAGES := \ - kmod-ata-core kmod-ata-ahci kmod-mt7603 kmod-mt76x2 kmod-sdhci-mt7620 \ - kmod-usb3 + DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-mt7603 kmod-mt76x2 \ + kmod-sdhci-mt7620 kmod-usb3 endef TARGET_DEVICES += xzwifi_creativebox-v1 @@ -859,8 +860,8 @@ define Device/youhua_wr1200js IMAGE_SIZE := 16064k DEVICE_VENDOR := YouHua DEVICE_MODEL := WR1200JS - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += youhua_wr1200js @@ -869,8 +870,8 @@ define Device/youku_yk-l2 IMAGE_SIZE := 16064k DEVICE_VENDOR := Youku DEVICE_MODEL := YK-L2 - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += youku_yk-l2 @@ -879,8 +880,8 @@ define Device/zbtlink_zbt-we1326 IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE1326 - DEVICE_PACKAGES := \ - kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 \ + wpad-basic SUPPORTED_DEVICES += zbt-we1326 endef TARGET_DEVICES += zbtlink_zbt-we1326 @@ -890,9 +891,8 @@ define Device/zbtlink_zbt-we3526 IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE3526 - DEVICE_PACKAGES := \ - kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \ - kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += zbtlink_zbt-we3526 @@ -901,9 +901,8 @@ define Device/zbtlink_zbt-wg2626 IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG2626 - DEVICE_PACKAGES := \ - kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 \ - kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 \ + kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += zbt-wg2626 endef TARGET_DEVICES += zbtlink_zbt-wg2626 @@ -914,9 +913,8 @@ define Device/zbtlink_zbt-wg3526-16m DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG3526 DEVICE_VARIANT := 16M - DEVICE_PACKAGES := \ - kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \ - kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 \ + kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += zbt-wg3526 zbt-wg3526-16M endef TARGET_DEVICES += zbtlink_zbt-wg3526-16m @@ -927,9 +925,8 @@ define Device/zbtlink_zbt-wg3526-32m DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG3526 DEVICE_VARIANT := 32M - DEVICE_PACKAGES := \ - kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \ - kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 \ + kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic SUPPORTED_DEVICES += ac1200pro zbt-wg3526-32M endef TARGET_DEVICES += zbtlink_zbt-wg3526-32m @@ -939,6 +936,7 @@ define Device/zio_freezio IMAGE_SIZE := 16064k DEVICE_VENDOR := ZIO DEVICE_MODEL := FREEZIO - DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += zio_freezio diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index 758caf7fa2..6865d397e6 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -19,11 +19,9 @@ define Device/buffalo_wcr-1166ds BUFFALO_TAG_MINOR := 9.99 IMAGES += factory.bin IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata - IMAGE/factory.bin := \ - trx -M 0x746f435c | pad-rootfs | append-metadata | \ + IMAGE/factory.bin := trx -M 0x746f435c | pad-rootfs | append-metadata | \ buffalo-enc WCR-1166DS $$(BUFFALO_TAG_VERSION) -l | \ - buffalo-tag-dhp WCR-1166DS JP JP | buffalo-enc-tag -l | \ - buffalo-dhp-image + buffalo-tag-dhp WCR-1166DS JP JP | buffalo-enc-tag -l | buffalo-dhp-image DEVICE_VENDOR := Buffalo DEVICE_MODEL := WCR-1166DS DEVICE_PACKAGES := kmod-mt76x2 @@ -35,8 +33,8 @@ define Device/cudy_wr1000 MTK_SOC := mt7628an IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 92.122 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + jcg-header 92.122 JCG_MAXSIZE := 7872k DEVICE_VENDOR := Cudy DEVICE_MODEL := WR1000 @@ -184,10 +182,13 @@ define Device/netgear_r6120 SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x0040 IMAGES += factory.img - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE)| append-rootfs | pad-rootfs - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.img := pad-extra 576k | $$(IMAGE/default) | pad-to $$$$(BLOCKSIZE) | \ - sercom-footer | pad-to 128 | zip R6120.bin | sercom-seal + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE)| append-rootfs | \ + pad-rootfs + IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \ + check-size $$$$(IMAGE_SIZE) + IMAGE/factory.img := pad-extra 576k | $$(IMAGE/default) | \ + pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | zip R6120.bin | \ + sercom-seal endef TARGET_DEVICES += netgear_r6120 @@ -263,7 +264,8 @@ define Device/tplink IMAGE/sysupgrade.bin := tplink-v2-image -s -e | append-metadata | \ check-size $$$$(IMAGE_SIZE) endef -DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD TPLINK_HVERSION +DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD +DEVICE_VARS += TPLINK_HVERSION define Device/tplink_archer-c20-v4 $(Device/tplink) @@ -450,7 +452,8 @@ define Device/tplink_tl-wr902ac-v3 TPLINK_HWREV := 0x89 TPLINK_HWREVADD := 0x1 TPLINK_HVERSION := 3 - DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci \ + kmod-usb-ledtrig-usbport endef TARGET_DEVICES += tplink_tl-wr902ac-v3 @@ -471,7 +474,7 @@ define Device/vocore_vocore2 DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore2 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \ - kmod-sdhci-mt7620 + kmod-sdhci-mt7620 SUPPORTED_DEVICES += vocore2 endef TARGET_DEVICES += vocore_vocore2 @@ -482,7 +485,7 @@ define Device/vocore_vocore2-lite DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore2-Lite DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \ - kmod-sdhci-mt7620 + kmod-sdhci-mt7620 SUPPORTED_DEVICES += vocore2lite endef TARGET_DEVICES += vocore_vocore2-lite @@ -589,7 +592,8 @@ define Device/zyxel_keenetic-extra-ii BLOCKSIZE := 64k DEVICE_VENDOR := ZyXEL DEVICE_MODEL := Keenetic Extra II - DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci \ + 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" diff --git a/target/linux/ramips/image/rt288x.mk b/target/linux/ramips/image/rt288x.mk index 460df28538..a66ee59881 100644 --- a/target/linux/ramips/image/rt288x.mk +++ b/target/linux/ramips/image/rt288x.mk @@ -53,7 +53,7 @@ define Device/belkin_f5d8235-v1 DEVICE_MODEL := F5D8235 DEVICE_VARIANT := V1 DEVICE_PACKAGES := kmod-switch-rtl8366s kmod-usb-ohci \ - kmod-usb-ohci-pci kmod-usb2 kmod-usb2-pci kmod-usb-ledtrig-usbport + kmod-usb-ohci-pci kmod-usb2 kmod-usb2-pci kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += f5d8235-v1 endef TARGET_DEVICES += belkin_f5d8235-v1 @@ -90,10 +90,8 @@ define Device/dlink_dap-1522-a1 DEVICE_PACKAGES := kmod-switch-rtl8366s KERNEL := $(KERNEL_DTB) IMAGES += factory.bin - IMAGE/factory.bin := \ - append-kernel | pad-offset $$$$(BLOCKSIZE) 96 | \ - append-rootfs | pad-rootfs -x 96 | \ - wrg-header wapnd01_dlink_dap1522 | \ + IMAGE/factory.bin := append-kernel | pad-offset $$$$(BLOCKSIZE) 96 | \ + append-rootfs | pad-rootfs -x 96 | wrg-header wapnd01_dlink_dap1522 | \ check-size $$$$(IMAGE_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 fac2a689a2..0550c7ffa9 100644 --- a/target/linux/ramips/image/rt305x.mk +++ b/target/linux/ramips/image/rt305x.mk @@ -111,7 +111,7 @@ define Device/allnet_all5002 DEVICE_VENDOR := Allnet DEVICE_MODEL := ALL5002 DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ - kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x + kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x SUPPORTED_DEVICES += all5002 endef TARGET_DEVICES += allnet_all5002 @@ -122,7 +122,7 @@ define Device/allnet_all5003 DEVICE_VENDOR := Allnet DEVICE_MODEL := ALL5003 DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ - kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x + kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x SUPPORTED_DEVICES += all5003 endef TARGET_DEVICES += allnet_all5003 @@ -153,7 +153,8 @@ define Device/arcwireless_freestation5 IMAGE_SIZE := 7872k DEVICE_VENDOR := ARC Wireless DEVICE_MODEL := FreeStation - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-rt2500-usb kmod-rt2800-usb kmod-rt2x00-usb + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-rt2500-usb kmod-rt2800-usb \ + kmod-rt2x00-usb SUPPORTED_DEVICES += freestation5 endef TARGET_DEVICES += arcwireless_freestation5 @@ -183,8 +184,7 @@ define Device/asiarf_awm002-evb-4m DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AWM002-EVB DEVICE_VARIANT := 4M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 \ - kmod-i2c-core kmod-i2c-gpio + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-gpio SUPPORTED_DEVICES += awm002-evb-4M endef TARGET_DEVICES += asiarf_awm002-evb-4m @@ -195,8 +195,7 @@ define Device/asiarf_awm002-evb-8m DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AWM002-EVB/AWM003-EVB DEVICE_VARIANT := 8M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 \ - kmod-i2c-core kmod-i2c-gpio + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-gpio SUPPORTED_DEVICES += awm002-evb-8M endef TARGET_DEVICES += asiarf_awm002-evb-8m @@ -302,8 +301,8 @@ define Device/buffalo_whr-g300n DEVICE_VENDOR := Buffalo DEVICE_MODEL := WHR-G300N IMAGES += tftp.bin - IMAGE/tftp.bin := $$(sysupgrade_bin) | \ - check-size $$$$(IMAGE_SIZE) | buffalo-tftp-header + IMAGE/tftp.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + buffalo-tftp-header SUPPORTED_DEVICES += whr-g300n endef TARGET_DEVICES += buffalo_whr-g300n @@ -327,7 +326,8 @@ define Device/dlink_dcs-930 IMAGE_SIZE := 3776k DEVICE_VENDOR := D-Link DEVICE_MODEL := DCS-930 - DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-dwc2 + DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core \ + kmod-usb-audio kmod-usb-dwc2 SUPPORTED_DEVICES += dcs-930 endef TARGET_DEVICES += dlink_dcs-930 @@ -338,7 +338,8 @@ define Device/dlink_dcs-930l-b1 DEVICE_VENDOR := D-Link DEVICE_MODEL := DCS-930L DEVICE_VARIANT := B1 - DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-ohci kmod-usb2 + DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core \ + kmod-usb-audio kmod-usb-ohci kmod-usb2 SUPPORTED_DEVICES += dcs-930l-b1 endef TARGET_DEVICES += dlink_dcs-930l-b1 @@ -347,8 +348,8 @@ define Device/dlink_dir-300-b1 MTK_SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir300b + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + wrg-header wrgn23_dlwbr_dir300b DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-300 DEVICE_VARIANT := B1 @@ -381,8 +382,8 @@ define Device/dlink_dir-600-b1 MTK_SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir600b + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + wrg-header wrgn23_dlwbr_dir600b DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-600 DEVICE_VARIANT := B1/B2 @@ -409,8 +410,8 @@ define Device/dlink_dir-615-d MTK_SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir615d + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + wrg-header wrgn23_dlwbr_dir615d DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-615 DEVICE_VARIANT := D @@ -423,8 +424,7 @@ define Device/dlink_dir-615-h1 BLOCKSIZE := 4k IMAGES += factory.bin IMAGE_SIZE := 3776k - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | senao-header -r 0x218 -p 0x30 -t 3 + IMAGE/factory.bin := $$(sysupgrade_bin) | senao-header -r 0x218 -p 0x30 -t 3 DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-615 DEVICE_VARIANT := H1 @@ -459,8 +459,7 @@ define Device/dlink_dwr-512-b DEVICE_MODEL := DWR-512 DEVICE_VARIANT := B DEVICE_PACKAGES := jboot-tools kmod-usb2 kmod-spi-dev kmod-usb-serial \ - kmod-usb-serial-option kmod-usb-net kmod-usb-net-cdc-ether \ - comgt-ncm + kmod-usb-serial-option kmod-usb-net kmod-usb-net-cdc-ether comgt-ncm DLINK_ROM_ID := DLK6E2412001 DLINK_FAMILY_MEMBER := 0x6E24 DLINK_FIRMWARE_SIZE := 0x7E0000 @@ -569,8 +568,8 @@ define Device/hilink_hlk-rm04 MTK_SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | hilink-header + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + hilink-header DEVICE_VENDOR := Hi-Link DEVICE_MODEL := HLK-RM04 SUPPORTED_DEVICES += hlk-rm04 @@ -612,9 +611,8 @@ define Device/intenso_memory2move UIMAGE_NAME:= Linux Kernel Image DEVICE_VENDOR := Intenso DEVICE_MODEL := Memory 2 Move - DEVICE_PACKAGES := kmod-ledtrig-netdev kmod-ledtrig-timer \ - kmod-usb2 kmod-usb-storage kmod-scsi-core \ - kmod-fs-ext4 kmod-fs-vfat block-mount + DEVICE_PACKAGES := kmod-ledtrig-netdev kmod-ledtrig-timer kmod-usb2 \ + kmod-usb-storage kmod-scsi-core kmod-fs-ext4 kmod-fs-vfat block-mount SUPPORTED_DEVICES += m2m endef TARGET_DEVICES += intenso_memory2move @@ -623,8 +621,8 @@ define Device/jcg_jhr-n805r MTK_SOC := rt3050 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 29.24 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + jcg-header 29.24 DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-N805R SUPPORTED_DEVICES += jhr-n805r @@ -635,8 +633,8 @@ define Device/jcg_jhr-n825r MTK_SOC := rt3052 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 23.24 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + jcg-header 23.24 DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-N825R SUPPORTED_DEVICES += jhr-n825r @@ -647,8 +645,8 @@ define Device/jcg_jhr-n926r MTK_SOC := rt3052 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 25.24 + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + jcg-header 25.24 DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-N926R SUPPORTED_DEVICES += jhr-n926r @@ -701,8 +699,8 @@ define Device/nexx_wt1520-4m MTK_SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 4M + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + poray-header -B WT1520 -F 4M DEVICE_VENDOR := Nexx DEVICE_MODEL := WT1520 DEVICE_VARIANT := 4M @@ -714,8 +712,8 @@ define Device/nexx_wt1520-8m MTK_SOC := rt5350 IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 8M + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + poray-header -B WT1520 -F 8M DEVICE_VENDOR := Nexx DEVICE_MODEL := WT1520 DEVICE_VARIANT := 8M @@ -729,7 +727,8 @@ define Device/nixcore_x1-16m DEVICE_VENDOR := Nixcore DEVICE_MODEL := X1 DEVICE_VARIANT := 16M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + kmod-spi-dev SUPPORTED_DEVICES += nixcore-x1 nixcore-x1-16M endef TARGET_DEVICES += nixcore_x1-16m @@ -740,7 +739,8 @@ define Device/nixcore_x1-8m DEVICE_VENDOR := Nixcore DEVICE_MODEL := X1 DEVICE_VARIANT := 8M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + kmod-spi-dev SUPPORTED_DEVICES += nixcore-x1 nixcore-x1-8M endef TARGET_DEVICES += nixcore_x1-8m @@ -750,9 +750,8 @@ define Device/olimex_rt5350f-olinuxino IMAGE_SIZE := 7872k DEVICE_VENDOR := OLIMEX DEVICE_MODEL := RT5350F-OLinuXino - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 \ - kmod-i2c-core kmod-i2c-ralink \ - kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + kmod-spi-dev SUPPORTED_DEVICES += rt5350f-olinuxino endef TARGET_DEVICES += olimex_rt5350f-olinuxino @@ -762,9 +761,8 @@ define Device/olimex_rt5350f-olinuxino-evb IMAGE_SIZE := 7872k DEVICE_VENDOR := OLIMEX DEVICE_MODEL := RT5350F-OLinuXino-EVB - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 \ - kmod-i2c-core kmod-i2c-ralink \ - kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + kmod-spi-dev SUPPORTED_DEVICES += rt5350f-olinuxino-evb endef TARGET_DEVICES += olimex_rt5350f-olinuxino-evb @@ -842,12 +840,11 @@ define Device/poray_m3 MTK_SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M3 -F 4M + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + poray-header -B M3 -F 4M DEVICE_VENDOR := Poray DEVICE_MODEL := M3 - DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev \ - kmod-ledtrig-timer + DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer SUPPORTED_DEVICES += m3 endef TARGET_DEVICES += poray_m3 @@ -856,13 +853,12 @@ define Device/poray_m4-4m MTK_SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M4 -F 4M + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + poray-header -B M4 -F 4M DEVICE_VENDOR := Poray DEVICE_MODEL := M4 DEVICE_VARIANT := 4M - DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev \ - kmod-ledtrig-timer + DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer SUPPORTED_DEVICES += m4-4M endef TARGET_DEVICES += poray_m4-4m @@ -871,8 +867,8 @@ define Device/poray_m4-8m MTK_SOC := rt5350 IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M4 -F 8M + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + poray-header -B M4 -F 8M DEVICE_VENDOR := Poray DEVICE_MODEL := M4 DEVICE_VARIANT := 8M @@ -885,8 +881,8 @@ define Device/poray_x5 MTK_SOC := rt5350 IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B X5 -F 8M + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + poray-header -B X5 -F 8M DEVICE_VENDOR := Poray DEVICE_MODEL := X5/X6 DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer @@ -898,8 +894,8 @@ define Device/poray_x8 MTK_SOC := rt5350 IMAGE_SIZE := 7872k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B X8 -F 8M + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + poray-header -B X8 -F 8M DEVICE_VENDOR := Poray DEVICE_MODEL := X8 DEVICE_PACKAGES := kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer @@ -1017,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 $$$$(IMAGE_SIZE) DEVICE_VENDOR := TRENDnet DEVICE_MODEL := TEW-638APB DEVICE_VARIANT := v2 @@ -1038,8 +1034,8 @@ define Device/unbranded_a5-v11 MTK_SOC := rt5350 IMAGE_SIZE := 3776k IMAGES += factory.bin - IMAGE/factory.bin := \ - $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B A5-V11 -F 4M + IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ + poray-header -B A5-V11 -F 4M DEVICE_VENDOR := DEVICE_MODEL := A5-V11 DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 @@ -1104,9 +1100,8 @@ define Device/vocore_vocore-16m DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore DEVICE_VARIANT := 16M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 \ - kmod-i2c-core kmod-i2c-ralink \ - kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + kmod-spi-dev SUPPORTED_DEVICES += vocore vocore-16M endef TARGET_DEVICES += vocore_vocore-16m @@ -1117,9 +1112,8 @@ define Device/vocore_vocore-8m DEVICE_VENDOR := VoCore DEVICE_MODEL := VoCore DEVICE_VARIANT := 8M - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 \ - kmod-i2c-core kmod-i2c-ralink \ - kmod-spi-dev + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink \ + kmod-spi-dev SUPPORTED_DEVICES += vocore vocore-8M endef TARGET_DEVICES += vocore_vocore-8m @@ -1129,8 +1123,7 @@ define Device/wansview_ncs601w IMAGE_SIZE := 7872k DEVICE_VENDOR := Wansview DEVICE_MODEL := NCS601W - DEVICE_PACKAGES := kmod-video-core kmod-video-uvc \ - kmod-usb-ohci + DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-usb-ohci SUPPORTED_DEVICES += ncs601w endef TARGET_DEVICES += wansview_ncs601w