diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile index 1cf945b9b..46e36482b 100644 --- a/target/linux/ipq40xx/Makefile +++ b/target/linux/ipq40xx/Makefile @@ -19,6 +19,6 @@ DEFAULT_PACKAGES += \ kmod-leds-gpio kmod-gpio-button-hotplug swconfig \ kmod-ath10k wpad \ kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019 \ - automount autosamba luci-app-ipsec-vpnd luci-app-xlnetacc + automount autosamba luci-app-ipsec-vpnd luci-app-xlnetacc v2ray shadowsocks-libev-ss-redir shadowsocksr-libev-server $(eval $(call BuildTarget)) diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile index 966b9f46b..cd44f76e2 100644 --- a/target/linux/ipq806x/Makefile +++ b/target/linux/ipq806x/Makefile @@ -10,7 +10,7 @@ CPU_TYPE:=cortex-a15 CPU_SUBTYPE:=neon-vfpv4 MAINTAINER:=John Crispin -KERNEL_PATCHVER:=4.19 +KERNEL_PATCHVER:=4.14 KERNELNAME:=zImage Image dtbs @@ -23,7 +23,8 @@ DEFAULT_PACKAGES += \ kmod-ata-core kmod-ata-ahci kmod-ata-ahci-platform \ kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ kmod-usb3 kmod-usb-dwc3-of-simple kmod-usb-phy-qcom-dwc3 \ - kmod-ath10k-ct wpad-basic \ - uboot-envtools + kmod-ath10k wpad \ + uboot-envtools \ + automount autosamba luci-app-ipsec-vpnd luci-app-xlnetacc v2ray shadowsocks-libev-ss-redir shadowsocksr-libev-server $(eval $(call BuildTarget)) diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index e1eb090de..b3f4ca76f 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -90,7 +90,7 @@ define Device/buffalo_wxr-2533dhp IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-rootfs | buffalo-rootfs-cksum | \ sysupgrade-tar rootfs=$$$$@ | append-metadata - DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct + DEVICE_PACKAGES := ath10k-firmware-qca99x0 endef TARGET_DEVICES += buffalo_wxr-2533dhp @@ -118,7 +118,7 @@ define Device/linksys_ea8500 IMAGES := factory.bin sysupgrade.bin IMAGE/factory.bin := append-kernel | pad-to $$$${KERNEL_SIZE} | append-ubi DEVICE_TITLE := Linksys EA8500 - DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct + DEVICE_PACKAGES := ath10k-firmware-qca99x0 endef TARGET_DEVICES += linksys_ea8500 @@ -130,7 +130,7 @@ define Device/nec_wg2600hp DEVICE_TITLE := NEC Aterm WG2600HP IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata - DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct + DEVICE_PACKAGES := ath10k-firmware-qca99x0 endef TARGET_DEVICES += nec_wg2600hp @@ -145,7 +145,7 @@ define Device/netgear_d7800 BOARD_NAME := d7800 SUPPORTED_DEVICES += d7800 DEVICE_TITLE := Netgear Nighthawk X4 D7800 - DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct + DEVICE_PACKAGES := ath10k-firmware-qca99x0 endef TARGET_DEVICES += netgear_d7800 @@ -160,7 +160,7 @@ define Device/netgear_r7500 BOARD_NAME := r7500 SUPPORTED_DEVICES += r7500 DEVICE_TITLE := Netgear Nighthawk X4 R7500 - DEVICE_PACKAGES := ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := ath10k-firmware-qca988x endef TARGET_DEVICES += netgear_r7500 @@ -175,7 +175,7 @@ define Device/netgear_r7500v2 BOARD_NAME := r7500v2 SUPPORTED_DEVICES += r7500v2 DEVICE_TITLE := Netgear Nighthawk X4 R7500v2 - DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := ath10k-firmware-qca99x0 ath10k-firmware-qca988x endef TARGET_DEVICES += netgear_r7500v2 @@ -190,7 +190,7 @@ define Device/netgear_r7800 BOARD_NAME := r7800 SUPPORTED_DEVICES += r7800 DEVICE_TITLE := Netgear Nighthawk X4S R7800 - DEVICE_PACKAGES := ath10k-firmware-qca9984-ct + DEVICE_PACKAGES := ath10k-firmware-qca9984 endef TARGET_DEVICES += netgear_r7800 @@ -204,7 +204,7 @@ define Device/qcom_ipq8064-ap148 BOARD_NAME := ap148 SUPPORTED_DEVICES += ap148 DEVICE_TITLE := Qualcomm AP148 - DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct + DEVICE_PACKAGES := ath10k-firmware-qca99x0 endef TARGET_DEVICES += qcom_ipq8064-ap148 @@ -217,7 +217,7 @@ define Device/qcom_ipq8064-ap148-legacy BOARD_NAME := ap148 SUPPORTED_DEVICES := qcom,ipq8064-ap148 ap148 DEVICE_TITLE := Qualcomm AP148 (legacy) - DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct + DEVICE_PACKAGES := ath10k-firmware-qca99x0 endef TARGET_DEVICES += qcom_ipq8064-ap148-legacy @@ -230,7 +230,7 @@ define Device/qcom_ipq8064-ap161 PAGESIZE := 2048 BOARD_NAME := ap161 DEVICE_TITLE := Qualcomm AP161 - DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct + DEVICE_PACKAGES := ath10k-firmware-qca99x0 endef TARGET_DEVICES += qcom_ipq8064-ap161 @@ -240,7 +240,7 @@ define Device/qcom_ipq8064-db149 KERNEL_INSTALL := 1 BOARD_NAME := db149 DEVICE_TITLE := Qualcomm DB149 - DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct + DEVICE_PACKAGES := ath10k-firmware-qca99x0 endef TARGET_DEVICES += qcom_ipq8064-db149 @@ -253,7 +253,7 @@ define Device/tplink_c2600 SUPPORTED_DEVICES += c2600 TPLINK_BOARD_ID := C2600 DEVICE_TITLE := TP-Link Archer C2600 - DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct + DEVICE_PACKAGES := ath10k-firmware-qca99x0 endef TARGET_DEVICES += tplink_c2600 @@ -268,7 +268,7 @@ define Device/tplink_vr2600v BOARD_NAME := vr2600v SUPPORTED_DEVICES += vr2600v DEVICE_TITLE := TP-Link Archer VR2600v - DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct + DEVICE_PACKAGES := ath10k-firmware-qca99x0 IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := pad-extra 512 | append-kernel | pad-to $$$${KERNEL_SIZE} | append-rootfs | pad-rootfs | append-metadata endef @@ -284,7 +284,7 @@ define Device/zyxel_nbg6817 RAS_VERSION := "V1.99(OWRT.9999)C0" SUPPORTED_DEVICES += nbg6817 DEVICE_TITLE := ZyXEL NBG6817 - DEVICE_PACKAGES := ath10k-firmware-qca9984-ct e2fsprogs kmod-fs-ext4 losetup + DEVICE_PACKAGES := ath10k-firmware-qca9984 e2fsprogs kmod-fs-ext4 losetup $(call Device/ZyXELImage) endef TARGET_DEVICES += zyxel_nbg6817