OpenWrt – Diff between revs 2 and 3

Subversion Repositories:

?pathlinks?

Rev 2 – Details – Blame – Last modification – View Log

 	$(STAGING_DIR_HOST)/bin/tar -c \
 		$(if $(SOURCE_DATE_EPOCH),--mtime=@$(SOURCE_DATE_EPOCH)) \
 		-f $@ -C $(KDIR) v_0.0.0.bin v_0.0.0.md5
 endef
-define Build/elx-header
-  $(eval hw_id=$(word 1,$(1)))
+define Build/zyimage
-  $(eval xor_pattern=$(word 2,$(1)))
-  ( \
-    echo -ne "\x00\x00\x00\x00\x00\x00\x00\x03" | \
-      dd bs=42 count=1 conv=sync; \
-    hw_id="$(hw_id)"; \
-    echo -ne "\x$${hw_id:0:2}\x$${hw_id:2:2}\x$${hw_id:4:2}\x$${hw_id:6:2}" | \
-      dd bs=20 count=1 conv=sync; \
-    echo -ne "$$(printf '%08x' $$(stat -c%s $@) | fold -s2 | xargs -I {} echo \\x{} | tr -d '\n')" | \
-      dd bs=8 count=1 conv=sync; \
-    echo -ne "$$($(STAGING_DIR_HOST)/bin/mkhash md5 $@ | fold -s2 | xargs -I {} echo \\x{} | tr -d '\n')" | \
-      dd bs=58 count=1 conv=sync; \
-  ) > $(KDIR)/tmp/$(DEVICE_NAME).header
-  $(call Build/xor-image,-p $(xor_pattern) -x)
-  cat $(KDIR)/tmp/$(DEVICE_NAME).header $@ > $@.new
-  mv $@.new $@
+	$(STAGING_DIR_HOST)/bin/zyimage $(1) $@
 endef
 define Device/ai-br100
 define Device/alfa-network_ac1200rm
   DTS := AC1200RM
   IMAGE_SIZE := 16064k
   DEVICE_TITLE := ALFA Network AC1200RM
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci uboot-envtools
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci uboot-envtools
 endef
 TARGET_DEVICES += alfa-network_ac1200rm
   SUPPORTED_DEVICES := c20i
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0xc2000001
   TPLINK_HWREV := 58
   IMAGES += factory.bin
-  DEVICE_PACKAGES := kmod-mt76x0e
   DEVICE_TITLE := TP-Link ArcherC20i
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += ArcherC20i
 define Device/ArcherC50v1
   TPLINK_HWREV := 69
   IMAGES += factory-us.bin factory-eu.bin
   IMAGE/factory-us.bin := tplink-v2-image -e -w 0
   IMAGE/factory-eu.bin := tplink-v2-image -e -w 2
   DEVICE_TITLE := TP-Link ArcherC50v1
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += ArcherC50v1
 define Device/ArcherMR200
   $(Device/Archer)
   DTS := ArcherMR200
   SUPPORTED_DEVICES := 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-usb2 kmod-usb-net kmod-usb-net-rndis kmod-usb-serial kmod-usb-serial-option adb-enablemodem
   DEVICE_TITLE := TP-Link ArcherMR200
 endef
-TARGET_DEVICES += ArcherMR200
-define Device/bdcom_wap2100-sk
-  DTS := BDCOM-WAP2100-SK
-  IMAGE_SIZE := 15808k
-  DEVICE_TITLE := BDCOM WAP2100-SK (ZTE ZXECS EBG3130)
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76x2 kmod-mt76x0e kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
-endef
-TARGET_DEVICES += bdcom_wap2100-sk
+TARGET_DEVICES += ArcherMR200
 define Device/bocco
   DTS := BOCCO
   DEVICE_TITLE := YUKAI Engineering BOCCO
 define Device/d240
   DTS := D240
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Sanlinking Technologies D240
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76-core kmod-mt76x2 kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += d240
 define Device/db-wrt01
   DTS := DB-WRT01
   DEVICE_TITLE := Planex DB-WRT01
 endef
-TARGET_DEVICES += db-wrt01
 TARGET_DEVICES += db-wrt01
 define Device/dch-m225
-  $(Device/seama)
+define Device/dch-m225
   DTS := DCH-M225
