From 81b59efefd4c88187a519d09129c97e63900731e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 3 Jun 2020 18:55:55 +0200 Subject: [PATCH] ramips/mediatek: select kmod-mt7615-firmware where kmod-mt7615e is selected The new mt76 version splits out the firmware, because the driver can also be used for MT7663/MT7613 Signed-off-by: Felix Fietkau --- target/linux/mediatek/image/mt7622.mk | 3 +- target/linux/mediatek/mt7622/target.mk | 2 +- target/linux/ramips/image/mt7621.mk | 52 +++++++++++++------------- 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk index a386bf1ee2..b570ce9d82 100644 --- a/target/linux/mediatek/image/mt7622.mk +++ b/target/linux/mediatek/image/mt7622.mk @@ -25,7 +25,8 @@ define Device/elecom-wrc-2533gent DEVICE_DTS := mt7622-elecom-wrc-2533gent DEVICE_DTS_DIR := $(DTS_DIR)/mediatek DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb3 \ - kmod-mt7615e mt7622bt-firmware swconfig + kmod-mt7615e kmod-mt7615-firmware \ + mt7622bt-firmware swconfig SUPPORTED_DEVICES := elecom,wrc-2533gent endef TARGET_DEVICES += elecom-wrc-2533gent diff --git a/target/linux/mediatek/mt7622/target.mk b/target/linux/mediatek/mt7622/target.mk index d4ec3cb661..dd4459724e 100644 --- a/target/linux/mediatek/mt7622/target.mk +++ b/target/linux/mediatek/mt7622/target.mk @@ -2,7 +2,7 @@ ARCH:=aarch64 SUBTARGET:=mt7622 BOARDNAME:=MT7622 CPU_TYPE:=cortex-a53 -DEFAULT_PACKAGES += kmod-mt7615e wpad-basic +DEFAULT_PACKAGES += kmod-mt7615e kmod-mt7615-firmware wpad-basic KERNELNAME:=Image dtbs define Target/Description diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 524364d8b0..c2e96160cf 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -160,7 +160,7 @@ define Device/asus_rt-ac65p IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size - DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e wpad-basic uboot-envtools + DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware wpad-basic uboot-envtools endef TARGET_DEVICES += asus_rt-ac65p @@ -176,7 +176,7 @@ define Device/asus_rt-ac85p IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size - DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e wpad-basic uboot-envtools + DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware wpad-basic uboot-envtools endef TARGET_DEVICES += asus_rt-ac85p @@ -199,7 +199,7 @@ define Device/buffalo_wsr-2533dhpl DEVICE_ALT0_VENDOR := Buffalo DEVICE_ALT0_MODEL := WSR-2533DHP IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata - DEVICE_PACKAGES := kmod-mt7615e wpad-basic + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic endef TARGET_DEVICES += buffalo_wsr-2533dhpl @@ -257,7 +257,7 @@ define Device/edimax_ra21s IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elx-header 02020040 8844A2D168B45A2D - DEVICE_PACKAGES := kmod-mt7615e wpad-basic + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic endef TARGET_DEVICES += edimax_ra21s @@ -268,7 +268,7 @@ define Device/edimax_rg21s IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elx-header 02020038 8844A2D168B45A2D - DEVICE_PACKAGES := kmod-mt7615e wpad-basic + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic endef TARGET_DEVICES += edimax_rg21s @@ -279,7 +279,7 @@ define Device/elecom_wrc-1167ghbk2-s IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elecom-wrc-factory WRC-1167GHBK2-S 0.00 - DEVICE_PACKAGES := kmod-mt7615e wpad-basic + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic endef TARGET_DEVICES += elecom_wrc-1167ghbk2-s @@ -384,7 +384,7 @@ define Device/iodata_wn-ax1167gr2 DEVICE_MODEL := WN-AX1167GR2 KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \ custom-initramfs-uimage 3.10(XBC.1)b10 | iodata-mstc-header - DEVICE_PACKAGES := kmod-mt7615e wpad-basic + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic endef TARGET_DEVICES += iodata_wn-ax1167gr2 @@ -394,7 +394,7 @@ define Device/iodata_wn-ax2033gr DEVICE_MODEL := WN-AX2033GR KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \ custom-initramfs-uimage 3.10(VST.1)C10 | iodata-mstc-header - DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e wpad-basic + DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware wpad-basic endef TARGET_DEVICES += iodata_wn-ax2033gr @@ -404,7 +404,7 @@ define Device/iodata_wn-dx1167r DEVICE_MODEL := WN-DX1167R KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \ custom-initramfs-uimage 3.10(XIK.1)b10 | iodata-mstc-header - DEVICE_PACKAGES := kmod-mt7615e wpad-basic + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic endef TARGET_DEVICES += iodata_wn-dx1167r @@ -425,7 +425,7 @@ define Device/iodata_wnpr2600g IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elx-header 0104003a 8844A2D168B45A2D - DEVICE_PACKAGES := kmod-mt7615e wpad-basic + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic endef TARGET_DEVICES += iodata_wnpr2600g @@ -434,7 +434,7 @@ define Device/iptime_a6ns-m UIMAGE_NAME := a6nm DEVICE_VENDOR := ipTIME DEVICE_MODEL := A6ns-M - DEVICE_PACKAGES := kmod-mt7615e kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += iptime_a6ns-m @@ -443,7 +443,7 @@ define Device/iptime_a8004t UIMAGE_NAME := a8004t DEVICE_VENDOR := ipTIME DEVICE_MODEL := A8004T - DEVICE_PACKAGES := kmod-mt7615e kmod-usb3 wpad-basic + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 wpad-basic endef TARGET_DEVICES += iptime_a8004t @@ -454,7 +454,7 @@ define Device/jcg_jhr-ac876m JCG_MAXSIZE := 16064k DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-AC876M - DEVICE_PACKAGES := kmod-mt7615e kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic endef TARGET_DEVICES += jcg_jhr-ac876m @@ -478,7 +478,7 @@ define Device/linksys_ea7500-v2 DEVICE_VENDOR := Linksys DEVICE_MODEL := EA7500 DEVICE_VARIANT := v2 - DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e wpad-basic uboot-envtools + DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware wpad-basic uboot-envtools UBINIZE_OPTS := -E 5 IMAGES := sysupgrade.bin factory.bin IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata | check-size @@ -617,7 +617,7 @@ define Device/netgear_r6260 SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x0052 IMAGE_SIZE := 40960k - DEVICE_PACKAGES += kmod-mt7615e + DEVICE_PACKAGES += kmod-mt7615e kmod-mt7615-firmware endef TARGET_DEVICES += netgear_r6260 @@ -629,7 +629,7 @@ define Device/netgear_r6350 SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x0052 IMAGE_SIZE := 40960k - DEVICE_PACKAGES += kmod-mt7615e + DEVICE_PACKAGES += kmod-mt7615e kmod-mt7615-firmware endef TARGET_DEVICES += netgear_r6350 @@ -648,7 +648,7 @@ define Device/netgear_r6700-v2 SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x1032 IMAGE_SIZE := 40960k - DEVICE_PACKAGES += kmod-mt7615e + DEVICE_PACKAGES += kmod-mt7615e kmod-mt7615-firmware endef TARGET_DEVICES += netgear_r6700-v2 @@ -660,7 +660,7 @@ define Device/netgear_r6800 SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x0062 IMAGE_SIZE := 40960k - DEVICE_PACKAGES += kmod-mt7615e + DEVICE_PACKAGES += kmod-mt7615e kmod-mt7615-firmware endef TARGET_DEVICES += netgear_r6800 @@ -672,7 +672,7 @@ define Device/netgear_r6850 SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x0052 IMAGE_SIZE := 40960k - DEVICE_PACKAGES += kmod-mt7615e + DEVICE_PACKAGES += kmod-mt7615e kmod-mt7615-firmware endef TARGET_DEVICES += netgear_r6850 @@ -725,7 +725,7 @@ define Device/phicomm_k2p DEVICE_ALT0_VENDOR := Phicomm DEVICE_ALT0_MODEL := KE 2P SUPPORTED_DEVICES += k2p - DEVICE_PACKAGES := kmod-mt7615e wpad-basic + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic endef TARGET_DEVICES += phicomm_k2p @@ -781,7 +781,7 @@ define Device/totolink_a7000r UIMAGE_NAME := C8340R1C-9999 DEVICE_VENDOR := TOTOLINK DEVICE_MODEL := A7000R - DEVICE_PACKAGES := kmod-mt7615e wpad-basic + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic endef TARGET_DEVICES += totolink_a7000r @@ -789,7 +789,7 @@ define Device/adslr_g7 IMAGE_SIZE := 16064k DEVICE_VENDOR := ADSLR DEVICE_MODEL := G7 - DEVICE_PACKAGES := kmod-mt7615e wpad-basic + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic endef TARGET_DEVICES += adslr_g7 @@ -808,7 +808,7 @@ define Device/tplink_re650-v1 $(Device/tplink-safeloader) DEVICE_MODEL := RE650 DEVICE_VARIANT := v1 - DEVICE_PACKAGES := kmod-mt7615e wpad-basic + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic TPLINK_BOARD_ID := RE650-V1 IMAGE_SIZE := 14208k endef @@ -843,7 +843,7 @@ TARGET_DEVICES += ubnt_edgerouter-x-sfp define Device/ubnt_unifi-nanohd DEVICE_VENDOR := Ubiquiti DEVICE_MODEL := UniFi nanoHD - DEVICE_PACKAGES += kmod-mt7603 kmod-mt7615e wpad-basic + DEVICE_PACKAGES += kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware wpad-basic IMAGE_SIZE := 15552k endef TARGET_DEVICES += ubnt_unifi-nanohd @@ -937,7 +937,7 @@ define Device/xiaomi_mir3p IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size - DEVICE_PACKAGES := kmod-mt7615e kmod-usb3 kmod-usb-ledtrig-usbport \ + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 kmod-usb-ledtrig-usbport \ wpad-basic uboot-envtools endef TARGET_DEVICES += xiaomi_mir3p @@ -955,7 +955,7 @@ define Device/xiaomi_redmi-router-ac2100 IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_VENDOR := Xiaomi DEVICE_MODEL := Redmi Router AC2100 - DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e wpad-basic uboot-envtools + DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware wpad-basic uboot-envtools endef TARGET_DEVICES += xiaomi_redmi-router-ac2100 -- 2.30.2