From f1e085adfe53d11956aaa91fcc5d8eebb2ad0b7e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 22 Jul 2016 15:57:49 +0200 Subject: [PATCH] ar71xx: add ath10k firmware to profile defaults where ath10k is used Signed-off-by: Felix Fietkau --- target/linux/ar71xx/image/generic.mk | 6 +-- target/linux/ar71xx/image/legacy-devices.mk | 48 ++++++++++----------- target/linux/ar71xx/image/nand.mk | 2 +- target/linux/ar71xx/image/tp-link.mk | 10 ++--- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index b417a3fb15..cb57dba986 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -300,7 +300,7 @@ TARGET_DEVICES += rnx-n360rt define Device/mc-mac1200r $(Device/tplink-8mlzma) DEVICE_TITLE := MERCURY MAC1200R - DEVICE_PACKAGES := kmod-ath10k + DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x BOARDNAME := MC-MAC1200R DEVICE_PROFILE := MAC1200R TPLINK_HWID := 0x12000001 @@ -392,7 +392,7 @@ TARGET_DEVICES += oolite define Device/NBG6616 DEVICE_TITLE := ZyXEL NBG6616 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-usb-storage kmod-rtc-pcf8563 kmod-ath10k + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-usb-storage kmod-rtc-pcf8563 kmod-ath10k ath10k-firmware-qca988x BOARDNAME = NBG6616 KERNEL_SIZE = 2048k IMAGE_SIZE = 15323k @@ -534,7 +534,7 @@ endef define Device/qihoo-c301 $(Device/seama) DEVICE_TITLE := Qihoo C301 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k ath10k-firmware-qca988x 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) diff --git a/target/linux/ar71xx/image/legacy-devices.mk b/target/linux/ar71xx/image/legacy-devices.mk index 8257b13529..477b3039c7 100644 --- a/target/linux/ar71xx/image/legacy-devices.mk +++ b/target/linux/ar71xx/image/legacy-devices.mk @@ -118,7 +118,7 @@ LEGACY_DEVICES += AP81 define LegacyDevice/AP83 DEVICE_TITLE := Atheros AP83 reference board DEVICE_PACKAGES := kmod-usb-core kmod-usb2 \ - vsc7385-ucode-ap83 vsc7395-ucode-ap83 + vsc7385-ucode-ap83 vsc7395-ucode-ap83 endef LEGACY_DEVICES += AP83 @@ -143,7 +143,7 @@ LEGACY_DEVICES += PB42 define LegacyDevice/PB44 DEVICE_TITLE := Atheros PB44 reference board DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \ - vsc7385-ucode-pb44 vsc7395-ucode-pb44 + vsc7385-ucode-pb44 vsc7395-ucode-pb44 endef LEGACY_DEVICES += PB44 @@ -161,7 +161,7 @@ LEGACY_DEVICES += A02RBW300N define LegacyDevice/F9K1115V2 DEVICE_TITLE := Belkin AC1750DB (F9K1115V2) DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb3 kmod-ledtrig-usbdev \ - kmod-ath10k + kmod-ath10k ath10k-firmware-qca988x endef LEGACY_DEVICES += F9K1115V2 @@ -263,28 +263,28 @@ LEGACY_DEVICES += WPJ558 define LegacyDevice/dLAN_Hotspot DEVICE_TITLE := devolo dLAN Hotspot DEVICE_PACKAGES := open-plc-utils open-plc-utils-chkpib open-plc-utils-getpib open-plc-utils-modpib \ - open-plc-utils-setpib open-plc-utils-hpavkey open-plc-utils-plchost \ - open-plc-utils-plctool open-plc-utils-pibdump open-plc-utils-plcstat \ - ebtables hostapd-utils wifitoggle wpad + open-plc-utils-setpib open-plc-utils-hpavkey open-plc-utils-plchost \ + open-plc-utils-plctool open-plc-utils-pibdump open-plc-utils-plcstat \ + ebtables hostapd-utils wifitoggle wpad endef LEGACY_DEVICES += dLAN_Hotspot define LegacyDevice/dLAN_pro_500_wp DEVICE_TITLE := devolo dLAN pro 500 Wireless+ DEVICE_PACKAGES := open-plc-utils open-plc-utils-chkpib open-plc-utils-getpib open-plc-utils-modpib \ - open-plc-utils-setpib open-plc-utils-hpavkey open-plc-utils-amphost \ - open-plc-utils-plctool open-plc-utils-pibdump open-plc-utils-plcstat \ - ebtables hostapd-utils wifitoggle wpad + open-plc-utils-setpib open-plc-utils-hpavkey open-plc-utils-amphost \ + open-plc-utils-plctool open-plc-utils-pibdump open-plc-utils-plcstat \ + ebtables hostapd-utils wifitoggle wpad endef LEGACY_DEVICES += dLAN_pro_500_wp define LegacyDevice/dLAN_pro_1200_ac DEVICE_TITLE := devolo dLAN pro 1200+ WiFi ac DEVICE_PACKAGES := open-plc-utils open-plc-utils-chkpib open-plc-utils-getpib open-plc-utils-modpib \ - open-plc-utils-setpib open-plc-utils-hpavkey open-plc-utils-plchost \ - open-plc-utils-plctool open-plc-utils-pibdump open-plc-utils-plcstat \ - ebtables hostapd-utils wifitoggle wpad ip-full kmod-ath10k kmod-leds-gpio \ - kmod-ledtrig-gpio + open-plc-utils-setpib open-plc-utils-hpavkey open-plc-utils-plchost \ + open-plc-utils-plctool open-plc-utils-pibdump open-plc-utils-plcstat \ + ebtables hostapd-utils wifitoggle wpad ip-full kmod-ath10k ath10k-firmware-qca988x \ + kmod-leds-gpio kmod-ledtrig-gpio endef LEGACY_DEVICES += dLAN_pro_1200_ac @@ -360,7 +360,7 @@ LEGACY_DEVICES += DIR835A1 define LegacyDevice/DGL5500A1 DEVICE_TITLE := D-Link DGL-5500 rev. A1 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca988x endef LEGACY_DEVICES += DGL5500A1 @@ -382,22 +382,22 @@ endef LEGACY_DEVICES += ESR900 define LegacyDevice/ESR1750 - DEVICE_TITLE := EnGenius ESR1750 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-ath10k wpad-mini + DEVICE_TITLE := EnGenius ESR1750 + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-ath10k ath10k-firmware-qca988x endef LEGACY_DEVICES += ESR1750 define LegacyDevice/EPG5000 - DEVICE_TITLE := EnGenius EPG5000 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-ath10k wpad-mini + DEVICE_TITLE := EnGenius EPG5000 + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-ath10k ath10k-firmware-qca988x endef LEGACY_DEVICES += EPG5000 define LegacyDevice/EWDORIN DEVICE_TITLE := Embedded Wireless Dorin Platform DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev kmod-usb-storage \ - kmod-fs-vfat kmod-fs-msdos kmod-fs-ntfs kmod-fs-ext4 \ - kmod-nls-cp437 kmod-nls-cp850 kmod-nls-cp852 kmod-nls-iso8859-1 kmod-nls-utf8 + kmod-fs-vfat kmod-fs-msdos kmod-fs-ntfs kmod-fs-ext4 \ + kmod-nls-cp437 kmod-nls-cp850 kmod-nls-cp852 kmod-nls-iso8859-1 kmod-nls-utf8 endef LEGACY_DEVICES += EWDORIN @@ -492,7 +492,7 @@ LEGACY_DEVICES += OM5P define LegacyDevice/OM5PAC DEVICE_TITLE := OpenMesh OM5P-AC/OM5P-ACv2 - DEVICE_PACKAGES := kmod-ath9k kmod-ath10k om-watchdog + DEVICE_PACKAGES := kmod-ath9k kmod-ath10k ath10k-firmware-qca988x om-watchdog endef LEGACY_DEVICES += OM5PAC @@ -510,13 +510,13 @@ LEGACY_DEVICES += MR900 define LegacyDevice/MR1750 DEVICE_TITLE := OpenMesh MR1750/MR1750v2 - DEVICE_PACKAGES := kmod-ath9k kmod-ath10k + DEVICE_PACKAGES := kmod-ath9k kmod-ath10k ath10k-firmware-qca988x endef LEGACY_DEVICES += MR1750 define LegacyDevice/OPENMESH DEVICE_TITLE := OpenMesh products - DEVICE_PACKAGES := kmod-ath9k kmod-ath10k om-watchdog + DEVICE_PACKAGES := kmod-ath9k kmod-ath10k ath10k-firmware-qca988x om-watchdog endef LEGACY_DEVICES += OPENMESH @@ -593,7 +593,7 @@ LEGACY_DEVICES += TEW732BR define LegacyDevice/TEW823DRU DEVICE_TITLE := TRENDNet TEW-823DRU - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca988x endef LEGACY_DEVICES += TEW823DRU diff --git a/target/linux/ar71xx/image/nand.mk b/target/linux/ar71xx/image/nand.mk index 549b2c99c3..1aa8541587 100644 --- a/target/linux/ar71xx/image/nand.mk +++ b/target/linux/ar71xx/image/nand.mk @@ -40,6 +40,6 @@ LEGACY_DEVICES += WNDR4300V1 define LegacyDevice/NBG6716 DEVICE_TITLE := Zyxel NBG 6716 - DEVICE_PACKAGES := kmod-rtc-pcf8563 kmod-ath10k + 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 ccb1f5bfac..f93eec64f8 100644 --- a/target/linux/ar71xx/image/tp-link.mk +++ b/target/linux/ar71xx/image/tp-link.mk @@ -153,7 +153,7 @@ TARGET_DEVICES += tl-wdr3500-v1 tl-wdr3600-v1 tl-wdr4300-v1 tl-wdr4300-v1-il tl- define Device/tl-wdr6500-v2 $(Device/tplink-8mlzma) DEVICE_TITLE := TP-LINK TL-WDR6500v2 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k ath10k-firmware-qca988x KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | uImage lzma | mktplinkfw-initramfs BOARDNAME = TL-WDR6500-v2 @@ -177,7 +177,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-ledtrig-usbdev kmod-ath10k + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k ath10k-firmware-qca988x BOARDNAME := ARCHER-C5 DEVICE_PROFILE := ARCHERC7 TPLINK_HWID := 0xc5000001 @@ -186,7 +186,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-ledtrig-usbdev kmod-ath10k + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k ath10k-firmware-qca988x BOARDNAME := ARCHER-C7 DEVICE_PROFILE := ARCHERC7 TPLINK_HWID := 0x75000001 @@ -195,7 +195,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-ledtrig-usbdev kmod-ath10k + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k ath10k-firmware-qca988x BOARDNAME := ARCHER-C7-V2 DEVICE_PROFILE := ARCHERC7 TPLINK_HWID := 0xc7000002 @@ -205,7 +205,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-ledtrig-usbdev kmod-ath10k + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k ath10k-firmware-qca988x BOARDNAME := ARCHER-C7 DEVICE_PROFILE := ARCHERC7 TPLINK_HWID := 0x75000003 -- 2.25.1