X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fipq806x%2Fimage%2FMakefile;h=daf910e74e05d3767354b4e478f07cb9929c1a6e;hb=c7d5bc8197609a62f03f3f6b3d665ae73bd1072b;hp=ff8b2c7d9bdb792d499c325353e1dde593e62406;hpb=78a6a9aec306f3fa53b3eaffb35a2344c26a43c7;p=openwrt%2Fstaging%2Frmilecki.git

diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index ff8b2c7d9bd..daf910e74e0 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
 
@@ -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,26 +73,54 @@ 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 += NETGEAR_BOARD_ID NETGEAR_HW_ID
+
+define Device/TpSafeImage
+	PROFILES += $$(DEVICE_NAME)
+	FILESYSTEMS := squashfs
+	KERNEL_SUFFIX := -uImage
+	KERNEL = kernel-bin | append-dtb | uImage none
+	KERNEL_NAME := zImage
+	TPLINK_BOARD_NAME :=
+	IMAGES := factory.bin sysupgrade.bin
+	IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
+	IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
 endef
-DEVICE_VARS += KERNEL_SIZE NETGEAR_BOARD_ID NETGEAR_HW_ID DEVICE_BLOCK_SIZE DEVICE_PAGE_SIZE
+DEVICE_VARS += TPLINK_BOARD_NAME
 
 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
+	DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
 
 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)
+	DEVICE_PACKAGES := ath10k-firmware-qca99x0
+endef
+
+define Device/C2600
+	$(call Device/TpSafeImage)
+	DEVICE_DTS := qcom-ipq8064-c2600
+	BLOCKSIZE := 128k
+	PAGESIZE := 2048
+	BOARD_NAME := c2600
+	TPLINK_BOARD_NAME := C2600
+	DEVICE_TITLE := TP-Link Archer C2600
+	DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
 
 define Device/D7800
@@ -110,9 +129,11 @@ 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
+	DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
 
 define Device/DB149
@@ -120,6 +141,25 @@ define Device/DB149
 	DEVICE_DTS := qcom-ipq8064-db149
 	KERNEL_INSTALL := 1
 	BOARD_NAME := db149
+	DEVICE_TITLE := Qualcomm DB149
+	DEVICE_PACKAGES := ath10k-firmware-qca99x0
+endef
+
+define Device/EA8500
+	$(call Device/LegacyImage)
+	DEVICE_DTS := qcom-ipq8064-ea8500
+	PAGESIZE := 2048
+	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 | pad-to $$$${KERNEL_SIZE} | append-ubi
+	IMAGE/sysupgrade.tar := sysupgrade-tar
+	DEVICE_TITLE := Linksys EA8500
+	DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
 
 define Device/R7500
@@ -128,11 +168,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-ipq8065-r7800
+	KERNEL_SIZE := 2097152
+	NETGEAR_BOARD_ID := R7800
+	NETGEAR_HW_ID := 29764958+0+128+512+4x4+4x4+cascade
+	BLOCKSIZE := 128k
+	PAGESIZE := 2048
+	BOARD_NAME := r7800
+	DEVICE_TITLE := Netgear Nighthawk X4S R7800
+	DEVICE_PACKAGES := ath10k-firmware-qca9984
 endef
 
-TARGET_DEVICES += AP148 AP148-legacy D7800 DB149 R7500
+TARGET_DEVICES += AP148 AP148-legacy C2600 D7800 DB149 EA8500 R7500 R7500v2 R7800
 
 $(eval $(call BuildImage))