+  BLOCKSIZE := 4k
+  IMAGES += factory.bin
+  IMAGE_SIZE := 6848k
+  IMAGE/sysupgrade.bin := \
+	append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs | \
+	seama -m "dev=/dev/mtdblock/2" -m "type=firmware" | \
+	pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
+  IMAGE/factory.bin := \
+	append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | \
+	append-rootfs | pad-rootfs -x 64 | \
-  BLOCKSIZE := 4k
+	seama -m "dev=/dev/mtdblock/2" -m "type=firmware" | \
-  SEAMA_SIGNATURE := wapn22_dlink.2013gui_dap1320b
+	seama-seal -m "signature=wapn22_dlink.2013gui_dap1320b" | \
-  IMAGE_SIZE := 6848k
+	check-size $$$$(IMAGE_SIZE)
   DEVICE_TITLE := D-Link DCH-M225
-  DEVICE_PACKAGES := kmod-sound-core kmod-sound-mt7620 kmod-i2c-ralink
+  DEVICE_PACKAGES := kmod-mt76 kmod-sound-core kmod-sound-mt7620 kmod-i2c-ralink
 endef
-TARGET_DEVICES += dch-m225
-define Device/dir-810l
+TARGET_DEVICES += dch-m225
-  DTS := DIR-810L
+define Device/dir-810l
-  DEVICE_PACKAGES := kmod-mt76x0e
+  DTS := DIR-810L
-  DEVICE_TITLE := D-Link DIR-810L
+  IMAGE_SIZE := 6720k
-  IMAGE_SIZE := 6720k
+  DEVICE_TITLE := D-Link DIR-810L
 endef
 TARGET_DEVICES += dir-810l
 define Device/dlink_dwr-116-a1
   DTS := DWR-116-A1
   DEVICE_TITLE := D-Link DWR-116 A1/A2
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci jboot-tools
+  DEVICE_PACKAGES := kmod-usb2 jboot-tools
   DLINK_ROM_ID := DLK6E3803001
   DLINK_FAMILY_MEMBER := 0x6E38
   DLINK_FIRMWARE_SIZE := 0x7E0000
   KERNEL := $(KERNEL_DTB)
-  IMAGES += factory.bin
-  IMAGE/sysupgrade.bin := mkdlinkfw | pad-rootfs | append-metadata
-  IMAGE/factory.bin := mkdlinkfw | pad-rootfs | mkdlinkfw-factory
-endef
-TARGET_DEVICES += dlink_dwr-116-a1
-define Device/dlink_dwr-118-a1
-  DTS := DWR-118-A1
-  DEVICE_TITLE := D-Link DWR-118 A1
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci jboot-tools kmod-mt76x0e
-  DLINK_ROM_ID := DLK6E3811001
-  DLINK_FAMILY_MEMBER := 0x6E38
-  DLINK_FIRMWARE_SIZE := 0xFE0000
-  KERNEL := $(KERNEL_DTB)
-  IMAGES += factory.bin
-  IMAGE/sysupgrade.bin := mkdlinkfw | pad-rootfs | append-metadata
-  IMAGE/factory.bin := mkdlinkfw | pad-rootfs | mkdlinkfw-factory
-endef
-TARGET_DEVICES += dlink_dwr-118-a1
-define Device/dlink_dwr-118-a2
-  DTS := DWR-118-A2
-  DEVICE_TITLE := D-Link DWR-118 A2
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci jboot-tools
-  DLINK_ROM_ID := DLK6E3814001
-  DLINK_FAMILY_MEMBER := 0x6E38
-  DLINK_FIRMWARE_SIZE := 0xFE0000
-  KERNEL := $(KERNEL_DTB)
   IMAGES += factory.bin
   IMAGE/sysupgrade.bin := mkdlinkfw | pad-rootfs | append-metadata
   IMAGE/factory.bin := mkdlinkfw | pad-rootfs | mkdlinkfw-factory
 endef
-TARGET_DEVICES += dlink_dwr-118-a2
+TARGET_DEVICES += dlink_dwr-116-a1
   DLINK_ROM_ID := DLK6E2414009
   SUPPORTED_DEVICES := dlink,dwr-921-c1
 endef
 TARGET_DEVICES += dlink_dwr-921-c3
