X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/bf7689f4a57840cb39ef0b47063d5c0523eb1e2b..4bcc767170867495a170f365d58d98d7bf075618:/target/linux/ar71xx/image/Makefile

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 164ac573d..04629ffd5 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/image.mk
 IMGNAME:=$(BIN_DIR)/openwrt-$(BOARD)
 
 define imgname
-$(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(1))
+$(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
 endef
 
 VMLINUX:=$(IMGNAME)-vmlinux
@@ -18,28 +18,47 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
 	VMLINUX:=$(IMGNAME)-vmlinux-initramfs
 endif
 
+define CompressLzma
+  $(STAGING_DIR_HOST)/bin/lzma e $(1) -lc1 -lp2 -pb2 $(2)
+endef
+
+define PatchKernelLzma
+	cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(1)
+	$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(1) '$(strip $(2))'
+	$(call CompressLzma,$(KDIR)/vmlinux-$(1),$(KDIR)/vmlinux-$(1).bin.lzma)
+endef
+
+define PatchKernelGzip
+	cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(1)
+	$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(1) '$(strip $(2))'
+	gzip -9 -c $(KDIR)/vmlinux-$(1) > $(KDIR)/vmlinux-$(1).bin.gz
+endef
+
+define MkImageLzma
+	mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma \
+		-e 0x80060000 -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
+		-d $(1) $(2)
+endef
+
+define MkImageGzip
+	mkimage -A mips -O linux -T kernel -a 0x80060000 -C gzip \
+		-e 0x80060000 -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
+		-d $(1) $(2)
+endef
+
 define Image/BuildKernel
 	cp $(KDIR)/vmlinux.elf $(VMLINUX).elf
 	cp $(KDIR)/vmlinux $(VMLINUX).bin
 	gzip -9 -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz
-	$(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux $(KDIR)/vmlinux.bin.l7
-	$(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux -lc1 -lp2 -pb2 $(KDIR)/vmlinux.bin.lzma
-	dd if=$(KDIR)/vmlinux.bin.l7 of=$(VMLINUX).lzma bs=65536 conv=sync
+	$(call CompressLzma,$(KDIR)/vmlinux,$(KDIR)/vmlinux.bin.lzma)
+	dd if=$(KDIR)/vmlinux.bin.lzma of=$(VMLINUX).lzma bs=65536 conv=sync
 	dd if=$(KDIR)/vmlinux.bin.gz of=$(VMLINUX).gz bs=65536 conv=sync
-	mkimage -A mips -O linux -T kernel -a 0x80060000 -C gzip -e \
-		0x80060000 \
-		-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-		-d $(KDIR)/vmlinux.bin.gz $(IMGNAME)-uImage-gzip.bin
-	mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
-		0x80060000 \
-		-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-		-d $(KDIR)/vmlinux.bin.lzma $(IMGNAME)-uImage-lzma.bin
+	$(call MkImageGzip,$(KDIR)/vmlinux.bin.gz,$(IMGNAME)-uImage-gzip.bin)
+	$(call MkImageLzma,$(KDIR)/vmlinux.bin.lzma,$(IMGNAME)-uImage-lzma.bin)
 endef
 
-define Image/Build/Linksys8M
-	cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(2)
-	$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(2) '$(strip $(3))'
-	$(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux-$(2) $(KDIR)/vmlinux-$(2).bin.lzma
+define Image/Build/WRT400N
+	$(call PatchKernelLzma,$(2),$(3))
 	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 1310720 ]; then \
 		echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
 	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 6488064 ]; then \
@@ -54,16 +73,15 @@ define Image/Build/Linksys8M
 			dd if=$(KDIR)/root.$(1) bs=6336k conv=sync; \
 			echo -n $(4); \
 		) > $(call imgname,$(1),$(2)).bin; \
+		wrt400n $(KDIR)/vmlinux-$(2).uImage $(KDIR)/root.$(1) $(call imgname,$(1),$(2)).webui; \
 	fi; fi
 endef
 
-define Image/Build/AP81
-	cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(2)
-	$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(2) '$(strip $(3))'
-	$(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux-$(2) $(KDIR)/vmlinux-$(2).bin.lzma
-	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 786432 ]; then \
+define Image/Build/Cameo
+	$(call PatchKernelLzma,$(2),$(3))
+	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 851968 ]; then \
 		echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
