diff options
| author | Sven Eckelmann <sven.eckelmann@openmesh.com> | 2018-04-19 09:12:22 +0200 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2018-04-23 22:07:22 +0200 |
| commit | 856f0d5d0d9bd3248cee136cea90749a80d5b3d9 (patch) | |
| tree | 4baa3602fae212bc069cbc51597bca85585d18ee /target | |
| parent | 23894524a57f7d714f2c23aa3475e3c6fe85d7e3 (diff) | |
| download | upstream-856f0d5d0d9bd3248cee136cea90749a80d5b3d9.tar.gz upstream-856f0d5d0d9bd3248cee136cea90749a80d5b3d9.tar.bz2 upstream-856f0d5d0d9bd3248cee136cea90749a80d5b3d9.zip | |
ipq40xx: use upstream board-2.bin
The BDFs for all boards were upstreamed to the ath10k-firmware
repository and are now part of ath10k-firmware 2018-04-19.
Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
Diffstat (limited to 'target')
5 files changed, 11 insertions, 10 deletions
diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts index 3768cd87b9..6ebac16c94 100644 --- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts +++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts @@ -84,10 +84,12 @@ wifi@a000000 { status = "okay"; + qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040"; }; wifi@a800000 { status = "okay"; + qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040"; }; watchdog@b017000 { diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts index e0bb968f5b..d988275564 100644 --- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts +++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts @@ -89,12 +89,12 @@ wifi@a000000 { status = "okay"; - qcom,ath10k-calibration-variant = "ASUS-RT-AC58U"; + qcom,ath10k-calibration-variant = "RT-AC58U"; }; wifi@a800000 { status = "okay"; - qcom,ath10k-calibration-variant = "ASUS-RT-AC58U"; + qcom,ath10k-calibration-variant = "RT-AC58U"; }; watchdog@b017000 { diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts index b55d9453bf..d7cc5580b8 100644 --- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts +++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts @@ -262,8 +262,10 @@ &wifi0 { status = "okay"; + qcom,ath10k-calibration-variant = "GL-B1300"; }; &wifi1 { status = "okay"; + qcom,ath10k-calibration-variant = "GL-B1300"; }; diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-mr33.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-mr33.dts index 8bbfb0ba0b..0be1960655 100644 --- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-mr33.dts +++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-mr33.dts @@ -372,10 +372,10 @@ &wifi0 { status = "okay"; - /* qcom,ath10k-calibration-variant = "MERAKI-MR33"; */ + qcom,ath10k-calibration-variant = "Meraki-MR33"; }; &wifi1 { status = "okay"; - /* qcom,ath10k-calibration-variant = "MERAKI-MR33"; */ + qcom,ath10k-calibration-variant = "Meraki-MR33"; }; diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index b305ea0960..558f5529a7 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -51,7 +51,6 @@ define Device/8dev_jalapeno BLOCKSIZE := 128k PAGESIZE := 2048 DEVICE_TITLE := 8devices Jalapeno - DEVICE_PACKAGES := ipq-wifi-8dev_jalapeno endef TARGET_DEVICES += 8dev_jalapeno @@ -71,7 +70,7 @@ define Device/asus_rt-ac58u # string and call it a day.... Yeah, we do the latter! UIMAGE_NAME:=$(shell echo -e '\03\01\01\01RT-AC58U') IMAGES := sysupgrade.bin - DEVICE_PACKAGES := ipq-wifi-asus_rt-ac58u kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := kmod-usb-ledtrig-usbport endef TARGET_DEVICES += asus_rt-ac58u @@ -83,7 +82,7 @@ define Device/avm_fritzbox-4040 IMAGE_SIZE := 29753344 IMAGES = sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata - DEVICE_PACKAGES := ipq-wifi-avm_fritzbox-4040 fritz-tffs fritz-caldata u-boot-fritz4040 + DEVICE_PACKAGES := fritz-tffs fritz-caldata u-boot-fritz4040 endef TARGET_DEVICES += avm_fritzbox-4040 @@ -110,7 +109,6 @@ define Device/glinet_gl-b1300 IMAGE_SIZE := 26624k IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel |append-rootfs | pad-rootfs | append-metadata - DEVICE_PACKAGES := ipq-wifi-glinet_gl-b1300 endef TARGET_DEVICES += glinet_gl-b1300 @@ -121,7 +119,7 @@ define Device/meraki_mr33 PAGESIZE := 2048 DEVICE_TITLE := Cisco Meraki MR33 IMAGES = sysupgrade.bin - DEVICE_PACKAGES := -swconfig ipq-wifi-meraki_mr33 ath10k-firmware-qca9887 + DEVICE_PACKAGES := -swconfig ath10k-firmware-qca9887 endef TARGET_DEVICES += meraki_mr33 @@ -129,7 +127,6 @@ define Device/netgear_ex61x0v2 $(call Device/DniImage) KERNEL_SIZE := 3080192 DEVICE_DTS_CONFIG := config@4 - DEVICE_PACKAGES := ipq-wifi-netgear_ex61x0v2 NETGEAR_BOARD_ID := EX6150v2series NETGEAR_HW_ID := 29765285+16+0+128+2x2 endef |