aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2018-04-12 20:48:35 +0200
committerMathias Kresin <dev@kresin.me>2018-04-13 07:48:19 +0200
commitfb528b1674b221f9d46ab24d1e9ab9ee0f54a66c (patch)
tree1be2fb3b098095ab02e5021a9960d84bf3f031e5 /target
parent970f1914be3f299fb302ca74a214589397000858 (diff)
downloadupstream-fb528b1674b221f9d46ab24d1e9ab9ee0f54a66c.tar.gz
upstream-fb528b1674b221f9d46ab24d1e9ab9ee0f54a66c.tar.bz2
upstream-fb528b1674b221f9d46ab24d1e9ab9ee0f54a66c.zip
ipq40xx: unbundle firmware and board file
Don't select the firmware with the board file, it prevents an easy use of the -ct ath10k firmware. Select the firmware within the default packages instead. Remove the per device selection of the firmware now that it the firmware is selected by default. Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target')
-rw-r--r--target/linux/ipq40xx/Makefile1
-rw-r--r--target/linux/ipq40xx/image/Makefile9
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile
index e5bbdf40c2..ef7c0f56c5 100644
--- a/target/linux/ipq40xx/Makefile
+++ b/target/linux/ipq40xx/Makefile
@@ -17,5 +17,6 @@ DEFAULT_PACKAGES += \
kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
kmod-ath10k wpad-mini \
kmod-usb3 kmod-usb-dwc3-of-simple kmod-usb-phy-qcom-dwc3 \
+ ath10k-firmware-qca4019
$(eval $(call BuildTarget))
diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile
index c13516e6dc..058cab3399 100644
--- a/target/linux/ipq40xx/image/Makefile
+++ b/target/linux/ipq40xx/image/Makefile
@@ -51,7 +51,7 @@ define Device/8dev_jalapeno
BLOCKSIZE := 128k
PAGESIZE := 2048
DEVICE_TITLE := 8devices Jalapeno
- DEVICE_PACKAGES := ath10k-firmware-qca4019 ipq-wifi-8dev_jalapeno
+ DEVICE_PACKAGES := ipq-wifi-8dev_jalapeno
endef
TARGET_DEVICES += 8dev_jalapeno
@@ -97,7 +97,7 @@ define Device/compex_wpj428
KERNEL_SIZE := 4096k
IMAGES = sysupgrade.bin
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
- DEVICE_PACKAGES := ath10k-firmware-qca4019 kmod-gpio-beeper
+ DEVICE_PACKAGES := kmod-gpio-beeper
endef
TARGET_DEVICES += compex_wpj428
@@ -129,7 +129,7 @@ define Device/netgear_ex61x0v2
$(call Device/DniImage)
KERNEL_SIZE := 3080192
DEVICE_DTS_CONFIG := config@4
- DEVICE_PACKAGES := ath10k-firmware-qca4019 ipq-wifi-netgear_ex61x0v2
+ DEVICE_PACKAGES := ipq-wifi-netgear_ex61x0v2
NETGEAR_BOARD_ID := EX6150v2series
NETGEAR_HW_ID := 29765285+16+0+128+2x2
endef
@@ -159,7 +159,7 @@ define Device/openmesh_a42
IMAGES = factory.bin sysupgrade.bin
IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=A42
IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata
- DEVICE_PACKAGES := ath10k-firmware-qca4019 uboot-envtools
+ DEVICE_PACKAGES := uboot-envtools
endef
TARGET_DEVICES += openmesh_a42
@@ -173,7 +173,6 @@ define Device/qcom_ap-dk01.1-c1
$(call Device/FitImage)
IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin := append-kernel | pad-to $$$${KERNEL_SIZE} | append-rootfs | pad-rootfs | append-metadata
- DEVICE_PACKAGES := ath10k-firmware-qca4019
endef
TARGET_DEVICES += qcom_ap-dk01.1-c1