From 9529b4aebba2f09157e1662eeb93516aa6b4388e Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Tue, 28 Mar 2017 04:38:34 -0400 Subject: [PATCH] Removed targets with dependencies on ath10k (support was was stripped before committing upstream pull) --- target/linux/ar71xx/image/generic.mk | 73 +-------------------- target/linux/ar71xx/image/legacy-devices.mk | 35 ++-------- target/linux/ar71xx/image/nand.mk | 23 ------- target/linux/ar71xx/image/tp-link.mk | 49 ++------------ target/linux/ar71xx/image/ubnt.mk | 16 ----- 5 files changed, 12 insertions(+), 184 deletions(-) diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index 810e96b672..16eccb8669 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -44,16 +44,6 @@ define Device/cf-e320n-v2 endef TARGET_DEVICES += cf-e320n-v2 -define Device/cf-e380ac-v1 - DEVICE_TITLE := COMFAST CF-E380AC v1 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca988x - BOARDNAME = CF-E380AC-V1 - IMAGE_SIZE = 16128k - CONSOLE = ttyS0,115200 - MTDPARTS = spi0.0:128k(u-boot)ro,64k(art)ro,16128k(firmware),64k(art-backup)ro -endef -TARGET_DEVICES += cf-e380ac-v1 - define Device/cf-e380ac-v2 $(Device/cf-e380ac-v1) DEVICE_TITLE := COMFAST CF-E380AC v2 @@ -414,16 +404,6 @@ define Device/rnx-n360rt endef TARGET_DEVICES += rnx-n360rt -define Device/mc-mac1200r - $(Device/tplink-8mlzma) - DEVICE_TITLE := MERCURY MAC1200R - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x - BOARDNAME := MC-MAC1200R - DEVICE_PROFILE := MAC1200R - TPLINK_HWID := 0x12000001 -endef -TARGET_DEVICES += mc-mac1200r - define Device/minibox-v1 $(Device/tplink-16mlzma) DEVICE_TITLE := Gainstrong MiniBox V1.0 @@ -484,24 +464,6 @@ define Device/som9331 endef TARGET_DEVICES += som9331 -define Device/sr3200 - DEVICE_TITLE := YunCore SR3200 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca988x - BOARDNAME = SR3200 - IMAGE_SIZE = 16000k - CONSOLE = ttyS0,115200 - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro -endef -TARGET_DEVICES += sr3200 - -define Device/xd3200 - $(Device/sr3200) - DEVICE_TITLE := YunCore XD3200 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x - BOARDNAME = XD3200 -endef -TARGET_DEVICES += xd3200 - define Device/tellstick-znet-lite $(Device/tplink-16mlzma) DEVICE_TITLE := TellStick ZNet Lite @@ -527,7 +489,7 @@ TARGET_DEVICES += oolite define Device/NBG6616 DEVICE_TITLE := ZyXEL NBG6616 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-rtc-pcf8563 kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-rtc-pcf8563 BOARDNAME = NBG6616 KERNEL_SIZE = 2048k IMAGE_SIZE = 15323k @@ -630,20 +592,6 @@ define Device/seama DEVICE_VARS += SEAMA_SIGNATURE endef -define Device/dir-869-a1 -$(Device/seama) - DEVICE_TITLE := D-Link DIR-869 rev. A1 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x - BOARDNAME = DIR-869-A1 - IMAGE_SIZE = 15872k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,64k(devdata)ro,64k(devconf)ro,15872k(firmware),64k(radiocfg)ro - SEAMA_SIGNATURE := wrgac54_dlink.2015_dir869 - IMAGE/factory.bin := \ - $$(IMAGE/default) | pad-rootfs -x 64 | \ - seama | seama-seal -m "signature=$$$$(SEAMA_SIGNATURE)" | \ - check-size $$$$(IMAGE_SIZE) -endef - define Device/mynet-n600 $(Device/seama) DEVICE_TITLE := Western Digital My Net N600 @@ -667,7 +615,7 @@ endef define Device/qihoo-c301 $(Device/seama) DEVICE_TITLE := Qihoo C301 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport BOARDNAME = QIHOO-C301 IMAGE_SIZE = 15744k MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env),64k(devdata),64k(devconf),15744k(firmware),64k(warm_start),64k(action_image_config),64k(radiocfg)ro;spi0.1:15360k(upgrade2),1024k(privatedata) @@ -688,23 +636,6 @@ define Build/wrgg-pad-rootfs $(STAGING_DIR_HOST)/bin/padjffs2 $(IMAGE_ROOTFS) -c 64 >>$@ endef -define Device/dap-2695-a1 - DEVICE_TITLE := D-Link DAP-2695 rev. A1 - DEVICE_PACKAGES := ath10k-firmware-qca988x kmod-ath10k uboot-envtools - BOARDNAME = DAP-2695-A1 - IMAGES := factory.img sysupgrade.bin - IMAGE_SIZE = 15360k - IMAGE/factory.img = append-kernel | pad-offset 65536 160 | append-rootfs | wrgg-pad-rootfs | mkwrggimg | check-size $$$$(IMAGE_SIZE) - IMAGE/sysupgrade.bin = append-kernel | pad-offset 65536 160 | mkwrggimg | append-rootfs | wrgg-pad-rootfs | check-size $$$$(IMAGE_SIZE) - KERNEL := kernel-bin | patch-cmdline | relocate-kernel | lzma - KERNEL_INITRAMFS := $$(KERNEL) | mkwrggimg - MTDPARTS = spi0.0:256k(bootloader)ro,64k(bdcfg)ro,64k(rgdb)ro,64k(langpack)ro,15360k(firmware),448k(captival)ro,64k(certificate)ro,64k(radiocfg)ro - DAP_SIGNATURE := wapac02_dkbs_dap2695 - DEVICE_VARS += DAP_SIGNATURE -endef - -TARGET_DEVICES += dap-2695-a1 - define Build/mkbuffaloimg $(STAGING_DIR_HOST)/bin/mkbuffaloimg -B $(BOARDNAME) \ -R $$(($(subst k, * 1024,$(ROOTFS_SIZE)))) \ diff --git a/target/linux/ar71xx/image/legacy-devices.mk b/target/linux/ar71xx/image/legacy-devices.mk index 87423ce55c..cf9008b462 100644 --- a/target/linux/ar71xx/image/legacy-devices.mk +++ b/target/linux/ar71xx/image/legacy-devices.mk @@ -1,6 +1,6 @@ define LegacyDevice/A60 DEVICE_TITLE := OpenMesh A40/A60 - DEVICE_PACKAGES := om-watchdog kmod-ath10k ath10k-firmware-qca988x \ + DEVICE_PACKAGES := om-watchdog \ mod-usb-core kmod-usb2 endef LEGACY_DEVICES += A60 @@ -210,13 +210,6 @@ define LegacyDevice/YUN_16M endef LEGACY_DEVICES += YUN_16M -define LegacyDevice/F9K1115V2 - DEVICE_TITLE := Belkin AC1750DB (F9K1115V2) - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb3 kmod-usb-ledtrig-usbport \ - kmod-ath10k ath10k-firmware-qca988x -endef -LEGACY_DEVICES += F9K1115V2 - define LegacyDevice/DIR600A1 DEVICE_TITLE := D-Link DIR-600 rev. A1 endef @@ -295,13 +288,13 @@ LEGACY_DEVICES += DIR505A1 define LegacyDevice/DGL5500A1 DEVICE_TITLE := D-Link DGL-5500 rev. A1 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 endef LEGACY_DEVICES += DGL5500A1 define LegacyDevice/TEW823DRU DEVICE_TITLE := TRENDNet TEW-823DRU - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 endef LEGACY_DEVICES += TEW823DRU @@ -368,12 +361,6 @@ define LegacyDevice/dLAN_pro_500_wp endef LEGACY_DEVICES += dLAN_pro_500_wp -define LegacyDevice/dLAN_pro_1200_ac - DEVICE_TITLE := devolo dLAN pro 1200+ WiFi ac - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x -endef -LEGACY_DEVICES += dLAN_pro_1200_ac - define LegacyDevice/ESR900 DEVICE_TITLE := EnGenius ESR900 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport @@ -382,13 +369,13 @@ LEGACY_DEVICES += ESR900 define LegacyDevice/ESR1750 DEVICE_TITLE := EnGenius ESR1750 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage endef LEGACY_DEVICES += ESR1750 define LegacyDevice/EPG5000 DEVICE_TITLE := EnGenius EPG5000 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage endef LEGACY_DEVICES += EPG5000 @@ -487,12 +474,6 @@ define LegacyDevice/OM5P endef LEGACY_DEVICES += OM5P -define LegacyDevice/OM5PAC - DEVICE_TITLE := OpenMesh OM5P-AC - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x om-watchdog -endef -LEGACY_DEVICES += OM5PAC - define LegacyDevice/MR600 DEVICE_TITLE := OpenMesh MR600 DEVICE_PACKAGES := om-watchdog @@ -505,12 +486,6 @@ define LegacyDevice/MR900 endef LEGACY_DEVICES += MR900 -define LegacyDevice/MR1750 - DEVICE_TITLE := OpenMesh MR1750 - DEVICE_PACKAGES := om-watchdog kmod-ath10k ath10k-firmware-qca988x -endef -LEGACY_DEVICES += MR1750 - define LegacyDevice/ALL0305 DEVICE_TITLE := Allnet ALL0305 DEVICE_PACKAGES := fconfig kmod-ath5k -kmod-ath9k diff --git a/target/linux/ar71xx/image/nand.mk b/target/linux/ar71xx/image/nand.mk index ce1b067c55..5c66c81413 100644 --- a/target/linux/ar71xx/image/nand.mk +++ b/target/linux/ar71xx/image/nand.mk @@ -13,17 +13,6 @@ endef TARGET_DEVICES += c-60 -define Device/domywifi-dw33d - DEVICE_TITLE := DomyWifi DW33D - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca988x - BOARDNAME = DW33D - IMAGE_SIZE = 16000k - CONSOLE = ttyS0,115200 - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,14528k(rootfs),1472k(kernel),64k(art)ro,16000k@0x50000(firmware);ar934x-nfc:96m(rootfs_data),32m(backup)ro - IMAGE/sysupgrade.bin = append-rootfs | pad-rootfs | pad-to 14528k | append-kernel | check-size $$$$(IMAGE_SIZE) -endef -TARGET_DEVICES += domywifi-dw33d - define Build/MerakiNAND -$(STAGING_DIR_HOST)/bin/mkmerakifw \ -B $(BOARDNAME) -s \ @@ -69,12 +58,6 @@ endef TARGET_DEVICES += z1 -define LegacyDevice/R6100 - DEVICE_TITLE := NETGEAR R6100 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport -endef -LEGACY_DEVICES += R6100 - define LegacyDevice/WNDR3700V4 DEVICE_TITLE := NETGEAR WNDR3700v4 DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport @@ -86,9 +69,3 @@ define LegacyDevice/WNDR4300V1 DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport endef LEGACY_DEVICES += WNDR4300V1 - -define LegacyDevice/NBG6716 - DEVICE_TITLE := Zyxel NBG 6716 - DEVICE_PACKAGES := kmod-rtc-pcf8563 kmod-ath10k ath10k-firmware-qca988x -endef -LEGACY_DEVICES += NBG6716 diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk index 480d9ad39d..b360a1f9fe 100644 --- a/target/linux/ar71xx/image/tp-link.mk +++ b/target/linux/ar71xx/image/tp-link.mk @@ -135,22 +135,6 @@ $(Device/cpe510-520) endef TARGET_DEVICES += cpe210-220 cpe510-520 wbs210 wbs510 -define Device/re450 - DEVICE_TITLE := TP-LINK RE450 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x - MTDPARTS := spi0.0:128k(u-boot)ro,1344k(kernel),4672k(rootfs),64k(pation-table)ro,64k(product-info)ro,1856k(config)ro,64k(art)ro,6016k@0x20000(firmware) - IMAGE_SIZE := 7936k - BOARDNAME := RE450 - TPLINK_BOARD_NAME := RE450 - DEVICE_PROFILE := RE450 - LOADER_TYPE := elf - KERNEL := kernel-bin | patch-cmdline | lzma | mktplinkfw-kernel - IMAGES := sysupgrade.bin factory.bin - IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade - IMAGE/factory.bin := append-rootfs | tplink-safeloader factory -endef -TARGET_DEVICES += re450 - define Device/eap120 DEVICE_TITLE := TP-LINK EAP120 MTDPARTS := spi0.0:128k(u-boot)ro,64k(pation-table)ro,64k(product-info)ro,1536k(kernel),14336k(rootfs),192k(config)ro,64k(ART)ro,15872k@0x40000(firmware) @@ -220,19 +204,6 @@ $(Device/tl-wdr4300-v1) endef TARGET_DEVICES += tl-wdr3500-v1 tl-wdr3600-v1 tl-wdr4300-v1 tl-wdr4300-v1-il tl-wdr4310-v1 mw4530r-v1 -define Device/tl-wdr6500-v2 -$(Device/tplink-8mlzma) - DEVICE_TITLE := TP-LINK TL-WDR6500v2 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca988x - KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma - KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | uImage lzma | mktplinkfw-combined - BOARDNAME = TL-WDR6500-v2 - DEVICE_PROFILE = TLWDR6500V2 - TPLINK_HWID := 0x65000002 - TPLINK_HEADER_VERSION := 2 -endef -TARGET_DEVICES += tl-wdr6500-v2 - define Device/tl-wdr3320-v2 $(Device/tplink-4mlzma) DEVICE_TITLE := TP-LINK TL-WDR3320v2 @@ -247,7 +218,7 @@ TARGET_DEVICES += tl-wdr3320-v2 define Device/archer-c5-v1 $(Device/tplink-16mlzma) DEVICE_TITLE := TP-LINK Archer C5 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport BOARDNAME := ARCHER-C5 DEVICE_PROFILE := ARCHERC7 TPLINK_HWID := 0xc5000001 @@ -256,7 +227,7 @@ endef define Device/archer-c7-v1 $(Device/tplink-8mlzma) DEVICE_TITLE := TP-LINK Archer C7 v1 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport BOARDNAME := ARCHER-C7 DEVICE_PROFILE := ARCHERC7 TPLINK_HWID := 0x75000001 @@ -265,7 +236,7 @@ endef define Device/archer-c7-v2 $(Device/tplink-16mlzma) DEVICE_TITLE := TP-LINK Archer C7 v2 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport BOARDNAME := ARCHER-C7-V2 DEVICE_PROFILE := ARCHERC7 TPLINK_HWID := 0xc7000002 @@ -277,7 +248,7 @@ endef define Device/archer-c7-v2-il $(Device/tplink-16mlzma) DEVICE_TITLE := TP-LINK Archer C7 v2 IL - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport BOARDNAME := ARCHER-C7-V2 DEVICE_PROFILE := ARCHERC7 TPLINK_HWID := 0xc7000002 @@ -287,7 +258,7 @@ endef define Device/tl-wdr7500-v3 $(Device/tplink-8mlzma) DEVICE_TITLE := TP-LINK Archer C7 v3 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport BOARDNAME := ARCHER-C7 DEVICE_PROFILE := ARCHERC7 TPLINK_HWID := 0x75000003 @@ -413,16 +384,6 @@ define Device/tl-mr3420-v2 endef TARGET_DEVICES += tl-mr3020-v1 tl-mr3040-v1 tl-mr3040-v2 tl-mr3220-v1 tl-mr3220-v2 tl-mr3420-v1 tl-mr3420-v2 -define Device/tl-wpa8630 - $(Device/tplink-8mlzma) - DEVICE_TITLE := TP-LINK TL-WPA8630 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x - BOARDNAME := TL-WPA8630 - DEVICE_PROFILE := TL-WPA8630 - TPLINK_HWID := 0x86300001 -endef -TARGET_DEVICES += tl-wpa8630 - define Device/tl-wr703n-v1 $(Device/tplink-4mlzma) DEVICE_TITLE := TP-LINK TL-WR703N diff --git a/target/linux/ar71xx/image/ubnt.mk b/target/linux/ar71xx/image/ubnt.mk index 68fe8ad301..659a6e4787 100644 --- a/target/linux/ar71xx/image/ubnt.mk +++ b/target/linux/ar71xx/image/ubnt.mk @@ -125,22 +125,6 @@ define Device/ubnt-unifi DEVICE_PROFILE := UBNT UBNTUNIFI endef -define Device/ubnt-unifiac-lite - $(Device/ubnt-unifiac) - DEVICE_TITLE := Ubiquiti UniFi AC-Lite - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x - DEVICE_PROFILE := UBNT UBNTUNIFIACLITE - BOARDNAME := UBNT-UF-AC-LITE -endef - -define Device/ubnt-unifiac-pro - $(Device/ubnt-unifiac) - DEVICE_TITLE := Ubiquiti UniFi AC-Pro - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x kmod-usb-core kmod-usb-ohci kmod-usb2 - DEVICE_PROFILE := UBNT UBNTUNIFIACPRO - BOARDNAME := UBNT-UF-AC-PRO -endef - define Device/ubnt-unifi-outdoor $(Device/ubnt-bz) DEVICE_TITLE := Ubiquiti UniFi Outdoor -- 2.25.1