From 61b5b4971e7d6aab6b0695997c3b5aaf73c53b5f Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 5 Sep 2018 14:51:44 +0200 Subject: mac80211: make ath10k-ct the default ath10k We select ath10k-ct by default, but it is still possible to build the upstream version. Signed-off-by: Hauke Mehrtens Signed-off-by: John Crispin --- .../linux/ar71xx/image/generic-legacy-devices.mk | 16 +++++----- target/linux/ar71xx/image/generic-senao.mk | 2 +- target/linux/ar71xx/image/generic-tp-link.mk | 30 +++++++++--------- target/linux/ar71xx/image/generic-ubnt.mk | 4 +-- target/linux/ar71xx/image/generic.mk | 36 +++++++++++----------- target/linux/ar71xx/image/mikrotik.mk | 4 +-- target/linux/ar71xx/image/nand.mk | 8 ++--- target/linux/ar71xx/image/tiny-legacy-devices.mk | 2 +- 8 files changed, 51 insertions(+), 51 deletions(-) (limited to 'target/linux/ar71xx') diff --git a/target/linux/ar71xx/image/generic-legacy-devices.mk b/target/linux/ar71xx/image/generic-legacy-devices.mk index a784a1a205..9cf405d48a 100644 --- a/target/linux/ar71xx/image/generic-legacy-devices.mk +++ b/target/linux/ar71xx/image/generic-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 kmod-ath10k-ct ath10k-firmware-qca988x-ct \ mod-usb-core kmod-usb2 endef LEGACY_DEVICES += A60 @@ -151,13 +151,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 kmod-ath10k-ct ath10k-firmware-qca988x-ct 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 kmod-ath10k-ct ath10k-firmware-qca988x-ct endef LEGACY_DEVICES += TEW823DRU @@ -226,7 +226,7 @@ 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 + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct endef LEGACY_DEVICES += dLAN_pro_1200_ac @@ -238,13 +238,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 kmod-ath10k-ct ath10k-firmware-qca988x-ct 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 kmod-ath10k-ct ath10k-firmware-qca988x-ct endef LEGACY_DEVICES += EPG5000 @@ -292,7 +292,7 @@ LEGACY_DEVICES += OM5P define LegacyDevice/OM5PAC DEVICE_TITLE := OpenMesh OM5P-AC - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x om-watchdog + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct om-watchdog endef LEGACY_DEVICES += OM5PAC @@ -310,7 +310,7 @@ LEGACY_DEVICES += MR900 define LegacyDevice/MR1750 DEVICE_TITLE := OpenMesh MR1750 - DEVICE_PACKAGES := om-watchdog kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := om-watchdog kmod-ath10k-ct ath10k-firmware-qca988x-ct endef LEGACY_DEVICES += MR1750 diff --git a/target/linux/ar71xx/image/generic-senao.mk b/target/linux/ar71xx/image/generic-senao.mk index f5473126dd..a241e4a6f5 100644 --- a/target/linux/ar71xx/image/generic-senao.mk +++ b/target/linux/ar71xx/image/generic-senao.mk @@ -30,7 +30,7 @@ TARGET_DEVICES += ens202ext define Device/koala DEVICE_TITLE := OCEDO Koala BOARDNAME := KOALA - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct KERNEL_SIZE := 1536k IMAGE_SIZE := 7424k MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),1536k(kernel),5888k(rootfs),1536k(kernel2),5888k(rootfs2),1088k(data)ro,64k(id)ro,64k(art)ro,7424k@0x50000(firmware) diff --git a/target/linux/ar71xx/image/generic-tp-link.mk b/target/linux/ar71xx/image/generic-tp-link.mk index 3c0a89d2b8..39d3ab08fe 100644 --- a/target/linux/ar71xx/image/generic-tp-link.mk +++ b/target/linux/ar71xx/image/generic-tp-link.mk @@ -9,7 +9,7 @@ endef define Device/archer-c25-v1 $(Device/archer-cxx) DEVICE_TITLE := TP-LINK Archer C25 v1 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca9887 + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct BOARDNAME := ARCHER-C25-V1 TPLINK_BOARD_ID := ARCHER-C25-V1 DEVICE_PROFILE := ARCHERC25V1 @@ -22,7 +22,7 @@ TARGET_DEVICES += archer-c25-v1 define Device/archer-c58-v1 $(Device/archer-cxx) DEVICE_TITLE := TP-LINK Archer C58 v1 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca9888 + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct BOARDNAME := ARCHER-C58-V1 TPLINK_BOARD_ID := ARCHER-C58-V1 DEVICE_PROFILE := ARCHERC58V1 @@ -35,7 +35,7 @@ TARGET_DEVICES += archer-c58-v1 define Device/archer-c59-v1 $(Device/archer-cxx) DEVICE_TITLE := TP-LINK Archer C59 v1 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca9888 + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca9888-ct BOARDNAME := ARCHER-C59-V1 TPLINK_BOARD_ID := ARCHER-C59-V1 DEVICE_PROFILE := ARCHERC59V1 @@ -60,7 +60,7 @@ TARGET_DEVICES += archer-c59-v2 define Device/archer-c60-v1 $(Device/archer-cxx) DEVICE_TITLE := TP-LINK Archer C60 v1 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca9888 + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct BOARDNAME := ARCHER-C60-V1 TPLINK_BOARD_ID := ARCHER-C60-V1 DEVICE_PROFILE := ARCHERC60V1 @@ -85,7 +85,7 @@ TARGET_DEVICES += archer-c60-v2 define Device/archer-c5-v1 $(Device/tplink-16mlzma) DEVICE_TITLE := TP-LINK Archer C5 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 kmod-ath10k-ct ath10k-firmware-qca988x-ct BOARDNAME := ARCHER-C5 DEVICE_PROFILE := ARCHERC7 TPLINK_HWID := 0xc5000001 @@ -95,7 +95,7 @@ TARGET_DEVICES += archer-c5-v1 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 kmod-ath10k-ct ath10k-firmware-qca988x-ct BOARDNAME := ARCHER-C7 DEVICE_PROFILE := ARCHERC7 TPLINK_HWID := 0x75000001 @@ -105,7 +105,7 @@ TARGET_DEVICES += archer-c7-v1 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 kmod-ath10k-ct ath10k-firmware-qca988x-ct BOARDNAME := ARCHER-C7-V2 DEVICE_PROFILE := ARCHERC7 TPLINK_HWID := 0xc7000002 @@ -118,7 +118,7 @@ TARGET_DEVICES += archer-c7-v2 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 kmod-ath10k-ct ath10k-firmware-qca988x-ct BOARDNAME := ARCHER-C7-V2 DEVICE_PROFILE := ARCHERC7 TPLINK_HWID := 0xc7000002 @@ -129,7 +129,7 @@ TARGET_DEVICES += archer-c7-v2-il 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 kmod-ath10k-ct ath10k-firmware-qca988x-ct BOARDNAME := ARCHER-C7 DEVICE_PROFILE := ARCHERC7 TPLINK_HWID := 0x75000003 @@ -139,7 +139,7 @@ TARGET_DEVICES += tl-wdr7500-v3 define Device/archer-c7-v4 $(Device/archer-cxx) DEVICE_TITLE := TP-LINK Archer C7 v4 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct BOARDNAME := ARCHER-C7-V4 TPLINK_BOARD_ID := ARCHER-C7-V4 IMAGE_SIZE := 15104k @@ -232,7 +232,7 @@ TARGET_DEVICES += eap120-v1 define Device/re355-v1 $(Device/tplink-safeloader) DEVICE_TITLE := TP-LINK RE355 v1 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct MTDPARTS := spi0.0:128k(u-boot)ro,6016k(firmware),64k(partition-table)ro,64k(product-info)ro,1856k(config)ro,64k(art)ro IMAGE_SIZE := 7936k BOARDNAME := RE355 @@ -246,7 +246,7 @@ TARGET_DEVICES += re355-v1 define Device/re450-v1 $(Device/tplink-safeloader) DEVICE_TITLE := TP-LINK RE450 v1 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct MTDPARTS := spi0.0:128k(u-boot)ro,6016k(firmware),64k(partition-table)ro,64k(product-info)ro,1856k(config)ro,64k(art)ro IMAGE_SIZE := 7936k BOARDNAME := RE450 @@ -321,7 +321,7 @@ TARGET_DEVICES += tl-wdr4900-v2 define Device/tl-wdr6500-v2 $(Device/tplink-8mlzma) DEVICE_TITLE := TP-LINK TL-WDR6500 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 kmod-ath10k-ct ath10k-firmware-qca988x-ct KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | uImage lzma | tplink-v1-header BOARDNAME := TL-WDR6500-v2 @@ -341,7 +341,7 @@ TARGET_DEVICES += mw4530r-v1 define Device/tl-wpa8630-v1 $(Device/tplink-8mlzma) DEVICE_TITLE := TP-LINK TL-WPA8630 v1 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct BOARDNAME := TL-WPA8630 DEVICE_PROFILE := TL-WPA8630 TPLINK_HWID := 0x86300001 @@ -487,7 +487,7 @@ define Device/tl-wr902ac-v1 $(Device/tplink-safeloader) DEVICE_TITLE := TP-LINK TL-WR902AC v1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport \ - kmod-ath10k ath10k-firmware-qca9887 -swconfig -uboot-envtools + kmod-ath10k-ct ath10k-firmware-qca9887-ct -swconfig -uboot-envtools BOARDNAME := TL-WR902AC-V1 DEVICE_PROFILE := TLWR902 TPLINK_BOARD_ID := TL-WR902AC-V1 diff --git a/target/linux/ar71xx/image/generic-ubnt.mk b/target/linux/ar71xx/image/generic-ubnt.mk index 07c0295504..b9ce32bd3f 100644 --- a/target/linux/ar71xx/image/generic-ubnt.mk +++ b/target/linux/ar71xx/image/generic-ubnt.mk @@ -122,7 +122,7 @@ endef define Device/ubnt-unifiac-lite $(Device/ubnt-unifiac) DEVICE_TITLE := Ubiquiti UniFi AC-Lite - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct DEVICE_PROFILE += UBNTUNIFIACLITE BOARDNAME := UBNT-UF-AC-LITE endef @@ -137,7 +137,7 @@ TARGET_DEVICES += ubnt-unifiac-mesh define Device/ubnt-unifiac-pro $(Device/ubnt-unifiac) DEVICE_TITLE := Ubiquiti UniFi AC-Pro - DEVICE_PACKAGES += kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct DEVICE_PROFILE += UBNTUNIFIACPRO BOARDNAME := UBNT-UF-AC-PRO endef diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index 55963c5768..a0d5780461 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -199,7 +199,7 @@ TARGET_DEVICES += cf-e320n-v2 define Device/cf-e355ac-v1 DEVICE_TITLE := COMFAST CF-E355AC v1 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca988x \ + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct \ -swconfig -uboot-envtools BOARDNAME := CF-E355AC-V1 IMAGE_SIZE := 16192k @@ -210,7 +210,7 @@ TARGET_DEVICES += cf-e355ac-v1 define Device/cf-e355ac-v2 $(Device/cf-e355ac-v1) DEVICE_TITLE := COMFAST CF-E355AC v2 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca9888 \ + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca9888-ct \ -swconfig -uboot-envtools BOARDNAME := CF-E355AC-V2 endef @@ -218,7 +218,7 @@ TARGET_DEVICES += cf-e355ac-v2 define Device/cf-e375ac DEVICE_TITLE := COMFAST CF-E375AC - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca9888 \ + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca9888-ct \ -uboot-envtools BOARDNAME := CF-E375AC IMAGE_SIZE := 16000k @@ -228,7 +228,7 @@ TARGET_DEVICES += cf-e375ac define Device/cf-e380ac-v1 DEVICE_TITLE := COMFAST CF-E380AC v1 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca988x \ + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct \ -swconfig -uboot-envtools BOARDNAME := CF-E380AC-V1 IMAGE_SIZE := 16128k @@ -247,7 +247,7 @@ TARGET_DEVICES += cf-e380ac-v2 define Device/cf-e385ac DEVICE_TITLE := COMFAST CF-E385AC - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca9984 \ + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca9984-ct \ -uboot-envtools BOARDNAME := CF-E385AC IMAGE_SIZE := 16000k @@ -308,7 +308,7 @@ TARGET_DEVICES += dragino2 define Device/e1700ac-v2-16M DEVICE_TITLE := Qxwlan E1700AC v2 (16MB flash) - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x kmod-usb-core \ + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct kmod-usb-core \ kmod-usb2 kmod-usb-ledtrig-usbport BOARDNAME := E1700AC-V2 SUPPORTED_DEVICES := e1700ac-v2 @@ -366,7 +366,7 @@ TARGET_DEVICES += e600g-v2-8M define Device/e600gac-v2-16M DEVICE_TITLE := Qxwlan E600GAC v2 (16MB flash) - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca9887 kmod-usb-core \ + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-usb-core \ kmod-usb2 -swconfig BOARDNAME := E600GAC-V2 SUPPORTED_DEVICES := e600gac-v2 @@ -499,7 +499,7 @@ TARGET_DEVICES += gl-ar300m define Device/gl-ar750 DEVICE_TITLE := GL.iNet GL-AR750 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca9887 kmod-usb-core \ + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-usb-core \ kmod-usb2 kmod-usb-storage BOARDNAME := GL-AR750 SUPPORTED_DEVICES := gl-ar750 @@ -512,7 +512,7 @@ TARGET_DEVICES += gl-ar750 define Device/gl-ar750s DEVICE_TITLE := GL.iNet GL-AR750S - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca9887 kmod-usb-core \ + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-usb-core \ kmod-usb2 kmod-usb-storage BOARDNAME := GL-AR750S SUPPORTED_DEVICES := gl-ar750s @@ -868,7 +868,7 @@ TARGET_DEVICES += rut900 define Device/mc-mac1200r $(Device/tplink-8mlzma) DEVICE_TITLE := Mercury MAC1200R - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct BOARDNAME := MC-MAC1200R DEVICE_PROFILE := MAC1200R TPLINK_HWID := 0x12000001 @@ -899,7 +899,7 @@ TARGET_DEVICES += oolite-v1 define Device/oolite-v5.2 $(Device/tplink-16mlzma) DEVICE_TITLE := GainStrong Oolite V5.2 - DEVICE_PACKAGES := ath10k-firmware-qca9887 kmod-ath10k kmod-usb-core kmod-usb2 + DEVICE_PACKAGES := ath10k-firmware-qca9887-ct kmod-ath10k-ct kmod-usb-core kmod-usb2 BOARDNAME := OOLITE-V5-2 DEVICE_PROFILE := OOLITEV52 TPLINK_HWID := 0x3C00010B @@ -994,7 +994,7 @@ TARGET_DEVICES += som9331 define Device/sr3200 DEVICE_TITLE := YunCore SR3200 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct BOARDNAME := SR3200 IMAGE_SIZE := 16000k MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro @@ -1004,7 +1004,7 @@ TARGET_DEVICES += sr3200 define Device/xd3200 $(Device/sr3200) DEVICE_TITLE := YunCore XD3200 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct BOARDNAME := XD3200 endef TARGET_DEVICES += xd3200 @@ -1057,7 +1057,7 @@ TARGET_DEVICES += n5q 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 kmod-ath10k-ct ath10k-firmware-qca988x-ct BOARDNAME := NBG6616 KERNEL_SIZE := 2048k IMAGE_SIZE := 15323k @@ -1143,7 +1143,7 @@ endef define Device/dir-869-a1 $(Device/seama) DEVICE_TITLE := D-Link DIR-869 rev. A1 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct 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 @@ -1180,7 +1180,7 @@ TARGET_DEVICES += mynet-n750 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 kmod-ath10k-ct ath10k-firmware-qca988x-ct 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) @@ -1202,7 +1202,7 @@ TARGET_DEVICES += dap-1330-a1 define Device/dap-2695-a1 DEVICE_TITLE := D-Link DAP-2695 rev. A1 - DEVICE_PACKAGES := ath10k-firmware-qca988x kmod-ath10k + DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct BOARDNAME := DAP-2695-A1 IMAGES := factory.img sysupgrade.bin IMAGE_SIZE := 15360k @@ -1243,7 +1243,7 @@ TARGET_DEVICES += wifi-pineapple-nano define Device/wlr8100 DEVICE_TITLE := Sitecom WLR-8100 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-usb3 \ - kmod-ath10k ath10k-firmware-qca988x + kmod-ath10k-ct ath10k-firmware-qca988x-ct BOARDNAME := WLR8100 IMAGE_SIZE := 15424k MTDPARTS := spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,15424k(firmware),256k(manufacture)ro,64k(backup)ro,320k(storage)ro,64k(art)ro diff --git a/target/linux/ar71xx/image/mikrotik.mk b/target/linux/ar71xx/image/mikrotik.mk index afef8f7618..8f9234901a 100644 --- a/target/linux/ar71xx/image/mikrotik.mk +++ b/target/linux/ar71xx/image/mikrotik.mk @@ -35,7 +35,7 @@ define Device/nand-large-ac $(Device/mikrotik-nand) MIKROTIK_CHUNKSIZE := 2048 DEVICE_TITLE := MikroTik RouterBoard (>= 128 MB NAND, 802.11ac) - DEVICE_PACKAGES += kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct SUPPORTED_DEVICES := rb-921gs-5hpacd-r2 endef TARGET_DEVICES += nand-large-ac @@ -55,7 +55,7 @@ TARGET_DEVICES += rb-nor-flash-16M define Device/rb-nor-flash-16M-ac $(Device/rb-nor-flash-16M) DEVICE_TITLE := MikroTik RouterBoard (16 MB SPI NOR, 802.11ac) - DEVICE_PACKAGES += kmod-ath10k ath10k-firmware-qca988x ath10k-firmware-qca9887 kmod-usb-ehci + DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct ath10k-firmware-qca9887-ct kmod-usb-ehci SUPPORTED_DEVICES += rb-wapg-5hact2hnd endef TARGET_DEVICES += rb-nor-flash-16M-ac diff --git a/target/linux/ar71xx/image/nand.mk b/target/linux/ar71xx/image/nand.mk index ba9e1ba622..96365e6529 100644 --- a/target/linux/ar71xx/image/nand.mk +++ b/target/linux/ar71xx/image/nand.mk @@ -31,7 +31,7 @@ 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 + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct BOARDNAME := DW33D IMAGE_SIZE := 16000k 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 @@ -87,7 +87,7 @@ TARGET_DEVICES += rambutan define Device/wi2a-ac200i SUPPORTED_DEVICES = $(1) DEVICE_TITLE := Nokia WI2A-AC200i - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath9k kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct BOARDNAME := WI2A-AC200i BLOCKSIZE := 64k KERNEL_SIZE := 3648k @@ -114,7 +114,7 @@ TARGET_DEVICES += z1 define LegacyDevice/R6100 DEVICE_TITLE := NETGEAR R6100 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport endef LEGACY_DEVICES += R6100 @@ -132,6 +132,6 @@ LEGACY_DEVICES += WNDR4300V1 define LegacyDevice/NBG6716 DEVICE_TITLE := Zyxel NBG 6716 - DEVICE_PACKAGES := kmod-rtc-pcf8563 kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-rtc-pcf8563 kmod-ath10k-ct ath10k-firmware-qca988x-ct endef LEGACY_DEVICES += NBG6716 diff --git a/target/linux/ar71xx/image/tiny-legacy-devices.mk b/target/linux/ar71xx/image/tiny-legacy-devices.mk index ab8205fefd..bcf77de443 100644 --- a/target/linux/ar71xx/image/tiny-legacy-devices.mk +++ b/target/linux/ar71xx/image/tiny-legacy-devices.mk @@ -1,7 +1,7 @@ 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 + kmod-ath10k-ct ath10k-firmware-qca988x-ct endef LEGACY_DEVICES += F9K1115V2 -- cgit v1.2.3