ipq40xx: detangle ath10k-board-qca4019 from ath10k-firmware-qca4019*
Back in the day, the board-2.bin came with ath10k-firmware-qca4019. This changed with commitc3b2efaf24
("linux-firmware: ath10k: add board firmware packages") which placed the board-2.bin into a separate package: ath10k-board-qca4019. This was great, because it addressed one of the caveat of the original ipq-wifi package: commitfa03d441e9
("firmware: add custom IPQ wifi board definitions") | 2. updating ath10k-firmware-qca4019 will also replace | the board-2.bin. For this cases the user needs to | manually reinstall the wifi-board package once the | ath10k-firmware-qca4019 is updated. This could be extended further so that ipq-wifi packages no longer use "install-override" and the various QCA4019 variants list the ath10k-board-qca4019 as a CONFLICT package. Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
This commit is contained in:
parent
4c8dd973ef
commit
fd717f54be
|
@ -292,7 +292,6 @@ $(Package/ath10k-ct-firmware-default)
|
|||
CATEGORY:=Firmware
|
||||
PROVIDES:=ath10k-firmware-qca4019
|
||||
CONFLICTS:=ath10k-firmware-qca4019
|
||||
DEPENDS:=+ath10k-board-qca4019
|
||||
endef
|
||||
define Package/ath10k-firmware-qca4019-ct-full-htt
|
||||
$(Package/ath10k-ct-firmware-default)
|
||||
|
@ -307,7 +306,6 @@ $(Package/ath10k-ct-firmware-default)
|
|||
ath10k-firmware-qca4019-ct \
|
||||
ath10k-firmware-qca4019-ct-htt
|
||||
DEPENDS:=\
|
||||
+ath10k-board-qca4019 \
|
||||
+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
|
||||
endef
|
||||
define Package/ath10k-firmware-qca4019-ct-htt
|
||||
|
@ -322,7 +320,6 @@ $(Package/ath10k-firmware-default)
|
|||
ath10k-firmware-qca4019 \
|
||||
ath10k-firmware-qca4019-ct
|
||||
DEPENDS:=\
|
||||
+ath10k-board-qca4019 \
|
||||
+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
|
||||
endef
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ define Package/ath10k-board-qca4019/install
|
|||
$(1)/lib/firmware/ath10k/QCA4019/hw1.0/
|
||||
endef
|
||||
$(eval $(call BuildPackage,ath10k-board-qca4019))
|
||||
Package/ath10k-firmware-qca4019 = $(call Package/firmware-default,ath10k qca4019 firmware,+ath10k-board-qca4019)
|
||||
Package/ath10k-firmware-qca4019 = $(call Package/firmware-default,ath10k qca4019 firmware)
|
||||
define Package/ath10k-firmware-qca4019/install
|
||||
$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA4019/hw1.0
|
||||
$(INSTALL_DATA) \
|
||||
|
|
|
@ -19,6 +19,6 @@ DEFAULT_PACKAGES += \
|
|||
kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
|
||||
kmod-ath10k-ct wpad-basic-wolfssl \
|
||||
kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019-ct \
|
||||
uboot-envtools
|
||||
ath10k-board-qca4019 uboot-envtools
|
||||
|
||||
$(eval $(call BuildTarget))
|
||||
|
|
Loading…
Reference in New Issue