kernel: Move append-dtb to common image-commands

[openwrt/openwrt.git] / target / linux / ipq806x / image / Makefile

diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index 455ea1eb72ceb52016a0ae59e61de54e8cbada6f..7606634fdbe35b3b82372e2ce89376e1bb8c24d1 100644 (file)
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -32,10 +32,6 @@ define Image/Build
        dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1)-root.img bs=2k conv=sync
 endef
 
-define Build/append-dtb
-       cat $(DTS_DIR)/$(DEVICE_DTS).dtb >> $@
-endef
-
 define Build/append-file
        cat $(1) >> $@
 endef
@@ -107,6 +103,7 @@ define Device/AP148
        PAGESIZE := 2048
        BOARD_NAME := ap148
        DEVICE_TITLE := Qualcom AP148
+       DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
 
 define Device/AP148-legacy
@@ -117,6 +114,7 @@ define Device/AP148-legacy
        PAGESIZE := 2048
        BOARD_NAME := ap148
        DEVICE_TITLE := Qualcom AP148 (legacy)
+       DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
 
 define Device/C2600
@@ -127,6 +125,7 @@ define Device/C2600
        BOARD_NAME := c2600
        TPLINK_BOARD_NAME := C2600
        DEVICE_TITLE := TP-Link Archer C2600
+       DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
 
 define Device/D7800
@@ -139,6 +138,7 @@ define Device/D7800
        PAGESIZE := 2048
        BOARD_NAME := d7800
        DEVICE_TITLE := Netgear Nighthawk X4 D7800
+       DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
 
 define Device/DB149
@@ -147,6 +147,7 @@ define Device/DB149
        KERNEL_INSTALL := 1
        BOARD_NAME := db149
        DEVICE_TITLE := Qualcom DB149
+       DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
 
 define Device/EA8500
@@ -164,6 +165,7 @@ define Device/EA8500
        IMAGE/sysupgrade.tar := sysupgrade-nand
        DEVICE_VARS += DEVICE_DTS KERNEL_SIZE PAGESIZE BLOCKSIZE SUBPAGESIZE
        DEVICE_TITLE := Linksys EA8500
+       DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
 
 define Device/R7500
@@ -176,8 +178,22 @@ define Device/R7500
        PAGESIZE := 2048
        BOARD_NAME := r7500
        DEVICE_TITLE := Netgear Nighthawk X4 R7500
+       DEVICE_PACKAGES := ath10k-firmware-qca99x0
+endef
+
+define Device/R7800
+       $(call Device/DniImage)
+       DEVICE_DTS := qcom-ipq8064-r7800
+       KERNEL_SIZE := 2097152
+       NETGEAR_BOARD_ID := R7800
+       NETGEAR_HW_ID := 29764958+0+128+512+4x4+4x4+cascade
+       BLOCKSIZE := 128KiB
+       PAGESIZE := 2048
+       BOARD_NAME := r7800
+       DEVICE_TITLE := Netgear Nighthawk X4S R7800
+       DEVICE_PACKAGES := ath10k-firmware-qca9984
 endef
 
-TARGET_DEVICES += AP148 AP148-legacy C2600 D7800 DB149 EA8500 R7500
+TARGET_DEVICES += AP148 AP148-legacy C2600 D7800 DB149 EA8500 R7500 R7800
 
 $(eval $(call BuildImage))