ipq806x: fix Netgear X4 R7500 ath10k firmware selection

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

diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index 0b7c9ef9a0c99d4349ec0cfd43c879c15c13d955..e834b250988cd0d9dbcc5b40edf7b3baadc9ccea 100644 (file)
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -39,13 +39,10 @@ define Device/Default
        PROFILES := Default
        KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
        KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs
-       DEVICE_DTS :=
        KERNEL_PREFIX := $$(IMAGE_PREFIX)
-       IMAGES :=
-       KERNEL_IN_UBI :=
-       BOARD_NAME :=
+       SUPPORTED_DEVICES = $$(BOARD_NAME)
+       IMAGE/sysupgrade.tar = sysupgrade-tar | append-metadata
 endef
-DEVICE_VARS += DEVICE_DTS BOARD_NAME KERNEL_SIZE
 
 define Device/LegacyImage
        KERNEL_SUFFIX := -uImage
@@ -63,7 +60,7 @@ define Device/UbiFit
        KERNEL_IN_UBI := 1
        IMAGES := nand-factory.ubi nand-sysupgrade.tar
        IMAGE/nand-factory.ubi := append-ubi
-       IMAGE/nand-sysupgrade.tar := sysupgrade-nand
+       IMAGE/nand-sysupgrade.tar := sysupgrade-tar | append-metadata
 endef
 
 define Device/DniImage
@@ -75,9 +72,9 @@ define Device/DniImage
        KERNEL_NAME := zImage
        NETGEAR_BOARD_ID :=
        NETGEAR_HW_ID :=
+       UBINIZE_OPTS := -E 5
        IMAGES := factory.img sysupgrade.tar
        IMAGE/factory.img := append-kernel | append-ubi | netgear-dni
-       IMAGE/sysupgrade.tar = sysupgrade-nand
 endef
 DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
 
@@ -90,15 +87,27 @@ define Device/TpSafeImage
        TPLINK_BOARD_NAME :=
        IMAGES := factory.bin sysupgrade.bin
        IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
-       IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
+       IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | append-metadata
 endef
 DEVICE_VARS += TPLINK_BOARD_NAME
 
+define Device/ZyXELImage
+       PROFILES += $$(DEVICE_NAME)
+       FILESYSTEMS := squashfs
+       KERNEL_SUFFIX := -uImage
+       KERNEL = kernel-bin | append-dtb | uImage none | pad-to $${KERNEL_SIZE}
+       KERNEL_NAME := zImage
+       IMAGES := sysupgrade.tar mmcblk0p5-rootfs.bin mmcblk0p4-kernel.bin
+       IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-to $$$${BLOCKSIZE} | sysupgrade-tar rootfs=$$$$@ | append-metadata
+       IMAGE/mmcblk0p5-rootfs.bin := append-rootfs | pad-rootfs | pad-to $$$${BLOCKSIZE}
+       IMAGE/mmcblk0p4-kernel.bin := append-kernel
+endef
+
 define Device/AP148
        $(call Device/FitImage)
        $(call Device/UbiFit)
        DEVICE_DTS := qcom-ipq8064-ap148
-       BLOCKSIZE := 128KiB
+       BLOCKSIZE := 128k
        PAGESIZE := 2048
        BOARD_NAME := ap148
        DEVICE_TITLE := Qualcomm AP148
@@ -109,7 +118,7 @@ define Device/AP148-legacy
        $(call Device/LegacyImage)
        $(call Device/UbiFit)
        DEVICE_DTS := qcom-ipq8064-ap148
-       BLOCKSIZE := 128KiB
+       BLOCKSIZE := 128k
        PAGESIZE := 2048
        BOARD_NAME := ap148
        DEVICE_TITLE := Qualcomm AP148 (legacy)
@@ -119,7 +128,7 @@ endef
 define Device/C2600
        $(call Device/TpSafeImage)
        DEVICE_DTS := qcom-ipq8064-c2600
-       BLOCKSIZE := 128KiB
+       BLOCKSIZE := 128k
        PAGESIZE := 2048
        BOARD_NAME := c2600
        TPLINK_BOARD_NAME := C2600
@@ -133,7 +142,7 @@ define Device/D7800
        KERNEL_SIZE := 2097152
        NETGEAR_BOARD_ID := D7800
        NETGEAR_HW_ID := 29764958+0+128+512+4x4+4x4
-       BLOCKSIZE := 128KiB
+       BLOCKSIZE := 128k
        PAGESIZE := 2048
        BOARD_NAME := d7800
        DEVICE_TITLE := Netgear Nighthawk X4 D7800
