ipq806x: add missing sysupgrade-nand => sysupgrade-tar change

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

diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index e039df78223927e7b27e75c1725b4fa798385d44..5ce007292f13cca5005ccdb3a532ff79b6f46d46 100644 (file)
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -4,7 +4,6 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 UBIFS_OPTS = -m 2048 -e 124KiB -c 4096 -U -F
-UBINIZE_OPTS = -m 2048 -p 128KiB
 
 KERNEL_LOADADDR := 0x42208000
 
@@ -32,10 +31,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
@@ -44,13 +39,9 @@ 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 :=
 endef
-DEVICE_VARS += DEVICE_DTS KERNEL_IN_UBI BOARD_NAME
+DEVICE_VARS += KERNEL_SIZE
 
 define Device/LegacyImage
        KERNEL_SUFFIX := -uImage
@@ -68,7 +59,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
 endef
 
 define Device/DniImage
@@ -82,9 +73,9 @@ define Device/DniImage
        NETGEAR_HW_ID :=
        IMAGES := factory.img sysupgrade.tar
        IMAGE/factory.img := append-kernel | append-ubi | netgear-dni
-       IMAGE/sysupgrade.tar = sysupgrade-nand
+       IMAGE/sysupgrade.tar = sysupgrade-tar
 endef
-DEVICE_VARS += KERNEL_SIZE NETGEAR_BOARD_ID NETGEAR_HW_ID DEVICE_BLOCK_SIZE DEVICE_PAGE_SIZE
+DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
 
 define Device/TpSafeImage
        PROFILES += $$(DEVICE_NAME)
@@ -106,7 +97,7 @@ define Device/AP148
        BLOCKSIZE := 128KiB
        PAGESIZE := 2048
        BOARD_NAME := ap148
-       DEVICE_TITLE := Qualcom AP148
+       DEVICE_TITLE := Qualcomm AP148
        DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
 
@@ -117,7 +108,7 @@ define Device/AP148-legacy
        BLOCKSIZE := 128KiB
        PAGESIZE := 2048
        BOARD_NAME := ap148
-       DEVICE_TITLE := Qualcom AP148 (legacy)
+       DEVICE_TITLE := Qualcomm AP148 (legacy)
        DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
 
@@ -150,7 +141,7 @@ define Device/DB149
        DEVICE_DTS := qcom-ipq8064-db149
        KERNEL_INSTALL := 1
        BOARD_NAME := db149
-       DEVICE_TITLE := Qualcom DB149
+       DEVICE_TITLE := Qualcomm DB149
        DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
 
@@ -166,8 +157,7 @@ define Device/EA8500
        BOARD_NAME := ea8500
        IMAGES := factory.bin sysupgrade.tar
        IMAGE/factory.bin := append-kernel 3145728 | append-ubi
-       IMAGE/sysupgrade.tar := sysupgrade-nand
-       DEVICE_VARS += DEVICE_DTS KERNEL_SIZE PAGESIZE BLOCKSIZE SUBPAGESIZE
+       IMAGE/sysupgrade.tar := sysupgrade-tar
        DEVICE_TITLE := Linksys EA8500
        DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
@@ -185,6 +175,19 @@ define Device/R7500
        DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
 
-TARGET_DEVICES += AP148 AP148-legacy C2600 D7800 DB149 EA8500 R7500
+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 R7800
 
 $(eval $(call BuildImage))