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 --- target/linux/ath79/image/generic-tp-link.mk | 6 +++--- target/linux/ath79/image/generic-ubnt.mk | 2 +- target/linux/ath79/image/generic.mk | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'target/linux/ath79/image') diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index 926c3cb618..a9485c457e 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -4,7 +4,7 @@ define Device/tplink_archer-c7-v1 $(Device/tplink-8mlzma) ATH_SOC := qca9558 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 TPLINK_HWID := 0x75000001 endef TARGET_DEVICES += tplink_archer-c7-v1 @@ -13,7 +13,7 @@ define Device/tplink_archer-c7-v2 $(Device/tplink-16mlzma) ATH_SOC := qca9558 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 TPLINK_HWID := 0xc7000002 IMAGES := sysupgrade.bin factory.bin factory-us.bin factory-eu.bin IMAGE/factory-us.bin := append-rootfs | mktplinkfw factory -C US @@ -26,7 +26,7 @@ define Device/tplink_re450-v2 ATH_SOC := qca9563 IMAGE_SIZE := 6016k DEVICE_TITLE := TP-LINK RE450 v2 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct TPLINK_HWID := 0x0 TPLINK_HWREV := 0 TPLINK_BOARD_ID := RE450-V2 diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index d9411c6c2f..4ef9f8de3d 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -85,7 +85,7 @@ define Device/ubnt_unifiac IMAGE_SIZE := 7744k IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct endef diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index e968dcf92c..2727fb6ca1 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -161,7 +161,7 @@ define Device/iodata_wn-ac1167dgr IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ senao-header -r 0x30a -p 0x61 -t 2 - 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 TARGET_DEVICES += iodata_wn-ac1167dgr @@ -173,14 +173,14 @@ define Device/iodata_wn-ac1600dgr2 IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | \ senao-header -r 0x30a -p 0x60 -t 2 -v 200 - 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 TARGET_DEVICES += iodata_wn-ac1600dgr2 define Device/ocedo_koala ATH_SOC := qca9558 DEVICE_TITLE := OCEDO Koala - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct SUPPORTED_DEVICES += koala IMAGE_SIZE := 7424k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) @@ -198,7 +198,7 @@ TARGET_DEVICES += ocedo_raccoon define Device/openmesh_om5p-ac-v2 ATH_SOC := qca9558 DEVICE_TITLE := OpenMesh OM5P-AC v2 - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x om-watchdog + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct om-watchdog IMAGE_SIZE := 7808k SUPPORTED_DEVICES += om5p-acv2 endef @@ -295,7 +295,7 @@ define Device/phicomm_k2t IMAGES := sysupgrade.bin IMAGE/default := append-kernel | append-rootfs | pad-rootfs IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) - DEVICE_PACKAGES := kmod-leds-reset kmod-ath10k ath10k-firmware-qca9888 + DEVICE_PACKAGES := kmod-leds-reset kmod-ath10k-ct ath10k-firmware-qca9888-ct endef TARGET_DEVICES += phicomm_k2t -- cgit v1.2.3