-	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 3080192 ]; then \
+	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 3014656 ]; then \
 		echo "Warning: $(KDIR)/root.$(1) is too big"; \
 	else \
 		mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
@@ -71,64 +89,162 @@ define Image/Build/AP81
 			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
 			-d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
 		( \
-			dd if=$(KDIR)/vmlinux-$(2).uImage bs=768k conv=sync; \
-			dd if=$(KDIR)/root.$(1) bs=3008k conv=sync; \
+			dd if=$(KDIR)/vmlinux-$(2).uImage bs=832k conv=sync; \
+			dd if=$(KDIR)/root.$(1) bs=2944k conv=sync; \
 			echo -n $(4); \
 		) > $(call imgname,$(1),$(2)).uni; \
 	fi; fi
 endef
 
+define Image/Build/AP83
+	$(call PatchKernelGzip,$(2),$(3))
+	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.gz"` -gt 1310720 ]; then \
+		echo "Warning: $(KDIR)/vmlinux-$(2).bin.gz is too big"; \
+	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 6619136 ]; then \
+		echo "Warning: $(KDIR)/root.$(1) is too big"; \
+	else \
+		mkimage -A mips -O linux -T kernel -a 0x80060000 -C gzip -e \
+			0x80060000 \
+			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
+			-d $(KDIR)/vmlinux-$(2).bin.gz \
+			$(KDIR)/vmlinux-$(2).uImage; \
+		dd if=$(KDIR)/vmlinux-$(2).uImage \
+			of=$(call imgname,kernel,$(2)).bin bs=64k conv=sync; \
+		dd if=$(KDIR)/root.$(1) \
+			of=$(call imgname,$(1),$(2)-rootfs).bin bs=128k conv=sync; \
+		( \
+			dd if=$(KDIR)/vmlinux-$(2).uImage bs=1280k conv=sync; \
+			dd if=$(KDIR)/root.$(1); \
+		) > $(call imgname,$(1),$(2)-firmware).bin; \
+	fi; fi
+endef
+
 define Image/Build/MyLoader
 	-$(STAGING_DIR_HOST)/bin/mkmylofw -B $(2) \
-		-p0x30000:0xc0000:ahl:0x80060000:kernel:$(KDIR)/vmlinux.bin.lzma  \
-		-p0xf0000:0:::rootfs:$(KDIR)/root.$(1) \
-		$(call imgname,$(1),$(2)).img
+		-p0x030000:0xd0000:al:0x80060000:kernel:$(KDIR)/vmlinux.bin.lzma \
+		-p0x100000:0:::rootfs:$(KDIR)/root.$(1) \
+		$(call imgname,$(1),$(2))-2M.img
+	-$(STAGING_DIR_HOST)/bin/mkmylofw -B $(2) -s 0x400000 \
+		-p0x030000:0xd0000:al:0x80060000:kernel:$(KDIR)/vmlinux.bin.lzma \
+		-p0x100000:0:::rootfs:$(KDIR)/root.$(1) \
+		$(call imgname,$(1),$(2))-4M.img
+	-$(STAGING_DIR_HOST)/bin/mkmylofw -B $(2) -s 0x800000 \
+		-p0x030000:0xd0000:al:0x80060000:kernel:$(KDIR)/vmlinux.bin.lzma \
+		-p0x100000:0:::rootfs:$(KDIR)/root.$(1) \
+		$(call imgname,$(1),$(2))-8M.img
+	-$(STAGING_DIR_HOST)/bin/mkmylofw -B $(2) -s 0x1000000 \
+		-p0x030000:0xd0000:al:0x80060000:kernel:$(KDIR)/vmlinux.bin.lzma \
+		-p0x100000:0:::rootfs:$(KDIR)/root.$(1) \
+		$(call imgname,$(1),$(2))-16M.img
+endef
+
+ubntxm_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1024k(kernel),6528k(rootfs),256k(cfg)ro,64k(EEPROM)ro,7552k@0x50000(firmware)
+define Image/Build/UBNTXM
+	$(call PatchKernelLzma,$(2),$(3) $(ubntxm_mtdlayout))
+	$(call MkImageLzma,$(KDIR)/vmlinux-$(2).bin.lzma,$(KDIR)/vmlinux-$(2).uImage.bin)
+	dd if=$(KDIR)/vmlinux-$(2).uImage.bin of=$(KDIR)/vmlinux-$(2).uImage bs=1024k conv=sync
+	-$(STAGING_DIR_HOST)/bin/mkfwimage \
+		-B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \
+		-k $(KDIR)/vmlinux-$(2).uImage \
+		-r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
+		-o $(call imgname,$(1),$(2))-factory.bin
+	( \
+		dd if=$(KDIR)/vmlinux-$(2).uImage; \
+		dd if=$(BIN_DIR)/openwrt-$(BOARD)-root.$(1); \
+	) > $(call imgname,$(1),$(2))-sysupgrade.bin
 endef
 
 define Image/Build/UBNT
