Skip to content

Commit

Permalink
ramips/mediatek: select kmod-mt7615-firmware where kmod-mt7615e is se…
Browse files Browse the repository at this point in the history 
…lected

The new mt76 version splits out the firmware, because the driver can also be
used for MT7663/MT7613

Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
@nbd168
nbd168 committed Jun 4, 2020
1 parent 2dd26fd commit 81b59ef
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 28 deletions.
3 changes: 2 additions & 1 deletion target/linux/mediatek/image/mt7622.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion target/linux/mediatek/mt7622/target.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
52 changes: 26 additions & 26 deletions target/linux/ramips/image/mt7621.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -781,15 +781,15 @@ 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

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

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down

0 comments on commit 81b59ef

Please sign in to comment.