From d17cb4a68a4544dca690629ee9a2483da29fa42a Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 4 May 2017 14:07:47 +0200 Subject: [PATCH] ramips: purge default packages on MT7621 In order to have a smaller initramfs image remove all packages not needed on all devices and add them explicitely for those actually needing them. Also remove wpad-mini from ramips default package set and add it to all sub-targets except for MT7621. While at it reorder packages alphabetically and replace kmod-mt76 with kmod-mt7603 and/or kmod-mt76x2 depending on the chip actually used on a specific board. Hopefully fixes FS#758 Signed-off-by: Daniel Golle --- target/linux/ramips/Makefile | 2 +- target/linux/ramips/image/mt7621.mk | 61 +++++++++++++++++++--------- target/linux/ramips/mt7620/target.mk | 2 +- target/linux/ramips/mt7621/target.mk | 2 - target/linux/ramips/mt7628/target.mk | 2 +- target/linux/ramips/mt7688/target.mk | 2 +- target/linux/ramips/rt288x/target.mk | 2 +- target/linux/ramips/rt305x/target.mk | 2 +- target/linux/ramips/rt3883/target.mk | 2 +- 9 files changed, 48 insertions(+), 29 deletions(-) diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 25859024c1..1de220e1a3 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -21,6 +21,6 @@ endef include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += \ - kmod-leds-gpio kmod-gpio-button-hotplug wpad-mini swconfig + kmod-leds-gpio kmod-gpio-button-hotplug swconfig $(eval $(call BuildTarget)) diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index b57552a6f4..733fb08179 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -30,7 +30,7 @@ define Device/11acnas DTS := 11ACNAS IMAGE_SIZE := $(ralink_default_fw_size_16M) DEVICE_TITLE := WeVO 11AC NAS Router - DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport kmod-mt76 + DEVICE_PACKAGES := kmod-mt7603 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini endef TARGET_DEVICES += 11acnas @@ -51,7 +51,7 @@ define Device/dir-860l-b1 seama-seal -m "signature=wrgac13_dlink.2013gui_dir860lb" | \ check-size $$$$(IMAGE_SIZE) DEVICE_TITLE := D-Link DIR-860L B1 - DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini endef TARGET_DEVICES += dir-860l-b1 @@ -59,7 +59,9 @@ define Device/ew1200 DTS := EW1200 IMAGE_SIZE := $(ralink_default_fw_size_16M) DEVICE_TITLE := AFOUNDRY EW1200 - DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport kmod-ata-core kmod-ata-ahci + DEVICE_PACKAGES := \ + kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-mini endef TARGET_DEVICES += ew1200 @@ -67,7 +69,7 @@ define Device/firewrt DTS := FIREWRT IMAGE_SIZE := $(ralink_default_fw_size_16M) DEVICE_TITLE := Firefly FireWRT - DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini endef TARGET_DEVICES += firewrt @@ -82,7 +84,7 @@ define Device/hc5962 IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE) DEVICE_TITLE := HiWiFi HC5962 - DEVICE_PACKAGES := kmod-usb3 kmod-mt76 + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-mini endef TARGET_DEVICES += hc5962 @@ -98,7 +100,8 @@ define Device/newifi-d1 DTS := Newifi-D1 IMAGE_SIZE := $(ralink_default_fw_size_32M) DEVICE_TITLE := Newifi D1 - DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := \ + kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini endef TARGET_DEVICES += newifi-d1 @@ -106,7 +109,9 @@ define Device/pbr-m1 DTS := PBR-M1 IMAGE_SIZE := $(ralink_default_fw_size_16M) DEVICE_TITLE := PBR-M1 - DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 + DEVICE_PACKAGES := \ + kmod-ata-core kmod-ata-ahci kmod-mt7603 kmod-mt76x2 kmod-sdhci-mt7620 \ + kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini endef TARGET_DEVICES += pbr-m1 @@ -123,7 +128,8 @@ define Device/r6220 IMAGE/kernel.bin := append-kernel IMAGE/rootfs.bin := append-ubi | check-size $$$$(IMAGE_SIZE) DEVICE_TITLE := Netgear R6220 - DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := \ + kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini endef TARGET_DEVICES += r6220 @@ -131,20 +137,21 @@ define Device/rb750gr3 DTS := RB750Gr3 IMAGE_SIZE := $(ralink_default_fw_size_16M) DEVICE_TITLE := MikroTik RB750Gr3 - DEVICE_PACKAGES := kmod-usb3 uboot-envtools -kmod-mt76 -kmod-rt2x00-lib -kmod-mac80211 -kmod-cfg80211 -wpad-mini -iwinfo + DEVICE_PACKAGES := kmod-usb3 uboot-envtools endef TARGET_DEVICES += rb750gr3 define Device/re6500 DTS := RE6500 DEVICE_TITLE := Linksys RE6500 + DEVICE_PACKAGES := kmod-mt76x2 wpad-mini endef TARGET_DEVICES += re6500 define Device/sap-g3200u3 DTS := SAP-G3200U3 DEVICE_TITLE := STORYLiNK SAP-G3200U3 - DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini endef TARGET_DEVICES += sap-g3200u3 @@ -152,7 +159,9 @@ define Device/sk-wb8 DTS := SK-WB8 IMAGE_SIZE := $(ralink_default_fw_size_16M) DEVICE_TITLE := SamKnows Whitebox 8 - DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport uboot-envtools + DEVICE_PACKAGES := \ + kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport \ + uboot-envtools wpad-mini endef TARGET_DEVICES += sk-wb8 @@ -172,7 +181,6 @@ define Device/ubnt-erx KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata DEVICE_TITLE := Ubiquiti EdgeRouter X - DEVICE_PACKAGES := -kmod-mt76 -kmod-mt7603 -kmod-mt76x2 -kmod-mt76-core -kmod-mac80211 -kmod-cfg80211 -wpad-mini -iwinfo endef TARGET_DEVICES += ubnt-erx @@ -188,7 +196,9 @@ define Device/w2914nsv2 DTS := W2914NSV2 IMAGE_SIZE := $(ralink_default_fw_size_16M) DEVICE_TITLE := WeVO W2914NS v2 - DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport kmod-mt76 + DEVICE_PACKAGES := \ + kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport kmod-mt76 \ + wpad-mini endef TARGET_DEVICES += w2914nsv2 @@ -202,7 +212,7 @@ define Device/wf-2881 UBINIZE_OPTS := -E 5 IMAGE/sysupgrade.bin := append-kernel | append-ubi | append-metadata | check-size $$$$(IMAGE_SIZE) DEVICE_TITLE := NETIS WF-2881 - DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport endef TARGET_DEVICES += wf-2881 @@ -210,7 +220,9 @@ define Device/witi DTS := WITI IMAGE_SIZE := $(ralink_default_fw_size_16M) DEVICE_TITLE := MQmaker WiTi - DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 + DEVICE_PACKAGES := \ + kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-mini endef TARGET_DEVICES += witi @@ -218,7 +230,7 @@ define Device/wndr3700v5 DTS := WNDR3700V5 IMAGE_SIZE := $(ralink_default_fw_size_16M) DEVICE_TITLE := Netgear WNDR3700v5 - DEVICE_PACKAGES := kmod-usb3 + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-mini endef TARGET_DEVICES += wndr3700v5 @@ -227,6 +239,7 @@ define Device/wsr-1166 IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata IMAGE_SIZE := $(ralink_default_fw_size_16M) DEVICE_TITLE := Buffalo WSR-1166 + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-mini endef TARGET_DEVICES += wsr-1166 @@ -234,6 +247,7 @@ define Device/wsr-600 DTS := WSR-600 IMAGE_SIZE := $(ralink_default_fw_size_16M) DEVICE_TITLE := Buffalo WSR-600 + DEVICE_PACKAGES := kmod-mt7603 kmod-rt2800-pci wpad-mini endef TARGET_DEVICES += wsr-600 @@ -241,7 +255,8 @@ define Device/zbt-we1326 DTS := ZBT-WE1326 IMAGE_SIZE := $(ralink_default_fw_size_16M) DEVICE_TITLE := ZBT WE1326 - DEVICE_PACKAGES := kmod-usb3 kmod-sdhci-mt7620 + DEVICE_PACKAGES := \ + kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 wpad-mini endef TARGET_DEVICES += zbt-we1326 @@ -249,7 +264,9 @@ define Device/zbt-wg2626 DTS := ZBT-WG2626 IMAGE_SIZE := $(ralink_default_fw_size_16M) DEVICE_TITLE := ZBT WG2626 - DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 + DEVICE_PACKAGES := \ + kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-mini endef TARGET_DEVICES += zbt-wg2626 @@ -258,7 +275,9 @@ define Device/zbt-wg3526-16M IMAGE_SIZE := $(ralink_default_fw_size_16M) SUPPORTED_DEVICES += zbt-wg3526 DEVICE_TITLE := ZBT WG3526 (16MB flash) - DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 + DEVICE_PACKAGES := \ + kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \ + kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini endef TARGET_DEVICES += zbt-wg3526-16M @@ -267,7 +286,9 @@ define Device/zbt-wg3526-32M IMAGE_SIZE := $(ralink_default_fw_size_32M) SUPPORTED_DEVICES += ac1200pro DEVICE_TITLE := ZBT WG3526 (32MB flash) - DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 + DEVICE_PACKAGES := \ + kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \ + kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini endef TARGET_DEVICES += zbt-wg3526-32M diff --git a/target/linux/ramips/mt7620/target.mk b/target/linux/ramips/mt7620/target.mk index e898005bd0..c4fa2ade75 100644 --- a/target/linux/ramips/mt7620/target.mk +++ b/target/linux/ramips/mt7620/target.mk @@ -7,7 +7,7 @@ BOARDNAME:=MT7620 based boards FEATURES+=usb CPU_TYPE:=24kc -DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc kmod-mt76 +DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc kmod-mt76 wpad-mini define Target/Description Build firmware images for Ralink MT7620 based boards. diff --git a/target/linux/ramips/mt7621/target.mk b/target/linux/ramips/mt7621/target.mk index 645f9ce678..3c965abbe0 100644 --- a/target/linux/ramips/mt7621/target.mk +++ b/target/linux/ramips/mt7621/target.mk @@ -7,8 +7,6 @@ BOARDNAME:=MT7621 based boards FEATURES+=nand ramdisk rtc usb CPU_TYPE:=24kc -DEFAULT_PACKAGES += kmod-mt76 - define Target/Description Build firmware images for Ralink MT7621 based boards. endef diff --git a/target/linux/ramips/mt7628/target.mk b/target/linux/ramips/mt7628/target.mk index 76e855c59c..48060ce7ac 100644 --- a/target/linux/ramips/mt7628/target.mk +++ b/target/linux/ramips/mt7628/target.mk @@ -7,7 +7,7 @@ BOARDNAME:=MT7628 based boards FEATURES+=usb CPU_TYPE:=24kc -DEFAULT_PACKAGES += kmod-mt76 +DEFAULT_PACKAGES += kmod-mt76 wpad-mini define Target/Description Build firmware images for Ralink MT7628 based boards. diff --git a/target/linux/ramips/mt7688/target.mk b/target/linux/ramips/mt7688/target.mk index f20a556de7..30ddb78331 100644 --- a/target/linux/ramips/mt7688/target.mk +++ b/target/linux/ramips/mt7688/target.mk @@ -7,7 +7,7 @@ BOARDNAME:=MT7688 based boards FEATURES+=usb CPU_TYPE:=24kc -DEFAULT_PACKAGES += kmod-mt76 +DEFAULT_PACKAGES += kmod-mt76 wpad-mini define Target/Description Build firmware images for Ralink MT7688 based boards. diff --git a/target/linux/ramips/rt288x/target.mk b/target/linux/ramips/rt288x/target.mk index 65ad68fd81..2ca5ecfbb3 100644 --- a/target/linux/ramips/rt288x/target.mk +++ b/target/linux/ramips/rt288x/target.mk @@ -6,7 +6,7 @@ SUBTARGET:=rt288x BOARDNAME:=RT288x based boards CPU_TYPE:=24kc -DEFAULT_PACKAGES += kmod-rt2800-soc +DEFAULT_PACKAGES += kmod-rt2800-soc wpad-mini define Target/Description Build firmware images for Ralink RT288x based boards. diff --git a/target/linux/ramips/rt305x/target.mk b/target/linux/ramips/rt305x/target.mk index 6cdb4906a7..300639fa38 100644 --- a/target/linux/ramips/rt305x/target.mk +++ b/target/linux/ramips/rt305x/target.mk @@ -7,7 +7,7 @@ BOARDNAME:=RT3x5x/RT5350 based boards FEATURES+=usb ramdisk CPU_TYPE:=24kc -DEFAULT_PACKAGES += kmod-rt2800-soc +DEFAULT_PACKAGES += kmod-rt2800-soc wpad-mini define Target/Description Build firmware images for Ralink RT3x5x/RT5350 based boards. diff --git a/target/linux/ramips/rt3883/target.mk b/target/linux/ramips/rt3883/target.mk index 6ae4e7820d..a2631d1ac7 100644 --- a/target/linux/ramips/rt3883/target.mk +++ b/target/linux/ramips/rt3883/target.mk @@ -7,7 +7,7 @@ BOARDNAME:=RT3662/RT3883 based boards FEATURES+=usb pci CPU_TYPE:=74kc -DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc +DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc wpad-mini define Target/Description Build firmware images for Ralink RT3662/RT3883 based boards.