-define Device/dlink_dwr-922-e2
-  DTS := DWR-922-E2
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := D-Link DWR-922 E2
-  DLINK_ROM_ID := DLK6E2414005
-  DLINK_FAMILY_MEMBER := 0x6E24
-  DLINK_FIRMWARE_SIZE := 0xFE0000
-  KERNEL := $(KERNEL_DTB)
-  IMAGES += factory.bin
-  IMAGE/sysupgrade.bin := mkdlinkfw | pad-rootfs | append-metadata
-  IMAGE/factory.bin := mkdlinkfw | pad-rootfs | mkdlinkfw-factory
-  DEVICE_PACKAGES := jboot-tools \
-	kmod-usb2 kmod-usb-net-qmi-wwan kmod-usb-serial-option uqmi
-endef
-TARGET_DEVICES += dlink_dwr-922-e2
 define Device/e1700
   DTS := E1700
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   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) | \
 	netgear-dni
+  DEVICE_PACKAGES := -kmod-mt76
   DEVICE_TITLE := Netgear EX2700
 endef
 TARGET_DEVICES += ex2700
   DTS := EX3700
   BLOCKSIZE := 4k
   IMAGE_SIZE := 7744k
   IMAGES += factory.chk
   IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | netgear-chk
-  DEVICE_PACKAGES := kmod-mt76x2
+  DEVICE_PACKAGES := -kmod-mt76 kmod-mt76x2
   DEVICE_TITLE := Netgear EX3700/EX3800
   SUPPORTED_DEVICES := ex3700
 endef
 TARGET_DEVICES += ex3700-ex3800
 define Device/gl-mt300a
   DTS := GL-MT300A
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := GL-Inet GL-MT300A
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76
 endef
 TARGET_DEVICES += gl-mt300a
 define Device/u25awf-h1
   DTS := U25AWF-H1
-  IMAGE_SIZE := 16064k
-  DEVICE_TITLE := Kimax U25AWF-H1
+  IMAGE_SIZE := 16064k
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  DEVICE_TITLE := Kimax U25AWF-H1
 endef
 TARGET_DEVICES += u25awf-h1
 define Device/gl-mt300n
   DTS := GL-MT300N
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := GL-Inet GL-MT300N
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76
 endef
 TARGET_DEVICES += gl-mt300n
 define Device/gl-mt750
   DTS := GL-MT750
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := GL-Inet GL-MT750
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76
 endef
 TARGET_DEVICES += gl-mt750
 define Device/hc5661
   DTS := HC5661
-  IMAGE_SIZE := 15872k
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := HiWiFi HC5661
-  DEVICE_PACKAGES := kmod-sdhci-mt7620
+  DEVICE_PACKAGES := kmod-usb2 kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += hc5661
 define Device/hc5761
   DTS := HC5761
-  IMAGE_SIZE := 15872k
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := HiWiFi HC5761
-  DEVICE_PACKAGES := kmod-mt76x0e 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
 endef
 TARGET_DEVICES += hc5761
-define Device/hc5861
-  DTS := HC5861
-  IMAGE_SIZE := 15872k
-  DEVICE_TITLE := HiWiFi HC5861
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
-endef
-TARGET_DEVICES += hc5861
-define Device/iodata_wn-ac1167gr
-  DTS := WN-AC1167GR
-  DEVICE_TITLE := I-O DATA WN-AC1167GR
-  IMAGE_SIZE := 6864k
-  IMAGES += factory.bin
-  IMAGE/factory.bin := \
-    $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
-    elx-header 01040016 8844A2D168B45A2D
-  DEVICE_PACKAGES := kmod-mt76x2
-endef
-TARGET_DEVICES += iodata_wn-ac1167gr
-define Device/kimax_u35wf
+define Device/hc5861
-  DTS := U35WF
+  DTS := HC5861
-  IMAGE_SIZE := 16064k
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Kimax U35WF
+  DEVICE_TITLE := HiWiFi HC5861
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
 define Device/microwrt
   DTS := MicroWRT
   IMAGE_SIZE := 16128k
-  DEVICE_TITLE := Microduino MicroWRT
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  DEVICE_TITLE := Microduino MicroWRT
 endef
