From 25df32708606a364322cb721492241bb6e5c66f4 Mon Sep 17 00:00:00 2001 From: Sebastian Schaper Date: Mon, 30 Nov 2020 18:20:18 +0100 Subject: ath79: merge D-Link DAP-2695 with dtsi Further devices from the series have been added in the meantime, introducing `qca955x_dlink_dap-2xxx.dtsi`. Thus, merge support for DAP-2695 with the existing dtsi. This implies factory images can now be flashed via the regular OEM Web UI, as well as the bootloader recovery. Signed-off-by: Sebastian Schaper --- target/linux/ath79/image/generic.mk | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'target/linux/ath79/image') diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index fb393ba082..39f616b010 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -845,20 +845,13 @@ endef TARGET_DEVICES += dlink_dap-2680-a1 define Device/dlink_dap-2695-a1 + $(Device/dlink_dap-2xxx) SOC := qca9558 - DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct DEVICE_VENDOR := D-Link DEVICE_MODEL := DAP-2695 DEVICE_VARIANT := A1 - IMAGES := factory.img sysupgrade.bin + DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct IMAGE_SIZE := 15360k - IMAGE/default := append-kernel | pad-offset 65536 160 - IMAGE/factory.img := $$(IMAGE/default) | append-rootfs | wrgg-pad-rootfs | \ - mkwrggimg | check-size - IMAGE/sysupgrade.bin := $$(IMAGE/default) | mkwrggimg | append-rootfs | \ - wrgg-pad-rootfs | check-size | append-metadata - KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma - KERNEL_INITRAMFS := $$(KERNEL) | mkwrggimg DAP_SIGNATURE := wapac02_dkbs_dap2695 SUPPORTED_DEVICES += dap-2695-a1 endef -- cgit v1.2.3