-	cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(2)
-	$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(2) '$(strip $(3))'
-	$(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux-$(2) $(KDIR)/vmlinux-$(2).lzma
-	dd if=$(KDIR)/vmlinux-$(2).lzma of=$(KDIR)/vmlinux-$(2).bin.lzma bs=64k conv=sync
+	$(call PatchKernelLzma,$(2),$(3))
+	dd if=$(KDIR)/vmlinux-$(2).bin.lzma of=$(KDIR)/vmlinux-$(2).lzma bs=64k conv=sync
 	-$(STAGING_DIR_HOST)/bin/mkfwimage \
-		-B $(4) -v $(5).ar7100.OpenWrt.$(REVISION) \
-		-k $(KDIR)/vmlinux-$(2).bin.lzma \
+		-B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \
+		-k $(KDIR)/vmlinux-$(2).lzma \
 		-r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
-		-o $(BIN_DIR)/openwrt-$(BOARD)-$(2)-$(1).bin
+		-o $(call imgname,$(1),$(2))-factory.bin
+	-sh $(TOPDIR)/scripts/combined-image.sh \
+		"$(KDIR)/vmlinux-$(2).lzma" \
+		"$(BIN_DIR)/openwrt-$(BOARD)-root.$(1)" \
+		$(call imgname,$(1),$(2))-sysupgrade.bin
 endef
 
 define Image/Build/Planex
-	cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(2)
-	$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(2) '$(strip $(3))'
-	gzip -9 -c $(KDIR)/vmlinux-$(2) > $(KDIR)/vmlinux-$(2).bin.gzip
-	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.gzip"` -gt 1441792 ]; then \
-		echo "Warning: $(KDIR)/vmlinux-$(2).bin.gzip is too big"; \
+	$(call PatchKernelGzip,$(2),$(3))
+	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.gz"` -gt 1441792 ]; then \
+		echo "Warning: $(KDIR)/vmlinux-$(2).bin.gz is too big"; \
 	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 6356992 ]; then \
 		echo "Warning: $(KDIR)/root.$(1) is too big"; \
 	else \
 		mkimage -A mips -O linux -T kernel -a 0x80060000 -C gzip -e \
 			0x80060000 \
 			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-			-d $(KDIR)/vmlinux-$(2).bin.gzip $(KDIR)/vmlinux-$(2).uImage; \
+			-d $(KDIR)/vmlinux-$(2).bin.gz $(KDIR)/vmlinux-$(2).uImage; \
 		( \
 			dd if=$(KDIR)/vmlinux-$(2).uImage bs=1408k conv=sync; \
 			dd if=$(KDIR)/root.$(1) bs=6208k conv=sync; \
 		) > $(call imgname,$(1),$(2)).bin; \
-		$(STAGING_DIR_HOST)/bin/mkplanexfw -v 2.00.00 \
+		$(STAGING_DIR_HOST)/bin/mkplanexfw \
+			-B $(2) \
+			-v 2.00.00 \
 			-i $(call imgname,$(1),$(2)).bin \
 			-o $(call imgname,$(1),$(2)).webui; \
 	fi; fi
 endef
 
 define Image/Build/TPLINK
-	cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(2)
-	$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(2) '$(strip $(3))'
-	gzip -9 -c $(KDIR)/vmlinux-$(2) > $(KDIR)/vmlinux-$(2).bin.gzip
+	$(call PatchKernelGzip,$(2),$(3))
 	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
 		-B $(4) -N OpenWrt -V $(REVISION)\
-		-k $(KDIR)/vmlinux-$(2).bin.gzip \
+		-k $(KDIR)/vmlinux-$(2).bin.gz \
 		-r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
-		-o $(BIN_DIR)/openwrt-$(BOARD)-$(2)-$(1).uni
+		-o $(call imgname,$(1),$(2))-universal.bin
+endef
+
+define Image/Build/CyberTAN
+	$(call PatchKernelGzip,$(2),$(3))
+	$(call MkImageGzip,$(KDIR)/vmlinux-$(2).bin.gz,$(KDIR)/vmlinux-$(2).uImage)
+	( \
+		dd if=$(KDIR)/vmlinux-$(2).uImage bs=64k conv=sync; \
+		dd if=/dev/zero bs=1 count=65476; \
+		dd if=$(KDIR)/root.$(1) bs=64k; \
+	) > $(KDIR)/vmlinux-$(2).image
+	$(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/vmlinux-$(2).trx \
+		-f $(KDIR)/vmlinux-$(2).image
+	-$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(4) -g \
+		-i $(KDIR)/vmlinux-$(2).trx \
+		-o $(call imgname,$(1),$(2)).bin
+endef
+
+wndr3700_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),6656k(rootfs),64k(art)ro,7680k@0x70000(firmware)
+define Image/Build/WNDR3700
+	$(call PatchKernelLzma,$(2),$(3) $(wndr3700_mtdlayout))
+	$(call MkImageLzma,$(KDIR)/vmlinux-$(2).bin.lzma,$(KDIR)/vmlinux-$(2).uImage)
+	mkdir $(KDIR)/wndr3700
+	mkdir $(KDIR)/wndr3700/image
+	$(STAGING_DIR_HOST)/bin/wndr3700 \
+		$(KDIR)/vmlinux-$(2).uImage \
+		$(KDIR)/wndr3700/image/uImage
+	$(STAGING_DIR_HOST)/bin/mksquashfs-lzma \
+		$(KDIR)/wndr3700 $(KDIR)/vmlinux-$(2).uImage.squashfs.tmp \
+		-nopad -noappend -root-owned -be
+	-rm -rf $(KDIR)/wndr3700
+	mkimage -A mips -O linux -T filesystem -C none \
+		-a 0xbf070000 -e 0xbf070000 \
+		-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
+		-d $(KDIR)/vmlinux-$(2).uImage.squashfs.tmp \
+		$(KDIR)/vmlinux-$(2).uImage.squashfs.tmp2
+	$(STAGING_DIR_HOST)/bin/wndr3700 \
+		$(KDIR)/vmlinux-$(2).uImage.squashfs.tmp2 \
+		$(KDIR)/vmlinux-$(2).uImage.squashfs
+	-rm -f $(KDIR)/vmlinux-$(2).uImage.squashfs.tmp*
+	( \
+		dd if=$(KDIR)/vmlinux-$(2).uImage.squashfs bs=1M conv=sync; \
+		dd if=$(KDIR)/root.$(1) bs=64k; \
+	) > $(call imgname,$(1),$(2))-sysupgrade.bin
+	$(STAGING_DIR_HOST)/bin/mkdniimg \
+		-B WNDR3700 -v OpenWrt.$(REVISION) \
+		-i $(call imgname,$(1),$(2))-sysupgrade.bin \
+		-o $(call imgname,$(1),$(2))-factory.bin
 endef
 
 define Image/Build/Template/Compex
@@ -139,20 +255,48 @@ define Image/Build/Template/Compex/squashfs
 	$(call Image/Build/Template/Compex,squashfs,$(1))
 endef
 
-define Image/Build/Template/Linksys8M
-	$(call Image/Build/Linksys8M,$(1),$(2),$(3),$(4))
+define Image/Build/Template/WRT400N
+	$(call Image/Build/WRT400N,$(1),$(2),$(3),$(4))
+endef
+
+define Image/Build/Template/WRT400N/squashfs
+	$(call Image/Build/Template/WRT400N,squashfs,$(1),$(2),$(3))
+endef
+
+define Image/Build/Template/WRT400N/jffs2-64k
+	$(call Image/Build/Template/WRT400N,jffs2-64k,$(1),$(2),$(3))
+endef
+
+define Image/Build/Template/CyberTAN
+	$(call Image/Build/CyberTAN,$(1),$(2),$(3),$(4))
+endef
+
+define Image/Build/Template/CyberTAN/squashfs
+	$(call Image/Build/Template/CyberTAN,squashfs,$(1),$(2),$(3))
 endef
 
-define Image/Build/Template/Linksys8M/squashfs
-	$(call Image/Build/Template/Linksys8M,squashfs,$(1),$(2),$(3))
+define Image/Build/Template/CyberTAN/jffs2-64k
+	$(call Image/Build/Template/CyberTAN,jffs2-64k,$(1),$(2),$(3))
 endef
 
-define Image/Build/Template/AP81
-	$(call Image/Build/AP81,$(1),$(2),$(3),$(4))
+define Image/Build/Template/Cameo
+	$(call Image/Build/Cameo,$(1),$(2),$(3),$(4))
 endef
 
-define Image/Build/Template/AP81/squashfs
-	$(call Image/Build/Template/AP81,squashfs,$(1),$(2),$(3))
+define Image/Build/Template/Cameo/squashfs
+	$(call Image/Build/Template/Cameo,squashfs,$(1),$(2),$(3))
+endef
+
+define Image/Build/Template/AP83
+	$(call Image/Build/AP83,$(1),$(2),$(3))
+endef
+
+define Image/Build/Template/AP83/squashfs
+	$(call Image/Build/Template/AP83,squashfs,$(1),$(2))
+endef
+
+define Image/Build/Template/AP83/jffs2-64k
+	$(call Image/Build/Template/AP83,jffs2-64k,$(1),$(2))
 endef
 
 define Image/Build/Template/TPLINK
@@ -163,12 +307,36 @@ define Image/Build/Template/TPLINK/squashfs
 	$(call Image/Build/Template/TPLINK,squashfs,$(1),$(2),$(3))
 endef
 
+define Image/Build/Template/TPLINK4K
+	$(call Image/Build/TPLINK,$(1),$(2),$(3),$(4))
+endef
+
+define Image/Build/Template/TPLINK4K/squashfs
+	$(call Image/Build/Template/TPLINK,squashfs,$(1),$(2),$(3))
+endef
+
 define Image/Build/Template/UBNT
-	$(call Image/Build/UBNT,$(1),$(2),$(3),$(4),$(5))
+	$(call Image/Build/UBNT,$(1),$(2),$(3),$(4),$(5),$(6))
 endef
 
 define Image/Build/Template/UBNT/squashfs
-	$(call Image/Build/Template/UBNT,squashfs,$(1),$(2),$(3),$(4))
+	$(call Image/Build/Template/UBNT,squashfs,$(1),$(2),$(3),$(4),$(5))
+endef
+
+define Image/Build/Template/UBNT/jffs2-64k
+	$(call Image/Build/Template/UBNT,jffs2-64k,$(1),$(2),$(3),$(4),$(5))
+endef
+
+define Image/Build/Template/UBNTXM
+	$(call Image/Build/UBNTXM,$(1),$(2),$(3),$(4),$(5),$(6))
+endef
+
+define Image/Build/Template/UBNTXM/squashfs
+	$(call Image/Build/Template/UBNTXM,squashfs,$(1),$(2),$(3),$(4),$(5))
+endef
+
+define Image/Build/Template/UBNTXM/jffs2-64k
+	$(call Image/Build/Template/UBNTXM,jffs2-64k,$(1),$(2),$(3),$(4),$(5))
 endef
 
 define Image/Build/Template/Planex
@@ -179,71 +347,148 @@ define Image/Build/Template/Planex/squashfs
 	$(call Image/Build/Template/Planex,squashfs,$(1),$(2))
 endef
 
+define Image/Build/Template/Planex/jffs2-64k
+	$(call Image/Build/Template/Planex,jffs2-64k,$(1),$(2))
+endef
+
+define Image/Build/Template/WNDR3700
+	$(call Image/Build/WNDR3700,$(1),$(2),$(3))
+endef
+
+define Image/Build/Template/WNDR3700/squashfs
+	$(call Image/Build/Template/WNDR3700,squashfs,$(1),$(2))
+endef
+
+define Image/Build/Template/WNDR3700/jffs2-64k
+	$(call Image/Build/Template/WNDR3700,jffs2-64k,$(1),$(2))
+endef
+
+define Image/Build/Profile/AP83
+	$(call Image/Build/Template/AP83/$(1),ap83,board=AP83)
+endef
+
 define Image/Build/Profile/WP543
 	$(call Image/Build/Template/Compex/$(1),wp543)
 endef
 
 define Image/Build/Profile/DIR615C1
-	$(call Image/Build/Template/AP81/$(1),dir-615c1,board=TEW-632BRP,"AP81-AR9130-RT-070614-02")
+	$(call Image/Build/Template/Cameo/$(1),dir-615c1,board=TEW-632BRP,"AP81-AR9130-RT-070614-02")
 endef
 
 define Image/Build/Profile/TEW632BRP
-	$(call Image/Build/Template/AP81/$(1),tew-632brp,board=TEW-632BRP,"AP81-AR9130-RT-070614-00")
+	$(call Image/Build/Template/Cameo/$(1),tew-632brp,board=TEW-632BRP,"AP81-AR9130-RT-070614-00")
 endef
 
 define Image/Build/Profile/TEW652BRP
-	$(call Image/Build/Template/AP81/$(1),tew-652brp,board=TEW-632BRP,"AP81-AR9130-RT-080609-05")
+	$(call Image/Build/Template/Cameo/$(1),tew-652brp,board=TEW-632BRP,"AP81-AR9130-RT-080609-05")
 endef
 
 define Image/Build/Profile/A02RBW300N
-	$(call Image/Build/Template/AP81/$(1),a02-rb-w300n,board=TEW-632BRP,"AP81-AR9130-RT-070614-03")
+	$(call Image/Build/Template/Cameo/$(1),a02-rb-w300n,board=TEW-632BRP,"AP81-AR9130-RT-070614-03")
 endef
 
 define Image/Build/Profile/UBNTRS
-	$(call Image/Build/Template/UBNT/$(1),ubnt-rs,board=UBNT-RS,RS,RSx)
+	$(call Image/Build/Template/UBNT/$(1),ubnt-rs,board=UBNT-RS,RS,RSx,ar7100)
+endef
+
+define Image/Build/Profile/UBNTRSPRO
+	$(call Image/Build/Template/UBNT/$(1),ubnt-rspro,board=UBNT-RSPRO,RSPRO,RSPRO,ar7100pro)
 endef
 
 define Image/Build/Profile/UBNTLSSR71
-	$(call Image/Build/Template/UBNT/$(1),ubnt-ls-sr71,board=UBNT-LS-SR71,LS-SR71,LS-SR71)
+	$(call Image/Build/Template/UBNT/$(1),ubnt-ls-sr71,board=UBNT-LS-SR71,LS-SR71,LS-SR71,ar7100)
+endef
+
+define Image/Build/Profile/UBNTBULLETM
+	$(call Image/Build/Template/UBNTXM/$(1),ubnt-bullet-m,board=UBNT-BM,XM,UBNTXM,ar7240)
+endef
+
+define Image/Build/Profile/UBNTROCKETM
+	$(call Image/Build/Template/UBNTXM/$(1),ubnt-rocket-m,board=UBNT-RM,XM,UBNTXM,ar7240)
+endef
+
+define Image/Build/Profile/UBNTNANOM
+	$(call Image/Build/Template/UBNTXM/$(1),ubnt-nano-m,board=UBNT-NM,XM,UBNTXM,ar7240)
+endef
+
+define Image/Build/Profile/UBNT
+	$(call Image/Build/Profile/UBNTRS,$(1))
+	$(call Image/Build/Profile/UBNTRSPRO,$(1))
+	$(call Image/Build/Profile/UBNTLSSR71,$(1))
+	$(call Image/Build/Profile/UBNTBULLETM,$(1))
+	$(call Image/Build/Profile/UBNTROCKETM,$(1))
+	$(call Image/Build/Profile/UBNTNANOM,$(1))
 endef
 
 define Image/Build/Profile/MZKW04NU
 	$(call Image/Build/Template/Planex/$(1),mzk-w04nu,board=MZK-W04NU)
 endef
 
+define Image/Build/Profile/MZKW300NH
+	$(call Image/Build/Template/Planex/$(1),mzk-w300nh,board=MZK-W300NH)
+endef
+
+define Image/Build/Profile/TLWR741NDV1
+	$(call Image/Build/Template/TPLINK4K/$(1),tl-wr741ndv1,board=TL-WR741ND,TL-WR741NDv1)
+endef
+
 define Image/Build/Profile/TLWR841NDV3
 	$(call Image/Build/Template/TPLINK/$(1),tl-wr841ndv3,board=TL-WR941ND,TL-WR841NDv3)
 endef
 
+define Image/Build/Profile/TLWR841NDV5
+	$(call Image/Build/Template/TPLINK4K/$(1),tl-wr841ndv5,board=TL-WR741ND,TL-WR841NDv5)
+endef
+
 define Image/Build/Profile/TLWR941NDV2
 	$(call Image/Build/Template/TPLINK/$(1),tl-wr941ndv2,board=TL-WR941ND,TL-WR941NDv2)
 endef
 
+define Image/Build/Profile/WNDR3700
+	$(call Image/Build/Template/WNDR3700/$(1),wndr3700,board=WNDR3700)
+endef
+
 define Image/Build/Profile/WRT400N
-	$(call Image/Build/Template/Linksys8M/$(1),wrt400n,board=WRT400N)
+	$(call Image/Build/Template/WRT400N/$(1),wrt400n,board=WRT400N)
+endef
+
+define Image/Build/Profile/WRT160NL
+	$(call Image/Build/Template/CyberTAN/$(1),wrt160nl,board=WRT160NL,1.00.01)
 endef
 
 define Image/Build/Profile/Default
+	$(call Image/Build/Profile/AP83,$(1))
 	$(call Image/Build/Profile/A02RBW300N,$(1))
 	$(call Image/Build/Profile/DIR615C1,$(1))
 	$(call Image/Build/Profile/MZKW04NU,$(1))
+	$(call Image/Build/Profile/MZKW300NH,$(1))
 	$(call Image/Build/Profile/TEW632BRP,$(1))
 	$(call Image/Build/Profile/TEW652BRP,$(1))
+	$(call Image/Build/Profile/TLWR741NDV1,$(1))
 	$(call Image/Build/Profile/TLWR841NDV3,$(1))
+	$(call Image/Build/Profile/TLWR841NDV5,$(1))
 	$(call Image/Build/Profile/TLWR941NDV2,$(1))
-	$(call Image/Build/Profile/UBNTRS,$(1))
-	$(call Image/Build/Profile/UBNTLSSR71,$(1))
+	$(call Image/Build/Profile/UBNT,$(1))
 	$(call Image/Build/Profile/WP543,$(1))
+	$(call Image/Build/Profile/WNDR3700,$(1))
 	$(call Image/Build/Profile/WRT400N,$(1))
+	$(call Image/Build/Profile/WRT160NL,$(1))
 endef
 
 define Image/Build/Profile/Madwifi
 	$(call Image/Build/Profile/UBNTRS,$(1))
+	$(call Image/Build/Profile/UBNTRSPRO,$(1))
+	$(call Image/Build/Profile/UBNTLSSR71,$(1))
 	$(call Image/Build/Profile/WP543,$(1))
 endef
 
 define Image/Build/squashfs
 	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
+	dd if=$(KDIR)/root.squashfs of=$(KDIR)/root.squashfs-4k.tmp0 bs=4k conv=sync
+	$(call add_jffs2_mark,$(KDIR)/root.squashfs-4k.tmp0)
+	dd if=$(KDIR)/root.squashfs-4k.tmp0 of=$(IMGNAME)-root.squashfs-4k bs=4k conv=sync
+	$(call add_jffs2_mark,$(IMGNAME)-root.squashfs-4k)
+	rm -f $(KDIR)/root.squashfs-4k.tmp0
 endef
 
 define Image/Build