domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipq40xx: unbundle firmware and board file

Browse Source 
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>
This commit is contained in:
Mathias Kresin
2018-04-12 20:48:35 +02:00
parent 970f1914be
commit fb528b1674
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/firmware/ipq-wifi/Makefile
View File

@@ -20,7 +20,7 @@ define Package/ipq-wifi-default
SUBMENU:=ath10k IPQ4019 Boarddata SUBMENU:=ath10k IPQ4019 Boarddata
SECTION:=firmware SECTION:=firmware
CATEGORY:=Firmware CATEGORY:=Firmware
DEPENDS:=@TARGET_ipq40xx +ath10k-firmware-qca4019 DEPENDS:=@TARGET_ipq40xx
TITLE:=Custom Board TITLE:=Custom Board
endef endef

1
target/linux/ipq40xx/Makefile
View File

@@ -17,5 +17,6 @@ DEFAULT_PACKAGES += \
kmod-leds-gpio kmod-gpio-button-hotplug swconfig \ kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
kmod-ath10k wpad-mini \ kmod-ath10k wpad-mini \
kmod-usb3 kmod-usb-dwc3-of-simple kmod-usb-phy-qcom-dwc3 \ kmod-usb3 kmod-usb-dwc3-of-simple kmod-usb-phy-qcom-dwc3 \
ath10k-firmware-qca4019
$(eval $(call BuildTarget)) $(eval $(call BuildTarget))

9
target/linux/ipq40xx/image/Makefile
View File

@@ -51,7 +51,7 @@ define Device/8dev_jalapeno
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
DEVICE_TITLE := 8devices Jalapeno DEVICE_TITLE := 8devices Jalapeno
DEVICE_PACKAGES := ath10k-firmware-qca4019 ipq-wifi-8dev_jalapeno DEVICE_PACKAGES := ipq-wifi-8dev_jalapeno
endef endef
TARGET_DEVICES += 8dev_jalapeno TARGET_DEVICES += 8dev_jalapeno
@@ -97,7 +97,7 @@ define Device/compex_wpj428
KERNEL_SIZE := 4096k KERNEL_SIZE := 4096k
IMAGES = sysupgrade.bin IMAGES = sysupgrade.bin
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata 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 endef
TARGET_DEVICES += compex_wpj428 TARGET_DEVICES += compex_wpj428
@@ -129,7 +129,7 @@ define Device/netgear_ex61x0v2
$(call Device/DniImage) $(call Device/DniImage)
KERNEL_SIZE := 3080192 KERNEL_SIZE := 3080192
DEVICE_DTS_CONFIG := config@4 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_BOARD_ID := EX6150v2series
NETGEAR_HW_ID := 29765285+16+0+128+2x2 NETGEAR_HW_ID := 29765285+16+0+128+2x2
endef endef
@@ -159,7 +159,7 @@ define Device/openmesh_a42
IMAGES = factory.bin sysupgrade.bin IMAGES = factory.bin sysupgrade.bin
IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=A42 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 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 endef
TARGET_DEVICES += openmesh_a42 TARGET_DEVICES += openmesh_a42
@@ -173,7 +173,6 @@ define Device/qcom_ap-dk01.1-c1
$(call Device/FitImage) $(call Device/FitImage)
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin := append-kernel | pad-to $$$${KERNEL_SIZE} | append-rootfs | pad-rootfs | append-metadata IMAGE/sysupgrade.bin := append-kernel | pad-to $$$${KERNEL_SIZE} | append-rootfs | pad-rootfs | append-metadata
DEVICE_PACKAGES := ath10k-firmware-qca4019
endef endef
TARGET_DEVICES += qcom_ap-dk01.1-c1 TARGET_DEVICES += qcom_ap-dk01.1-c1