X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fipq806x%2Fimage%2FMakefile;h=7703a62339376d348bc8efbc6cd3d7c2a31dea71;hp=7606634fdbe35b3b82372e2ce89376e1bb8c24d1;hb=1cd0a4c688f02918cb96ff7f5f21cddc281d4f2c;hpb=b7baaaf782f40bf6a1d017a1f41480b6229a12c9

diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index 7606634fdb..7703a62339 100644
--- 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
 
@@ -40,13 +39,8 @@ 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
 
 define Device/LegacyImage
 	KERNEL_SUFFIX := -uImage
@@ -64,7 +58,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
@@ -78,9 +72,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)
@@ -99,10 +93,10 @@ 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 := Qualcom AP148
+	DEVICE_TITLE := Qualcomm AP148
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
 
@@ -110,17 +104,17 @@ 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 := Qualcom AP148 (legacy)
+	DEVICE_TITLE := Qualcomm AP148 (legacy)
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0
 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
@@ -134,7 +128,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
@@ -146,7 +140,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
 
@@ -154,16 +148,15 @@ 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
 	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/factory.bin := append-kernel | pad-to $$$${KERNEL_SIZE} | append-ubi
+	IMAGE/sysupgrade.tar := sysupgrade-tar
 	DEVICE_TITLE := Linksys EA8500
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
@@ -174,26 +167,39 @@ 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
 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
+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
+TARGET_DEVICES += AP148 AP148-legacy C2600 D7800 DB149 EA8500 R7500 R7500v2 R7800
 
 $(eval $(call BuildImage))