From 099db68667ebde4a71d58e44048208019abb8f71 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sat, 18 Apr 2020 11:40:34 +0800 Subject: [PATCH] ipq40xx: switch to ath10k --- target/linux/ipq40xx/Makefile | 6 +++--- target/linux/ipq40xx/image/Makefile | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile index 6803e92073..7e9176c3c0 100644 --- a/target/linux/ipq40xx/Makefile +++ b/target/linux/ipq40xx/Makefile @@ -9,7 +9,7 @@ CPU_SUBTYPE:=neon-vfpv4 MAINTAINER:=John Crispin # TODO: drop kmod-usb-dwc3-of-simple when migrating to 4.19 -KERNEL_PATCHVER:=4.19 +KERNEL_PATCHVER:=4.14 KERNELNAME:=zImage Image dtbs @@ -17,8 +17,8 @@ include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += \ kmod-usb-dwc3-of-simple kmod-usb-dwc3-qcom \ kmod-leds-gpio kmod-gpio-button-hotplug swconfig \ - kmod-ath10k-ct wpad-openssl \ - kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019-ct \ + kmod-ath10k wpad-openssl \ + kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019 \ automount autosamba luci-app-ipsec-vpnd v2ray shadowsocks-libev-ss-redir shadowsocksr-libev-server luci-app-music-remote-center \ luci-app-unblockmusic luci-app-cpufreq luci-app-zerotier ca-certificates lm-sensors kmod-fs-cifs kmod-nls-utf8 \ htop fdisk e2fsprogs diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index ee8001788c..107e0d250a 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -119,7 +119,7 @@ define Device/asus_map-ac2200 DEVICE_MODEL := Lyra (MAP-AC2200) DEVICE_DTS := qcom-ipq4019-map-ac2200 IMAGES := sysupgrade.bin - DEVICE_PACKAGES := ath10k-firmware-qca9888-ct kmod-ath3k + DEVICE_PACKAGES := ath10k-firmware-qca9888 kmod-ath3k endef TARGET_DEVICES += asus_map-ac2200 @@ -142,8 +142,8 @@ define Device/asus_rt-ac58u KERNEL_INITRAMFS := $$(KERNEL) | uImage none KERNEL_INITRAMFS_SUFFIX := -factory.trx IMAGES := sysupgrade.bin - DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers \ - kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := -kmod-ath10k -ath10k-firmware-qca4019 \ + kmod-ath10k-ct-smallbuffers ath10k-firmware-qca4019-ct kmod-usb-ledtrig-usbport endef TARGET_DEVICES += asus_rt-ac58u @@ -375,7 +375,7 @@ define Device/meraki_mr33 BLOCKSIZE := 128k PAGESIZE := 2048 IMAGES = sysupgrade.bin - DEVICE_PACKAGES := -swconfig ath10k-firmware-qca9887-ct + DEVICE_PACKAGES := -swconfig ath10k-firmware-qca9887 endef TARGET_DEVICES += meraki_mr33 @@ -444,7 +444,7 @@ define Device/openmesh_a62 IMAGES = factory.bin sysupgrade.bin IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=A62 IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata - DEVICE_PACKAGES := ath10k-firmware-qca9888-ct uboot-envtools + DEVICE_PACKAGES := ath10k-firmware-qca9888 uboot-envtools endef TARGET_DEVICES += openmesh_a62 @@ -563,7 +563,8 @@ define Device/zyxel_wre6606 DEVICE_DTS_CONFIG := config@4 IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata - DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers + DEVICE_PACKAGES := -kmod-ath10k -ath10k-firmware-qca4019 \ + kmod-ath10k-ct-smallbuffers ath10k-firmware-qca4019-ct endef TARGET_DEVICES += zyxel_wre6606