From: Christian Lamparter Date: Mon, 22 Oct 2018 21:47:56 +0000 (+0200) Subject: ipq-wifi: drop custom board-2.bins X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dceee8cc09a54f96dee82a6e95e3e77a6dd7ac13;p=openwrt%2Fstaging%2Fnbd.git ipq-wifi: drop custom board-2.bins The BDFs for all boards were upstreamed to the ath10k-firmware repository and linux-firmware.git. We switched to the upstream board-2.bin, hence the files can be removed here. Keep the ipq-wifi package in case new boards are added. It might take some time till board-2.bins send upstream are merged. Signed-off-by: Christian Lamparter --- diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index a5555d5d7c..51da4bc465 100644 --- a/package/firmware/ipq-wifi/Makefile +++ b/package/firmware/ipq-wifi/Makefile @@ -17,7 +17,7 @@ endef # Please send a mail with your device-specific board files upstream. # You can find instructions and examples on the linux-wireless wiki: # -ALLWIFIBOARDS:=zyxel_nbg6617 zyxel_wre6606 +ALLWIFIBOARDS:= ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD)) define Package/ipq-wifi-default @@ -51,8 +51,6 @@ Don't install it for any other device! PREV_BOARD+=ipq-wifi-$(1) endef -$(eval $(call generate-ipq-wifi-package,zyxel_wre6606,board-zyxel_wre6606.bin,ZyXEL WRE6606)) #$(eval $(call generate-ipq-wifi-package,,,)) -$(eval $(call generate-ipq-wifi-package,zyxel_nbg6617,board-zyxel_nbg6617.bin,ZyXEL NBG6617)) $(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE)))) diff --git a/package/firmware/ipq-wifi/board-zyxel_nbg6617.bin b/package/firmware/ipq-wifi/board-zyxel_nbg6617.bin deleted file mode 100644 index ab4d43e8cb..0000000000 Binary files a/package/firmware/ipq-wifi/board-zyxel_nbg6617.bin and /dev/null differ diff --git a/package/firmware/ipq-wifi/board-zyxel_wre6606.bin b/package/firmware/ipq-wifi/board-zyxel_wre6606.bin deleted file mode 100644 index 262c07b04a..0000000000 Binary files a/package/firmware/ipq-wifi/board-zyxel_wre6606.bin and /dev/null differ diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index 51a5be99af..8a42d3e780 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -223,7 +223,7 @@ define Device/zyxel_nbg6617 # this minimum-size. However, the larger image can be flashed both ways. IMAGE/factory.bin := append-rootfs | pad-rootfs | pad-to 64k | check-size $$$$(ROOTFS_SIZE) | zyxel-ras-image separate-kernel IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | check-size $$$$(ROOTFS_SIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata - DEVICE_PACKAGES := ipq-wifi-zyxel_nbg6617 uboot-envtools + DEVICE_PACKAGES := uboot-envtools endef TARGET_DEVICES += zyxel_nbg6617 @@ -232,7 +232,6 @@ define Device/zyxel_wre6606 DEVICE_TITLE := ZyXEL WRE6606 DEVICE_DTS_CONFIG := config@4 DEVICE_DTS := qcom-ipq4018-wre6606 - DEVICE_PACKAGES := ipq-wifi-zyxel_wre6606 IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata endef