@@ -153,19 +162,18 @@ define Device/EA8500
        $(call Device/LegacyImage)
        DEVICE_DTS := qcom-ipq8064-ea8500
        PAGESIZE := 2048
-       BLOCKSIZE := 128KiB
-       KERNEL_SIZE := 3145728
+       BLOCKSIZE := 128k
+       KERNEL_SIZE := 3072k
        FILESYSTEMS := squashfs
        KERNEL = kernel-bin | append-dtb | uImage none | append-file $(KDIR)/root.dummy
        PROFILES += $$(DEVICE_NAME)
        BOARD_NAME := ea8500
+       UBINIZE_OPTS := -E 5
        IMAGES := factory.bin sysupgrade.tar
-       IMAGE/factory.bin := append-kernel 3145728 | append-ubi
-       IMAGE/sysupgrade.tar := sysupgrade-nand
+       IMAGE/factory.bin := append-kernel | pad-to $$$${KERNEL_SIZE} | append-ubi
        DEVICE_TITLE := Linksys EA8500
        DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
-DEVICE_VARS += DEVICE_DTS
 
 define Device/R7500
        $(call Device/DniImage)
@@ -173,26 +181,66 @@ define Device/R7500
        KERNEL_SIZE := 2097152
        NETGEAR_BOARD_ID := R7500
        NETGEAR_HW_ID := 29764841+0+128+256+3x3+4x4
-       BLOCKSIZE := 128KiB
+       BLOCKSIZE := 128k
        PAGESIZE := 2048
        BOARD_NAME := r7500
        DEVICE_TITLE := Netgear Nighthawk X4 R7500
-       DEVICE_PACKAGES := ath10k-firmware-qca99x0
+       DEVICE_PACKAGES := ath10k-firmware-qca988x
+endef
+
+define Device/R7500v2
+       $(call Device/DniImage)
+       DEVICE_DTS := qcom-ipq8064-r7500v2
+       KERNEL_SIZE := 2097152
+       NETGEAR_BOARD_ID := R7500v2
+       NETGEAR_HW_ID := 29764958+0+128+512+3x3+4x4
+       BLOCKSIZE := 128k
+       PAGESIZE := 2048
+       BOARD_NAME := r7500v2
+       DEVICE_TITLE := Netgear Nighthawk X4 R7500v2
+       DEVICE_PACKAGES := ath10k-firmware-qca99x0 ath10k-firmware-qca988x
 endef
 
 define Device/R7800
        $(call Device/DniImage)
-       DEVICE_DTS := qcom-ipq8064-r7800
+       DEVICE_DTS := qcom-ipq8065-r7800
        KERNEL_SIZE := 2097152
        NETGEAR_BOARD_ID := R7800
        NETGEAR_HW_ID := 29764958+0+128+512+4x4+4x4+cascade
-       BLOCKSIZE := 128KiB
+       BLOCKSIZE := 128k
        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 R7800
+define Device/NBG6817
+       DEVICE_DTS := qcom-ipq8065-nbg6817
+       KERNEL_SIZE := 4096k
+       BLOCKSIZE := 64k
+       BOARD_NAME := nbg6817
+       DEVICE_TITLE := ZyXEL NBG6817
+       DEVICE_PACKAGES := ath10k-firmware-qca9984 e2fsprogs losetup
+       $(call Device/ZyXELImage)
+endef
+
+define Device/VR2600v
+       PROFILES += $$(DEVICE_NAME)
+       FILESYSTEMS := squashfs
+       KERNEL_SUFFIX := -uImage
+       KERNEL = kernel-bin | append-dtb | uImage none
+       KERNEL_NAME := zImage
+       KERNEL_SIZE := 2097152
+       DEVICE_DTS := qcom-ipq8064-vr2600v
+       BLOCKSIZE := 128k
+       PAGESIZE := 2048
+       BOARD_NAME := vr2600v
+       DEVICE_TITLE := TP-Link Archer VR2600v
+       DEVICE_PACKAGES := ath10k-firmware-qca99x0
+       IMAGES := sysupgrade.bin
+       IMAGE/sysupgrade.bin := pad-extra 512 | append-kernel | pad-to $$$${KERNEL_SIZE} | append-rootfs | pad-rootfs | append-metadata
+endef
+
+TARGET_DEVICES += AP148 AP148-legacy C2600 D7800 DB149 EA8500 R7500 R7500v2 R7800 NBG6817 VR2600v
 
 $(eval $(call BuildImage))