-TARGET_DEVICES += microwrt
-define Device/lava_lr-25g001
-  DTS := LR-25G001
-  DEVICE_TITLE := LAVA LR-25G001
-  DLINK_ROM_ID := LVA6E3804001
-  DLINK_FAMILY_MEMBER := 0x6E38
-  DLINK_FIRMWARE_SIZE := 0xFE0000
-  KERNEL := $(KERNEL_DTB)
-  IMAGES += factory.bin
-  IMAGE/sysupgrade.bin := mkdlinkfw | pad-rootfs | append-metadata
-  IMAGE/factory.bin := mkdlinkfw | pad-rootfs | mkdlinkfw-factory
-  DEVICE_PACKAGES := jboot-tools kmod-usb2 kmod-usb-ohci kmod-mt76x0e
-endef
-TARGET_DEVICES += lava_lr-25g001
+TARGET_DEVICES += microwrt
 define Device/miwifi-mini
   DTS := MIWIFI-MINI
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Xiaomi MiWiFi Mini
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += miwifi-mini
 define Device/mlw221
-  DTS := MLW221
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DTS := MLW221
-  DEVICE_TITLE := Kingston MLW221
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
+  DEVICE_TITLE := Kingston MLW221
 endef
 TARGET_DEVICES += mlw221
-define Device/mlwg2
-  DTS := MLWG2
+define Device/mlwg2
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DTS := MLWG2
-  DEVICE_TITLE := Kingston MLWG2
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
+  DEVICE_TITLE := Kingston MLWG2
 TARGET_DEVICES += mt7620a_mt7530
 define Device/mt7620a_mt7610e
   DTS := MT7620a_MT7610e
-  DEVICE_TITLE := MediaTek MT7620a + MT7610e EVB
-  DEVICE_PACKAGES := kmod-mt76x0e
+  DEVICE_TITLE := MediaTek MT7620a + MT7610e EVB
   SUPPORTED_DEVICES := mt7620a_mt7610e
 endef
 TARGET_DEVICES += mt7620a_mt7610e
 TARGET_DEVICES += mt7620a_v22sg
 define Device/mzk-750dhp
   DTS := MZK-750DHP
   DEVICE_TITLE := Planex MZK-750DHP
-  DEVICE_PACKAGES := kmod-mt76x0e
+  DEVICE_PACKAGES := kmod-mt76
 endef
 TARGET_DEVICES += mzk-750dhp
 TARGET_DEVICES += mzk-ex300np
 define Device/mzk-ex750np
   DTS := MZK-EX750NP
   DEVICE_TITLE := Planex MZK-EX750NP
-  DEVICE_PACKAGES := kmod-mt76x2
+  DEVICE_PACKAGES := kmod-mt76
 endef
 TARGET_DEVICES += mzk-ex750np
 define Device/na930
   DTS := NA930
-  IMAGE_SIZE := 20m
-  DEVICE_TITLE := Sercomm NA930
+  IMAGE_SIZE := 20m
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  DEVICE_TITLE := Sercomm NA930
 endef
 TARGET_DEVICES += na930
 define Device/oy-0001
-  DTS := OY-0001
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
+  DTS := OY-0001
-  DEVICE_TITLE := Oh Yeah OY-0001
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  DEVICE_TITLE := Oh Yeah OY-0001
 endef
 TARGET_DEVICES += oy-0001
 define Device/psg1208
   DTS := PSG1208
   DEVICE_TITLE := Phicomm PSG1208
-  DEVICE_PACKAGES := kmod-mt76x2
+  DEVICE_PACKAGES := kmod-mt76
 TARGET_DEVICES += rt-n12p
 define Device/rt-n14u
   DTS := RT-N14U
-  DEVICE_TITLE := Asus RT-N14u
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  DEVICE_TITLE := Asus RT-N14u
 endef
 TARGET_DEVICES += rt-n14u
 define Device/rt-ac51u
   DTS := RT-AC51U
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Asus RT-AC51U
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ehci kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += rt-ac51u
 define Device/tiny-ac
   DTS := TINY-AC
   DEVICE_TITLE := Dovado Tiny AC
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
-endef
-TARGET_DEVICES += tiny-ac
-define Device/edimax_br-6478ac-v2
-  DTS := BR-6478AC-V2
-  DEVICE_TITLE := Edimax BR-6478AC V2
-  BLOCKSIZE := 64k
-  IMAGE_SIZE := 7616k
-  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
-endef
-TARGET_DEVICES += edimax_br-6478ac-v2
-define Device/tplink_c2-v1
-  $(Device/Archer)
-  DTS := ArcherC2-v1
-  TPLINK_FLASHLAYOUT := 8Mmtk
-  TPLINK_HWID := 0xc7500001
-  TPLINK_HWREV := 50
-  IMAGES += factory.bin
-  DEVICE_TITLE := TP-Link Archer C2 v1
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
-TARGET_DEVICES += tplink_c2-v1
+TARGET_DEVICES += tiny-ac
 define Device/tplink_c20-v1
-define Device/tplink_c20-v1
+  $(Device/Archer)
-  $(Device/Archer)
+  DTS := ArcherC20v1
-  DTS := ArcherC20v1
+  SUPPORTED_DEVICES := c20v1
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0xc2000001
   TPLINK_HWREV := 0x44
   TPLINK_HWREVADD := 0x1
   IMAGES += factory.bin
   DEVICE_TITLE := TP-Link ArcherC20 v1
-  DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
 define Device/ravpower_wd03
   DTS := WD03
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
   DEVICE_TITLE := Ravpower WD03
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76 kmod-usb-ehci
 endef
 TARGET_DEVICES += ravpower_wd03
 define Device/whr-1166d
   DTS := WHR-1166D
-  IMAGE_SIZE := 15040k
-  DEVICE_TITLE := Buffalo WHR-1166D
+  IMAGE_SIZE := 15040k
-  DEVICE_PACKAGES := kmod-mt76x2
+  DEVICE_TITLE := Buffalo WHR-1166D
 endef
 TARGET_DEVICES += whr-1166d
 define Device/wrtnode
   DTS := WRTNODE
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := WRTNode
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  DEVICE_TITLE := WRTNode
 endef
 TARGET_DEVICES += wrtnode
 define Device/y1
   DTS := Y1
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Lenovo Y1
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
+  DEVICE_TITLE := Lenovo Y1
 endef
 TARGET_DEVICES += y1
 define Device/y1s
   DTS := Y1S
-  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Lenovo Y1S
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
+  DEVICE_TITLE := Lenovo Y1S
 endef
 TARGET_DEVICES += y1s
 define Device/we1026-5g-16m
   DTS := WE1026-5G-16M
   IMAGE_SIZE := 16777216
   SUPPORTED_DEVICES += we1026-5g-16m
   DEVICE_TITLE := Zbtlink ZBT-WE1026-5G (16M)
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76 kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += we1026-5g-16m
 define Device/zbt-ape522ii
   DTS := ZBT-APE522II
   DEVICE_TITLE := Zbtlink ZBT-APE522II
-  DEVICE_PACKAGES := kmod-mt76x2
+  DEVICE_PACKAGES := kmod-mt76
 endef
 TARGET_DEVICES += zbt-ape522ii
 TARGET_DEVICES += zbt-cpe102
 define Device/zbt-wa05
   DTS := ZBT-WA05
-  DEVICE_TITLE := Zbtlink ZBT-WA05
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  DEVICE_TITLE := Zbtlink ZBT-WA05
 endef
 TARGET_DEVICES += zbt-wa05
 define Device/zbt-we826-16M
   DTS := ZBT-WE826-16M
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   SUPPORTED_DEVICES += zbt-we826
   DEVICE_TITLE := Zbtlink ZBT-WE826 (16M)
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76 kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += zbt-we826-16M
 define Device/zbt-we826-32M
   DTS := ZBT-WE826-32M
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
   DEVICE_TITLE := Zbtlink ZBT-WE826 (32M)
-  DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76 kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += zbt-we826-32M
 define Device/zbt-wr8305rt
-  DTS := ZBT-WR8305RT
-  DEVICE_TITLE := Zbtlink ZBT-WR8305RT
+  DTS := ZBT-WR8305RT
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  DEVICE_TITLE := Zbtlink ZBT-WR8305RT
 endef
 TARGET_DEVICES += zbt-wr8305rt
-define Device/zte-q7
-  DTS := ZTE-Q7
+define Device/zte-q7
-  DEVICE_TITLE := ZTE Q7
+  DTS := ZTE-Q7