X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2f9a16818caba770ba29e88bf8686f98bf5f2185..4baa5f5378a559a80ba3834706214ebd2bb2ea04:/target/linux/ar71xx/image/Makefile?ds=inline

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 8b6221841..790dfda0e 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2010 OpenWrt.org
+# Copyright (C) 2008-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -11,6 +11,14 @@ define imgname
 $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
 endef
 
+define sysupname
+$(call imgname,$(1),$(2))-sysupgrade.bin
+endef
+
+define factoryname
+$(call imgname,$(1),$(2))-factory.bin
+endef
+
 VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux
 UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
 fs_squash:=squashfs-only
@@ -44,16 +52,38 @@ define PatchKernelGzip
 	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 \
+define MkuImage
+	mkimage -A mips -O linux -T kernel -a 0x80060000 -C $(1) \
 		-e 0x80060000 -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-		-d $(1) $(2)
+		-d $(2) $(3)
 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)
+define MkuImageLzma
+	$(call PatchKernelLzma,$(1),$(2))
+	$(call MkuImage,lzma,$(KDIR)/vmlinux-$(1).bin.lzma,$(KDIR)/vmlinux-$(1).uImage)
+endef
+
+define MkuImageGzip
+	$(call PatchKernelGzip,$(1),$(2))
+	$(call MkuImage,gzip,$(KDIR)/vmlinux-$(1).bin.gz,$(KDIR)/vmlinux-$(1).uImage)
+endef
+
+define CatFiles
+	if [ `stat -c%s "$(1)"` -gt $(2) ]; then \
+		echo "Warning: $(1) is too big"; \
+	else if [ `stat -c%s $(3)` -gt $(4) ]; then \
+		echo "Warning: $(3) is too big"; \
+	else \
+		( dd if=$(1) bs=$(2) conv=sync; dd if=$(3) ) > $(5); \
+	fi; fi
+endef
+
+define Sysupgrade/KR
+	$(call CatFiles,$(KDIR)/vmlinux-$(2).uImage,$(3),$(KDIR)/root.$(1),$(4),$(call sysupname,$(1),$(2)))
+endef
+
+define Sysupgrade/RK
+	$(call CatFiles,$(KDIR)/root.$(1),$(4),$(KDIR)/vmlinux-$(2).uImage,$(3),$(call sysupname,$(1),$(2)))
 endef
 
 define Image/BuildKernel
@@ -63,175 +93,125 @@ define Image/BuildKernel
 	$(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
-	$(call MkImageGzip,$(KDIR)/vmlinux.bin.gz,$(UIMAGE)-gzip.bin)
-	$(call MkImageLzma,$(KDIR)/vmlinux.bin.lzma,$(UIMAGE)-lzma.bin)
+	$(call MkuImage,gzip,$(KDIR)/vmlinux.bin.gz,$(UIMAGE)-gzip.bin)
+	$(call MkuImage,lzma,$(KDIR)/vmlinux.bin.lzma,$(UIMAGE)-lzma.bin)
 	$(call Image/Build/Initramfs)
 endef
 
 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 \
-		echo "Warning: $(KDIR)/root.$(1) is too big"; \
-	else \
-		mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
-			0x80060000 \
-			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-			-d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
-		( \
-			dd if=$(KDIR)/vmlinux-$(2).uImage bs=1280k conv=sync; \
-			dd if=$(KDIR)/root.$(1) \
-		) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
-		wrt400n $(KDIR)/vmlinux-$(2).uImage $(KDIR)/root.$(1) $(call imgname,$(1),$(2))-factory.bin; \
-	fi; fi
+	$(call MkuImageLzma,$(2),$(3))
+	$(call Sysupgrade/KR,$(1),$(2),1310720,6488064)
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		wrt400n $(KDIR)/vmlinux-$(2).uImage $(KDIR)/root.$(1) $(call factoryname,$(1),$(2)); \
+	fi
 endef
 
 dir825b1_mtdlayout=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,1024k(kernel),5184k(rootfs),64k(caldata)ro,1600k(unknown)ro,6208k@0x50000(firmware)
 define Image/Build/DIR825B1
-	$(call PatchKernelLzma,$(2),$(3) $(dir825b1_mtdlayout))
-	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 1048576 ]; then \
-	        echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
-	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 5308416 ]; then \
-	        echo "Warning: $(KDIR)/root.$(1) is too big"; \
-	else \
-		mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
-			0x80060000 \
-			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-			-d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
-		( \
-			dd if=$(KDIR)/vmlinux-$(2).uImage bs=1024k conv=sync; \
-			dd if=$(KDIR)/root.$(1) \
-		) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
+	$(call MkuImageLzma,$(2),$(3) $(dir825b1_mtdlayout))
+	$(call Sysupgrade/KR,$(1),$(2),1048576,5308416)
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
 		( \
-			dd if=$(call imgname,$(1),$(2))-sysupgrade.bin; \
+			dd if=$(call sysupname,$(1),$(2)); \
 			echo -n "01AP94-AR7161-RT-080619-00"; \
 		) > $(call imgname,$(1),$(2))-backup-loader.bin; \
-		if [ `stat -c%s $(call imgname,$(1),$(2))-sysupgrade.bin` -gt 4194304 ]; then \
-			echo "Warning: $(call imgname,$(1),$(2))-sysupgrade.bin is too big"; \
+		if [ `stat -c%s $(call sysupname,$(1),$(2))` -gt 4194304 ]; then \
+			echo "Warning: $(call sysupname,$(1),$(2)) is too big"; \
 		else \
 			( \
-				dd if=$(call imgname,$(1),$(2))-sysupgrade.bin bs=4096k conv=sync; \
+				dd if=$(call sysupname,$(1),$(2)) bs=4096k conv=sync; \
 				echo -n "00AP94-AR7161-RT-080619-00"; \
-			) > $(call imgname,$(1),$(2))-factory.bin; \
+			) > $(call factoryname,$(1),$(2)); \
 		fi; \
-	fi; fi
+	fi
 endef
 
-define Image/Build/WZRHPG300NH
-	$(call PatchKernelLzma,$(2),$(3))
-	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 1048576 ]; then \
-		echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
-	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 31850496 ]; then \
-	        echo "Warning: $(KDIR)/root.$(1) is too big"; \
-	else \
-		mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
-			0x80060000 \
-			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-			-d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
+define Image/Build/WZRHPG30XNH
+	$(call MkuImageLzma,$(2),$(3))
+	$(call Sysupgrade/KR,$(1),$(2),1048576,31850496)
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
 		( \
-			dd if=$(KDIR)/vmlinux-$(2).uImage bs=1024k conv=sync; \
-			dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
-		) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
+			echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \
+			dd if=$(call sysupname,$(1),$(2)); \
+		) > $(call imgname,$(1),$(2))-tftp.bin; \
+		buffalo-enc -p $(4) -v 1.99 \
+			-i $(call sysupname,$(1),$(2)) \
+			-o $(KDIR)/$(2).enc; \
+		buffalo-tag -b $(4) -p $(4) -a ath -v 1.99 -m 1.01 -l mlang8 \
+			-w 3 -c 0x80041000 -d 0x801e8000 -f 1 -r M_ \
+			-i $(KDIR)/$(2).enc \
+			-o $(call factoryname,$(1),$(2)); \
+	fi
+endef
+
+define Image/Build/WHRHPG300N
+	$(call MkuImageLzma,$(2),$(3) $($(4)))
+	$(call Sysupgrade/KR,$(1),$(2),917504,2883584)
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
 		( \
 			echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \
-			dd if=$(call imgname,$(1),$(2))-sysupgrade.bin; \
+			dd if=$(call sysupname,$(1),$(2)); \
 		) > $(call imgname,$(1),$(2))-tftp.bin; \
-	fi; fi
+		buffalo-enc -p $(5) -v 1.99 \
+			-i $(call sysupname,$(1),$(2)) \
+			-o $(KDIR)/$(2).enc; \
+		buffalo-tag -b $(5) -p $(5) -a ath -v 1.99 -m 1.01 -l mlang8 \
+			-w 3 -c 0x80041000 -d 0x801e8000 -f 1 -r M_ \
+			-i $(KDIR)/$(2).enc \
+			-o $(call factoryname,$(1),$(2)); \
+	fi
 endef
 
-cameo_mtdlayout=mtdparts=spi0.0:128k(u-boot)ro,64k(config)ro,896k(kernel),2944k(rootfs),64k(art)ro,3840k@0x30000(firmware)
 define Image/Build/Cameo
-	$(call PatchKernelLzma,$(2),$(3) $(cameo_mtdlayout))
-	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 917504 ]; then \
-		echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
-	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 2949120 ]; then \
-		echo "Warning: $(KDIR)/root.$(1) is too big"; \
-	else \
-		mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
-			0x80060000 \
-			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-			-d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
+	$(call MkuImageLzma,$(2),$(3) $($(4)))
+	$(call Sysupgrade/KR,$(1),$(2),$(5),$(6))
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
 		( \
-			dd if=$(KDIR)/vmlinux-$(2).uImage bs=896k conv=sync; \
-			dd if=$(KDIR)/root.$(1) \
-		) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
-		( \
-			dd if=$(KDIR)/vmlinux-$(2).uImage bs=896k conv=sync; \
-			dd if=$(KDIR)/root.$(1) bs=2880k conv=sync; \
-			echo -n $(4); \
-		) > $(call imgname,$(1),$(2))-factory.bin; \
-	fi; fi
+			dd if=$(KDIR)/vmlinux-$(2).uImage bs=$(5) conv=sync; \
+			dd if=$(KDIR)/root.$(1) bs=$(6) conv=sync; \
+			echo -n $(7); \
+		) > $(call factoryname,$(1),$(2)); \
+	fi
+endef
+
+cameo913x_mtdlayout=mtdparts=spi0.0:128k(u-boot)ro,64k(config)ro,896k(kernel),2944k(rootfs),64k(art)ro,3840k@0x30000(firmware)
+define Image/Build/Cameo913x
+	$(call Image/Build/Cameo,$(1),$(2),$(3),$(cameo913x_mtdlayout),917504,2949120,$(4))
 endef
 
 cameo7240_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(nvram)ro,896k(kernel),2816k(rootfs),64k(mac)ro,64k(art)ro,3712k@0x40000(firmware)
 define Image/Build/Cameo7240
-	$(call PatchKernelLzma,$(2),$(3) $(cameo7240_mtdlayout))
-	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 917504 ]; then \
-		echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
-	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 2818048 ]; then \
-		echo "Warning: $(KDIR)/root.$(1) is too big"; \
-	else \
-		mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
-			0x80060000 \
-			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-			-d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
-		( \
-			dd if=$(KDIR)/vmlinux-$(2).uImage bs=896k conv=sync; \
-			dd if=$(KDIR)/root.$(1) \
-		) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
-		( \
-			dd if=$(KDIR)/vmlinux-$(2).uImage bs=896k conv=sync; \
-			dd if=$(KDIR)/root.$(1) bs=2752k conv=sync; \
-			echo -n $(4); \
-		) > $(call imgname,$(1),$(2))-factory.bin; \
-	fi; fi
+	$(call Image/Build/Cameo,$(1),$(2),$(3),$(cameo7240_mtdlayout),917504,2818048,$(4))
 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; \
+define Image/Build/Ath
+	$(call Sysupgrade/$(7),$(1),$(2),$(5),$(6))
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
 		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))-sysupgrade.bin; \
-	fi; fi
+	fi
 endef
 
-define Image/Build/PB92
-	$(call PatchKernelLzma,$(2),$(3))
-	if [ `stat -c%s $(KDIR)/vmlinux-$(2).bin.lzma` -gt 917504 ]; then \
-		echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
-	elif [ `stat -c%s $(KDIR)/root.$(1)` -gt 2818048 ]; then \
-		echo "Warning: $(KDIR)/root.$(1) is too big"; \
-	else \
-		mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
-			0x80060000 \
-			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-			-d $(KDIR)/vmlinux-$(2).bin.lzma \
-			$(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=896k conv=sync; \
-			dd if=$(KDIR)/root.$(1); \
-		) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
-	fi
+define Image/Build/AthGzip
+	$(call MkuImageGzip,$(2),$(3) $($(4)))
+	$(call Image/Build/Ath,$(1),$(2),$(3),$(4),$(5),$(6),$(7))
+endef
+
+define Image/Build/AthGzip/initramfs
+	$(call MkuImageLzma,$(2),$(3) $($(4)))
+	$(CP) $(KDIR)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin
+endef
+
+define Image/Build/AthLzma
+	$(call MkuImageLzma,$(2),$(3) $($(4)))
+	$(call Image/Build/Ath,$(1),$(2),$(3),$(4),$(5),$(6),$(7))
+endef
+
+define Image/Build/AthLzma/initramfs
+	$(call MkuImageLzma,$(2),$(3) $($(4)))
+	$(CP) $(KDIR)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin
 endef
 
 define Image/Build/PB4X
@@ -243,9 +223,10 @@ define Image/Build/PB4X
 	-sh $(TOPDIR)/scripts/combined-image.sh \
 		"$(call imgname,kernel,$(2)).bin" \
 		"$(call imgname,$(1),$(2)-rootfs).bin" \
-		$(call imgname,$(1),$(2))-sysupgrade.bin
+		$(call sysupname,$(1),$(2))
 endef
 
+
 define Image/Build/MyLoader
 	-$(STAGING_DIR_HOST)/bin/mkmylofw -B $(2) -s $(3) \
 		-p0x030000:0xe0000:al:0x80060000:kernel:$(KDIR)/vmlinux.bin.lzma \
@@ -255,18 +236,14 @@ 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
+	$(call MkuImageLzma,$(2),$(3) $(ubntxm_mtdlayout))
+	$(call Sysupgrade/KR,$(1),$(2),1048576,6684672)
+	dd if=$(KDIR)/vmlinux-$(2).uImage of=$(KDIR)/vmlinux-$(2).uImage.bin bs=1024k conv=sync
 	-$(STAGING_DIR_HOST)/bin/mkfwimage \
 		-B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \
-		-k $(KDIR)/vmlinux-$(2).uImage \
+		-k $(KDIR)/vmlinux-$(2).uImage.bin \
 		-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
-		-o $(call imgname,$(1),$(2))-factory.bin
-	( \
-		dd if=$(KDIR)/vmlinux-$(2).uImage; \
-		dd if=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1); \
-	) > $(call imgname,$(1),$(2))-sysupgrade.bin
+		-o $(call factoryname,$(1),$(2))
 endef
 
 define Image/Build/UBNT
@@ -276,34 +253,23 @@ define Image/Build/UBNT
 		-B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \
 		-k $(KDIR)/vmlinux-$(2).lzma \
 		-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
-		-o $(call imgname,$(1),$(2))-factory.bin
+		-o $(call factoryname,$(1),$(2))
 	-sh $(TOPDIR)/scripts/combined-image.sh \
 		"$(KDIR)/vmlinux-$(2).lzma" \
 		"$(BIN_DIR)/$(IMG_PREFIX)-root.$(1)" \
-		$(call imgname,$(1),$(2))-sysupgrade.bin
+  $(call sysupname,$(1),$(2))
 endef
 
 define Image/Build/Planex
-	$(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.gz $(KDIR)/vmlinux-$(2).uImage; \
-		( \
-			dd if=$(KDIR)/vmlinux-$(2).uImage bs=1408k conv=sync; \
-			dd if=$(KDIR)/root.$(1); \
-		) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
+	$(call MkuImageGzip,$(2),$(3))
+	$(call Sysupgrade/KR,$(1),$(2),1441792,6356992)
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
 		$(STAGING_DIR_HOST)/bin/mkplanexfw \
 			-B $(2) \
 			-v 2.00.00 \
-			-i $(call imgname,$(1),$(2))-sysupgrade.bin \
-			-o $(call imgname,$(1),$(2))-factory.bin; \
-	fi; fi
+			-i $(call sysupname,$(1),$(2)) \
+			-o $(call factoryname,$(1),$(2)); \
+	fi
 endef
 
 define Image/Build/TPLINK
@@ -312,12 +278,12 @@ define Image/Build/TPLINK
 		-B $(4) -N OpenWrt -V $(REVISION)\
 		-k $(KDIR)/vmlinux-$(2).bin.gz \
 		-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
-		-o $(call imgname,$(1),$(2))-factory.bin
+		-o $(call factoryname,$(1),$(2))
 	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
 		-B $(4) -N OpenWrt -V $(REVISION) -s \
 		-k $(KDIR)/vmlinux-$(2).bin.gz \
 		-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
-		-o $(call imgname,$(1),$(2))-sysupgrade.bin
+		-o $(call sysupname,$(1),$(2))
 endef
 
 define Image/Build/TPLINK/initramfs
@@ -328,23 +294,35 @@ define Image/Build/TPLINK/initramfs
 		-o $(call imgname,$(1),$(2))-uImage.bin
 endef
 
+define Image/Build/TPLINK-LZMA
+	$(call PatchKernelLzma,$(2),$(3))
+	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
+		-B $(4) -N OpenWrt -V $(REVISION)\
+		-k $(KDIR)/vmlinux-$(2).bin.lzma \
+		-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
+		-o $(call factoryname,$(1),$(2))
+	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
+		-B $(4) -N OpenWrt -V $(REVISION) -s \
+		-k $(KDIR)/vmlinux-$(2).bin.lzma \
+		-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
+		-o $(call sysupname,$(1),$(2))
+endef
+
 define Image/Build/CyberTAN
-	$(call PatchKernelGzip,$(2),$(3))
-	$(call MkImageGzip,$(KDIR)/vmlinux-$(2).bin.gz,$(KDIR)/vmlinux-$(2).uImage)
+	$(call MkuImageGzip,$(2),$(3))
 	$(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/image.tmp -f $(KDIR)/vmlinux-$(2).uImage \
 		-x 32 -a 0x10000 -x -32 -f $(KDIR)/root.$(1)
 	-$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(4) \
 		-i $(KDIR)/image.tmp \
-		-o $(call imgname,$(1),$(2))-sysupgrade.bin
+		-o $(call sysupname,$(1),$(2))
 	-$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(4) -g \
 		-i $(KDIR)/image.tmp \
-		-o $(call imgname,$(1),$(2))-factory.bin
+		-o $(call factoryname,$(1),$(2))
 	rm $(KDIR)/image.tmp
 endef
 
 define Image/Build/Netgear
-	$(call PatchKernelLzma,$(2),$(3) $($(4)))
-	$(call MkImageLzma,$(KDIR)/vmlinux-$(2).bin.lzma,$(KDIR)/vmlinux-$(2).uImage)
+	$(call MkuImageLzma,$(2),$(3) $($(4)))
 	mkdir -p $(KDIR)/wndr3700/image
 	$(STAGING_DIR_HOST)/bin/wndr3700 \
 		$(KDIR)/vmlinux-$(2).uImage \
@@ -367,20 +345,18 @@ define Image/Build/Netgear
 	( \
 		dd if=$(KDIR)/vmlinux-$(2).uImage.squashfs bs=1024k conv=sync; \
 		dd if=$(KDIR)/root.$(1) bs=64k; \
-	) > $(call imgname,$(1),$(2))-sysupgrade.bin
-	$(STAGING_DIR_HOST)/bin/mkdniimg \
-		-B $(6) -v OpenWrt.$(REVISION) \
-		-i $(call imgname,$(1),$(2))-sysupgrade.bin \
-		-o $(call imgname,$(1),$(2))-factory.img
-	$(STAGING_DIR_HOST)/bin/mkdniimg \
-		-B $(6) -v OpenWrt.$(REVISION) -r "NA" \
-		-i $(call imgname,$(1),$(2))-sysupgrade.bin \
-		-o $(call imgname,$(1),$(2))-factory-NA.img
+	) > $(call sysupname,$(1),$(2))
+	for r in $(7) ; do \
+		[ -n "$$$$r" ] && dashr="-$$$$r" || dashr= ; \
+		$(STAGING_DIR_HOST)/bin/mkdniimg \
+			-B $(6) -v OpenWrt.$(REVISION) -r "$$$$r" $(8) \
+			-i $(call sysupname,$(1),$(2)) \
+			-o $(call imgname,$(1),$(2))-factory$$$$dashr.img; \
+	done
 endef
 
 define Image/Build/Netgear/initramfs
-	$(call PatchKernelLzma,$(2),$(3) $($(4)))
-	$(call MkImageLzma,$(KDIR)/vmlinux-$(2).bin.lzma,$(KDIR)/vmlinux-$(2).uImage)
+	$(call MkuImageLzma,$(2),$(3) $($(4)))
 	$(STAGING_DIR_HOST)/bin/wndr3700 \
 		$(KDIR)/vmlinux-$(2).uImage \
 		$(call imgname,$(1),$(2))-uImage.bin \
@@ -389,101 +365,122 @@ endef
 
 ifdef CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh
   define Image/Build/ZyXEL
-	$(call PatchKernelLzma,$(2),$(3))
-	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 917504 ]; then \
-		echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
-	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 2752512 ]; then \
-		echo "Warning: $(KDIR)/root.$(1) is too big"; \
-	else \
-		mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
-			0x80060000 \
-			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-			-d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
-		( \
-			dd if=$(KDIR)/vmlinux-$(2).uImage bs=896k conv=sync; \
-			dd if=$(KDIR)/root.$(1); \
-		) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
-		$(STAGING_DIR_HOST)/bin/mkzynfw \
-			-B $(4) \
-			-b $(BIN_DIR)/$(IMG_PREFIX)-$(2)-u-boot.bin \
-			-r $(call imgname,$(1),$(2))-sysupgrade.bin:0x10000 \
-			-o $(call imgname,$(1),$(2))-factory.bin; \
+	$(call MkuImageLzma,$(2),$(3))
+	$(call Sysupgrade/KR,$(1),$(2),917504,2752512)
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		if [ ! -f $(BIN_DIR)/$(IMG_PREFIX)-$(2)-u-boot.bin ]; then \
+			echo "Warning: $(IMG_PREFIX)-$(2)-u-boot.bin not found"; \
+		else \
+			$(STAGING_DIR_HOST)/bin/mkzynfw \
+				-B $(4) \
+				-b $(BIN_DIR)/$(IMG_PREFIX)-$(2)-u-boot.bin \
+				-r $(call sysupname,$(1),$(2)):0x10000 \
+				-o $(call factoryname,$(1),$(2)); \
 	fi; fi
   endef
 endif
 
 define Image/Build/Zcomax
-	$(call PatchKernelLzma,$(2),$(3))
-	$(call MkImageLzma,$(KDIR)/vmlinux-$(2).bin.lzma,$(KDIR)/vmlinux-$(2).uImage.bin)
-	-$(STAGING_DIR_HOST)/bin/mkzcfw \
-		-B $(2) \
-		-k $(KDIR)/vmlinux-$(2).uImage.bin \
-		-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
-		-o $(call imgname,$(1),$(2))-factory.img
-	( \
-		dd if=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=6208k count=1 conv=sync; \
-		dd if=$(KDIR)/vmlinux-$(2).uImage.bin bs=1472k count=1; \
-	) > $(call imgname,$(1),$(2))-sysupgrade.bin
+	$(call MkuImageLzma,$(2),$(3))
+	$(call Sysupgrade/RK,$(1),$(2),1507328,6356992)
+	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
+		$(STAGING_DIR_HOST)/bin/mkzcfw \
+			-B $(2) \
+			-k $(KDIR)/vmlinux-$(2).uImage \
+			-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
+			-o $(call imgname,$(1),$(2))-factory.img; \
+	fi
 endef
 
 define Image/Build/Template/initramfs/initramfs
-	$(call Image/Build/$(1)/initramfs,initramfs,$(2),$(3),$(4),$(5),$(6),$(7))
+	$(call Image/Build/$(1)/initramfs,initramfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/all/squashfs
-	$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7))
+	$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/all/jffs2-64k
-	$(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7))
+	$(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/all/jffs2-128k
-	$(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7))
+	$(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/squashfs-only/squashfs
-	$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7))
+	$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/4k/squashfs
-	$(call Image/Build/$(1),squashfs-4k,$(2),$(3),$(4),$(5),$(6),$(7))
+	$(call Image/Build/$(1),squashfs-4k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/64k/squashfs
-	$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7))
+	$(call Image/Build/$(1),squashfs-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/64k/jffs2-64k
-	$(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7))
+	$(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/128k/squashfs
-	$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7))
+	$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/128k/jffs2-128k
-	$(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7))
+	$(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
+endef
+
+
+ap121_mtdlayout_2M=mtdparts=spi0.0:64k(u-boot)ro,1216k(rootfs),704k(kernel),64k(art)ro,1920k@0x10000(firmware)
+ap121_mtdlayout_4M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,2752k(rootfs),896k(kernel),64k(nvram),64k(art)ro,3648k@0x50000(firmware)
+
+ap121_cmdline=board=AP121 console=ttyATH0,115200
+define Image/Build/Profile/AP121
+	$(call Image/Build/Template/$(fs_4k)/$(1),AthLzma,ap121-2M,$(ap121_cmdline),ap121_mtdlayout_2M,720896,1245184,RK)
+	$(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-4M,$(ap121_cmdline),ap121_mtdlayout_4M,917504,2818048,RK)
 endef
 
+ap121_mini_cmdline=board=AP121-MINI console=ttyATH0,115200
+define Image/Build/Profile/AP121MINI
+	$(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-mini,$(ap121_mini_cmdline),ap121_mtdlayout_4M,917504,2818048,RK)
+endef
+
+ap81_cmdline=board=AP81 console=ttyS0,115200
 define Image/Build/Profile/AP81
-	$(call Image/Build/Template/$(fs_64k)/$(1),AP83,ap81,board=AP81)
+	$(call Image/Build/Template/$(fs_64k)/$(1),AthGzip,ap81,$(ap81_cmdline),,1310720,6619136,KR)
 endef
 
+ap83_cmdline=board=AP83 console=ttyS0,115200
 define Image/Build/Profile/AP83
-	$(call Image/Build/Template/$(fs_64k)/$(1),AP83,ap83,board=AP83)
+	$(call Image/Build/Template/$(fs_64k)/$(1),AthGzip,ap83,$(ap83_cmdline),,1310720,6619136,KR)
+endef
+
+ap96_cmdline=board=AP96 console=ttyS0,115200
+define Image/Build/Profile/AP96
+	$(call Image/Build/Template/$(fs_64k)/$(1),AthGzip,ap96,$(ap96_cmdline),ap96_mtdlayout,1769472,6291456,RK)
+endef
+
+db120_cmdline=board=DB120 console=ttyS0,115200
+db120_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6336k(rootfs),1408k(kernel),64k(nvram),64k(art)ro,7744k@0x50000(firmware)
+define Image/Build/Profile/DB120
+	$(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,db120,$(db120_cmdline),db120_mtdlayout,1441792,6488064,RK)
 endef
 
+pb42_cmdline=board=PB42 console=ttyS0,115200
 define Image/Build/Profile/PB42
-	$(call Image/Build/Template/$(fs_64k)/$(1),PB4X,pb42,board=PB42)
+	$(call Image/Build/Template/$(fs_64k)/$(1),PB4X,pb42,$(pb42_cmdline))
 endef
 
+pb44_cmdline=board=PB44 console=ttyS0,115200
 define Image/Build/Profile/PB44
-	$(call Image/Build/Template/$(fs_64k)/$(1),PB4X,pb44,board=PB44)
+	$(call Image/Build/Template/$(fs_64k)/$(1),PB4X,pb44,$(pb44_cmdline))
 endef
 
+pb92_cmdline=board=PB92 console=ttyS0,115200
 define Image/Build/Profile/PB92
-	$(call Image/Build/Template/$(fs_64k)/$(1),PB92,pb92,board=PB92)
+	$(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,pb92,$(pb92_cmdline),,917504,2818048,KR)
 endef
 
 define Image/Build/Profile/WP543
@@ -493,69 +490,85 @@ define Image/Build/Profile/WP543
 	$(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,0x1000000,16M)
 endef
 
+dir600a1_cmdline=board=DIR-600-A1 console=ttyS0,115200
 define Image/Build/Profile/DIR600A1
-	$(call Image/Build/Template/$(fs_64k)/$(1),Cameo7240,dir-600-a1,board=DIR-600-A1,"AP91-AR7240-RT-090223-00")
+	$(call Image/Build/Template/$(fs_64k)/$(1),Cameo7240,dir-600-a1,$(dir600a1_cmdline),"AP91-AR7240-RT-090223-00")
 endef
 
+eap7660d_cmdline=board=EAP7660D console=ttyS0,115200
 define Image/Build/Profile/EAP7660D
-	$(call Image/Build/Template/$(fs_128k)/$(1),PB4X,eap7660d,board=EAP7660D)
+	$(call Image/Build/Template/$(fs_128k)/$(1),PB4X,eap7660d,$(eap7660d_cmdline))
 endef
 
+ja76pf_cmdline=board=JA76PF console=ttyS0,115200
 define Image/Build/Profile/JA76PF
-	$(call Image/Build/Template/$(fs_64k)/$(1),PB4X,ja76pf,board=JA76PF)
+	$(call Image/Build/Template/$(fs_64k)/$(1),PB4X,ja76pf,$(ja76pf_cmdline))
 endef
 
+jwap003_cmdline=board=JWAP003 console=ttyS0,115200
 define Image/Build/Profile/JWAP003
-	$(call Image/Build/Template/$(fs_64k)/$(1),PB4X,jwap003,board=JWAP003)
+	$(call Image/Build/Template/$(fs_64k)/$(1),PB4X,jwap003,$(jwap003_cmdline))
 endef
 
+fr54rtr_cmdline=board=DIR-600-A1 console=ttyS0,115200
 define Image/Build/Profile/FR54RTR
-	$(call Image/Build/Template/$(fs_64k)/$(1),Cameo7240,fr-54rtr,board=DIR-600-A1,"AP91-AR7240-RT-090223-01")
+	$(call Image/Build/Template/$(fs_64k)/$(1),Cameo7240,fr-54rtr,$(fr54rtr_cmdline),"AP91-AR7240-RT-090223-01")
 endef
 
+dir615c1_cmdline=board=DIR-615-C1 console=ttyS0,115200
 define Image/Build/Profile/DIR615C1
-	$(call Image/Build/Template/$(fs_squash)/$(1),Cameo,dir-615-c1,board=DIR-615-C1,"AP81-AR9130-RT-070614-02")
+	$(call Image/Build/Template/$(fs_squash)/$(1),Cameo913x,dir-615-c1,$(dir615c1_cmdline),"AP81-AR9130-RT-070614-02")
 endef
 
+tew632brp_cmdline=board=TEW-632BRP console=ttyS0,115200
 define Image/Build/Profile/TEW632BRP
-	$(call Image/Build/Template/$(fs_squash)/$(1),Cameo,tew-632brp,board=TEW-632BRP,"AP81-AR9130-RT-070614-00")
+	$(call Image/Build/Template/$(fs_squash)/$(1),Cameo913x,tew-632brp,$(tew632brp_cmdline),"AP81-AR9130-RT-070614-00")
 endef
 
+tew652brp_cmdline=board=TEW-632BRP console=ttyS0,115200
 define Image/Build/Profile/TEW652BRP
-	$(call Image/Build/Template/$(fs_squash)/$(1),Cameo,tew-652brp,board=TEW-632BRP,"AP81-AR9130-RT-080609-05")
-	$(call Image/Build/Template/$(fs_squash)/$(1),Cameo,tew-652brp-recovery,board=TEW-632BRP,"AP81-AR9130-RT-070614-02")
+	$(call Image/Build/Template/$(fs_squash)/$(1),Cameo913x,tew-652brp,$(tew652brp_cmdline),"AP81-AR9130-RT-080609-05")
+	$(call Image/Build/Template/$(fs_squash)/$(1),Cameo913x,tew-652brp-recovery,$(tew652brp_cmdline),"AP81-AR9130-RT-070614-02")
 endef
 
+a05rbw300n_cmdline=board=TEW-632BRP console=ttyS0,115200
 define Image/Build/Profile/A02RBW300N
-	$(call Image/Build/Template/$(fs_squash)/$(1),Cameo,a02-rb-w300n,board=TEW-632BRP,"AP81-AR9130-RT-070614-03")
+	$(call Image/Build/Template/$(fs_squash)/$(1),Cameo913x,a02-rb-w300n,$(a05rbw300n_cmdline),"AP81-AR9130-RT-070614-03")
 endef
 
+ubntrs_cmdline=board=UBNT-RS console=ttyS0,115200
 define Image/Build/Profile/UBNTRS
-	$(call Image/Build/Template/$(fs_64k)/$(1),UBNT,ubnt-rs,board=UBNT-RS,RS,RSx,ar7100)
+	$(call Image/Build/Template/$(fs_64k)/$(1),UBNT,ubnt-rs,$(ubntrs_cmdline),RS,RSx,ar7100)
 endef
 
+ubntrspro_cmdline=board=UBNT-RSPRO console=ttyS0,115200
 define Image/Build/Profile/UBNTRSPRO
-	$(call Image/Build/Template/$(fs_64k)/$(1),UBNT,ubnt-rspro,board=UBNT-RSPRO,RSPRO,RSPRO,ar7100pro)
+	$(call Image/Build/Template/$(fs_64k)/$(1),UBNT,ubnt-rspro,$(ubntrspro_cmdline),RSPRO,RSPRO,ar7100pro)
 endef
 
+ubntlssr71_cmdline=board=UBNT-LS-SR71 console=ttyS0,115200
 define Image/Build/Profile/UBNTLSSR71
-	$(call Image/Build/Template/$(fs_64k)/$(1),UBNT,ubnt-ls-sr71,board=UBNT-LS-SR71,LS-SR71,LS-SR71,ar7100)
+	$(call Image/Build/Template/$(fs_64k)/$(1),UBNT,ubnt-ls-sr71,$(ubntlssr71_cmdline),LS-SR71,LS-SR71,ar7100)
 endef
 
+ubntbulletm_cmdline=board=UBNT-BM console=ttyS0,115200
 define Image/Build/Profile/UBNTBULLETM
-	$(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-bullet-m,board=UBNT-BM,XM,UBNTXM,ar7240)
+	$(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-bullet-m,$(ubntbulletm_cmdline),XM,UBNTXM,ar7240)
 endef
 
+ubntrocketm_cmdline=board=UBNT-RM console=ttyS0,115200
 define Image/Build/Profile/UBNTROCKETM
-	$(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-rocket-m,board=UBNT-RM,XM,UBNTXM,ar7240)
+	$(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-rocket-m,$(ubntrocketm_cmdline),XM,UBNTXM,ar7240)
 endef
 
+ubntnanom_cmdline=board=UBNT-NM console=ttyS0,115200
 define Image/Build/Profile/UBNTNANOM
-	$(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-nano-m,board=UBNT-NM,XM,UBNTXM,ar7240)
+	$(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-nano-m,$(ubntnanom_cmdline),XM,UBNTXM,ar7240)
 endef
 
+ubntunifi_cmdline=board=UBNT-XM console=ttyS0,115200
 define Image/Build/Profile/UBNTUNIFI
-	$(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-unifi,board=UBNT-XM,XM,UBNTXM,ar7240)
+	$(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-unifi,$(ubntunifi_cmdline),XM,UBNTXM,ar7240)
 endef
 
 define Image/Build/Profile/UBNT
@@ -568,109 +581,185 @@ define Image/Build/Profile/UBNT
 	$(call Image/Build/Profile/UBNTUNIFI,$(1))
 endef
 
+mzkw04nu_cmdline=board=MZK-W04NU console=ttyS0,115200
 define Image/Build/Profile/MZKW04NU
-	$(call Image/Build/Template/$(fs_64k)/$(1),Planex,mzk-w04nu,board=MZK-W04NU)
+	$(call Image/Build/Template/$(fs_64k)/$(1),Planex,mzk-w04nu,$(mzkw04nu_cmdline))
 endef
 
+mzkw300nh_cmdline=board=MZK-W300NH console=ttyS0,115200
 define Image/Build/Profile/MZKW300NH
-	$(call Image/Build/Template/$(fs_64k)/$(1),Planex,mzk-w300nh,board=MZK-W300NH)
+	$(call Image/Build/Template/$(fs_64k)/$(1),Planex,mzk-w300nh,$(mzkw300nh_cmdline))
 endef
 
+nbg460n_cmdline=board=NBG460N console=ttyS0,115200
 define Image/Build/Profile/NBG_460N_550N_550NH
-	$(call Image/Build/Template/$(fs_64k)/$(1),ZyXEL,nbg460n_550n_550nh,board=NBG460N,NBG-460N)
+	$(call Image/Build/Template/$(fs_64k)/$(1),ZyXEL,nbg460n_550n_550nh,$(nbg460n_cmdline),NBG-460N)
 endef
 
+tlmr3220_cmdline=board=TL-MR3220 console=ttyS0,115200
 define Image/Build/Profile/TLMR3220V1
-	$(call Image/Build/Template/$(fs_4k)/$(1),TPLINK,tl-mr3220-v1,board=TL-MR3220,TL-MR3220v1)
+	$(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-mr3220-v1,$(tlmr3220_cmdline),TL-MR3220v1)
 endef
 
+tlmr3420_cmdline=board=TL-MR3420 console=ttyS0,115200
 define Image/Build/Profile/TLMR3420V1
-	$(call Image/Build/Template/$(fs_4k)/$(1),TPLINK,tl-mr3420-v1,board=TL-MR3420,TL-MR3420v1)
+	$(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-mr3420-v1,$(tlmr3420_cmdline),TL-MR3420v1)
 endef
 
+tlwa901nd_cmdline=board=TL-WA901ND console=ttyS0,115200
 define Image/Build/Profile/TLWA901NDV1
-	$(call Image/Build/Template/$(fs_4k)/$(1),TPLINK,tl-wa901nd-v1,board=TL-WA901ND,TL-WA901NDv1)
+	$(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wa901nd-v1,$(tlwa901nd_cmdline),TL-WA901NDv1)
+endef
+
+tlwa901ndv2_cmdline=board=TL-WA901ND-v2 console=ttyS0,115200
+define Image/Build/Profile/TLWA901NDV2
+	$(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wa901nd-v2,$(tlwa901ndv2_cmdline),TL-WA901NDv2)
 endef
 
+tlwr741ndv1_cmdline=board=TL-WR741ND console=ttyS0,115200
 define Image/Build/Profile/TLWR741NDV1
-	$(call Image/Build/Template/$(fs_4k)/$(1),TPLINK,tl-wr741nd-v1,board=TL-WR741ND,TL-WR741NDv1)
+	$(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr741nd-v1,$(tlwr741ndv1_cmdline),TL-WR741NDv1)
+endef
+
+tlwr741ndv4_cmdline=board=TL-WR741ND-v4 console=ttyATH0,115200
+define Image/Build/Profile/TLWR741NDV4
+	$(call Image/Build/Template/$(fs_64k)/$(1),TPLINK-LZMA,tl-wr741nd-v4,$(tlwr741ndv4_cmdline),TL-WR741NDv4)
 endef
 
+tlwr740nv1_cmdline=board=TL-WR741ND console=ttyS0,115200
 define Image/Build/Profile/TLWR740NV1
-	$(call Image/Build/Template/$(fs_4k)/$(1),TPLINK,tl-wr740n-v1,board=TL-WR741ND,TL-WR740Nv1)
+	$(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr740n-v1,$(tlwr740nv1_cmdline),TL-WR740Nv1)
+endef
+
+tlwr740nv3_cmdline=board=TL-WR741ND console=ttyS0,115200
+define Image/Build/Profile/TLWR740NV3
+	$(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr740n-v3,$(tlwr740nv3_cmdline),TL-WR740Nv3)
+endef
+
+define Image/Build/Profile/TLWR743NDV1
+	$(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr743nd-v1,$(tlwr741ndv1_cmdline),TL-WR743NDv1)
 endef
 
+tlwr841nv15_cmdline=board=TL-WR841N-v1.5 console=ttyS0,115200
 define Image/Build/Profile/TLWR841NV15
-	$(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr841n-v1.5,board=TL-WR841N-v1.5,TL-WR841Nv1.5)
+	$(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr841n-v1.5,$(tlwr841nv15_cmdline),TL-WR841Nv1.5)
 endef
 
+tlwr841ndv3_cmdline=board=TL-WR941ND console=ttyS0,115200
 define Image/Build/Profile/TLWR841NDV3
-	$(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr841nd-v3,board=TL-WR941ND,TL-WR841NDv3)
+	$(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr841nd-v3,$(tlwr841ndv3_cmdline),TL-WR841NDv3)
 endef
 
+tlwr841ndv5_cmdline=board=TL-WR741ND console=ttyS0,115200
 define Image/Build/Profile/TLWR841NDV5
-	$(call Image/Build/Template/$(fs_4k)/$(1),TPLINK,tl-wr841nd-v5,board=TL-WR741ND,TL-WR841NDv5)
+	$(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr841nd-v5,$(tlwr841ndv5_cmdline),TL-WR841NDv5)
 endef
 
+tlwr841ndv7_cmdline=board=TL-WR741ND console=ttyS0,115200
 define Image/Build/Profile/TLWR841NDV7
-	$(call Image/Build/Template/$(fs_4k)/$(1),TPLINK,tl-wr841nd-v7,board=TL-WR741ND,TL-WR841NDv7)
+	$(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr841nd-v7,$(tlwr841ndv7_cmdline),TL-WR841NDv7)
 endef
 
+tlwr941ndv2_cmdline=board=TL-WR941ND console=ttyS0,115200
 define Image/Build/Profile/TLWR941NDV2
-	$(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr941nd-v2,board=TL-WR941ND,TL-WR941NDv2)
+	$(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr941nd-v2,$(tlwr941ndv2_cmdline),TL-WR941NDv2)
 endef
 
+tlwr941ndv3_cmdline=board=TL-WR941ND console=ttyS0,115200
 define Image/Build/Profile/TLWR941NDV3
-	$(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr941nd-v3,board=TL-WR941ND,TL-WR941NDv2)
+	$(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr941nd-v3,$(tlwr941ndv3_cmdline),TL-WR941NDv2)
 endef
 
+tlwr941ndv4_cmdline=board=TL-WR741ND console=ttyS0,115200
 define Image/Build/Profile/TLWR941NDV4
-	$(call Image/Build/Template/$(fs_4k)/$(1),TPLINK,tl-wr941nd-v4,board=TL-WR741ND,TL-WR941NDv4)
+	$(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr941nd-v4,$(tlwr941ndv4_cmdline),TL-WR941NDv4)
 endef
 
+tlwr1043nd_cmdline=board=TL-WR1043ND console=ttyS0,115200
 define Image/Build/Profile/TLWR1043NDV1
-	$(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr1043nd-v1,board=TL-WR1043ND,TL-WR1043NDv1)
+	$(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr1043nd-v1,$(tlwr1043nd_cmdline),TL-WR1043NDv1)
 endef
 
+tlwr703n_cmdline=board=TL-WR703N console=ttyATH0,115200
+define Image/Build/Profile/TLWR703NV1
+	$(call Image/Build/Template/$(fs_64k)/$(1),TPLINK-LZMA,tl-wr703n-v1,$(tlwr703n_cmdline),TL-WR703Nv1)
+endef
+
+wndr3700_cmdline=board=WNDR3700 console=ttyS0,115200
 wndr3700_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),6656k(rootfs),64k(art)ro,7680k@0x70000(firmware)
+wndr3700v2_cmdline=board=WNDR3700v2 console=ttyS0,115200
 wndr3700v2_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),14848k(rootfs),64k(art)ro,15872k@0x70000(firmware)
+wndr3800_cmdline=board=WNDR3800 console=ttyS0,115200
 define Image/Build/Profile/WNDR3700
-	$(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700,board=WNDR3700,wndr3700_mtdlayout,3700,WNDR3700)
-	$(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700v2,board=WNDR3700v2,wndr3700v2_mtdlayout,3701,WNDR3700v2)
-endef
-
-define Image/Build/Profile/AP96
-	$(call Image/Build/Template/$(fs_64k)/$(1),AP83,ap96,board=AP96)
+	$(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700,$(wndr3700_cmdline),wndr3700_mtdlayout,3700,WNDR3700,"" NA,)
+	$(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700v2,$(wndr3700v2_cmdline),wndr3700v2_mtdlayout,3701,WNDR3700v2,"",-H 29763654+16+64)
+	$(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3800,$(wndr3800_cmdline),wndr3700v2_mtdlayout,3701,WNDR3800,"",-H 29763654+16+128)
 endef
 
+wr400n_cmdline=board=WRT400N console=ttyS0,115200
 define Image/Build/Profile/WRT400N
-	$(call Image/Build/Template/$(fs_64k)/$(1),WRT400N,wrt400n,board=WRT400N)
+	$(call Image/Build/Template/$(fs_64k)/$(1),WRT400N,wrt400n,$(wr400n_cmdline))
 endef
 
+dir825b1_cmdline=board=DIR-825-B1 console=ttyS0,115200
 define Image/Build/Profile/DIR825B1
-	$(call Image/Build/Template/$(fs_64k)/$(1),DIR825B1,dir-825-b1,board=DIR-825-B1)
+	$(call Image/Build/Template/$(fs_64k)/$(1),DIR825B1,dir-825-b1,$(dir825b1_cmdline))
 endef
 
+wrt160nl_cmdline=board=WRT160NL console=ttyS0,115200
 define Image/Build/Profile/WRT160NL
-	$(call Image/Build/Template/$(fs_64k)/$(1),CyberTAN,wrt160nl,board=WRT160NL,1.00.01)
+	$(call Image/Build/Template/$(fs_64k)/$(1),CyberTAN,wrt160nl,$(wrt160nl_cmdline),1.00.01)
+endef
+
+whrg301n_cmdline=board=WHR-G301N console=ttyS0,115200
+define Image/Build/Profile/WHRG301N
+	$(call Image/Build/Template/$(fs_64k)/$(1),WHRHPG300N,whr-g301n,$(whrg301n_cmdline),whrhpg300n_mtdlayout,WHR-G301N)
+endef
+
+whrhpg300n_cmdline=board=WHR-HP-G300N console=ttyS0,115200
+whrhpg300n_mtdlayout=mtdparts=spi0.0:248k(u-boot)ro,8k(u-boot-env)ro,896k(kernel),2816k(rootfs),64k(user_property),64k(art)ro,3712k@0x40000(firmware)
+define Image/Build/Profile/WHRHPG300N
+	$(call Image/Build/Template/$(fs_64k)/$(1),WHRHPG300N,whr-hp-g300n,$(whrhpg300n_cmdline),whrhpg300n_mtdlayout,WHR-HP-G300N)
 endef
 
+whrhpgn_cmdline=board=WHR-HP-GN console=ttyS0,115200
+define Image/Build/Profile/WHRHPGN
+	$(call Image/Build/Template/$(fs_64k)/$(1),WHRHPG300N,whr-hp-gn,$(whrhpgn_cmdline),whrhpg300n_mtdlayout,WHR-HP-GN)
+endef
+
+wzrhpg300nh_cmdline=board=WZR-HP-G300NH console=ttyS0,115200
 define Image/Build/Profile/WZRHPG300NH
-	$(call Image/Build/Template/$(fs_128k)/$(1),WZRHPG300NH,wzr-hp-g300nh,board=WZR-HP-G300NH)
+	$(call Image/Build/Template/$(fs_128k)/$(1),WZRHPG30XNH,wzr-hp-g300nh,$(wzrhpg300nh_cmdline),WZR-HP-G300NH)
+endef
+
+wzrhpag300h_cmdline=board=WZR-HP-AG300H console=ttyS0,115200
+define Image/Build/Profile/WZRHPAG300H
+	$(call Image/Build/Template/$(fs_128k)/$(1),WZRHPG30XNH,wzr-hp-ag300h,$(wzrhpag300h_cmdline),WZR-HP-AG300H)
 endef
 
+zcn1523h28_cmdline=board=ZCN-1523H-2 console=ttyS0,115200
 define Image/Build/Profile/ZCN1523H28
-	$(call Image/Build/Template/$(fs_64k)/$(1),Zcomax,zcn-1523h-2-8,board=ZCN-1523H-2)
+	$(call Image/Build/Template/$(fs_64k)/$(1),Zcomax,zcn-1523h-2-8,$(zcn1523h28_cmdline))
 endef
 
+zcn1523h516_cmdline=board=ZCN-1523H-5 console=ttyS0,115200
 define Image/Build/Profile/ZCN1523H516
-	$(call Image/Build/Template/$(fs_64k)/$(1),Zcomax,zcn-1523h-5-16,board=ZCN-1523H-5)
+	$(call Image/Build/Template/$(fs_64k)/$(1),Zcomax,zcn-1523h-5-16,$(zcn1523h516_cmdline))
+endef
+
+all0258n_cmdline=board=ALL0258N console=ttyS0,115200
+define Image/Build/Profile/ALL0258N
+	$(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,all0258n,$(all0258n_cmdline),,917504,5505024,KR)
 endef
 
 define Image/Build/Profile/Default
+	$(call Image/Build/Profile/ALL0258N,$(1))
+	$(call Image/Build/Profile/AP121,$(1))
+	$(call Image/Build/Profile/AP121MINI,$(1))
 	$(call Image/Build/Profile/AP81,$(1))
 	$(call Image/Build/Profile/AP83,$(1))
 	$(call Image/Build/Profile/A02RBW300N,$(1))
+	$(call Image/Build/Profile/DB120,$(1))
 	$(call Image/Build/Profile/DIR600A1,$(1))
 	$(call Image/Build/Profile/DIR615C1,$(1))
 	$(call Image/Build/Profile/DIR825B1,$(1))
@@ -689,8 +778,12 @@ define Image/Build/Profile/Default
 	$(call Image/Build/Profile/TLMR3220V1,$(1))
 	$(call Image/Build/Profile/TLMR3420V1,$(1))
 	$(call Image/Build/Profile/TLWA901NDV1,$(1))
+	$(call Image/Build/Profile/TLWA901NDV2,$(1))
 	$(call Image/Build/Profile/TLWR741NDV1,$(1))
+	$(call Image/Build/Profile/TLWR741NDV4,$(1))
 	$(call Image/Build/Profile/TLWR740NV1,$(1))
+	$(call Image/Build/Profile/TLWR740NV3,$(1))
+	$(call Image/Build/Profile/TLWR743NDV1,$(1))
 	$(call Image/Build/Profile/TLWR841NV15,$(1))
 	$(call Image/Build/Profile/TLWR841NDV3,$(1))
 	$(call Image/Build/Profile/TLWR841NDV5,$(1))
@@ -699,13 +792,18 @@ define Image/Build/Profile/Default
 	$(call Image/Build/Profile/TLWR941NDV3,$(1))
 	$(call Image/Build/Profile/TLWR941NDV4,$(1))
 	$(call Image/Build/Profile/TLWR1043NDV1,$(1))
+	$(call Image/Build/Profile/TLWR703NV1,$(1))
 	$(call Image/Build/Profile/UBNT,$(1))
 	$(call Image/Build/Profile/WP543,$(1))
 	$(call Image/Build/Profile/WNDR3700,$(1))
 	$(call Image/Build/Profile/AP96,$(1))
 	$(call Image/Build/Profile/WRT400N,$(1))
 	$(call Image/Build/Profile/WRT160NL,$(1))
+	$(call Image/Build/Profile/WHRG301N,$(1))
+	$(call Image/Build/Profile/WHRHPG300N,$(1))
+	$(call Image/Build/Profile/WHRHPGN,$(1))
 	$(call Image/Build/Profile/WZRHPG300NH,$(1))
+	$(call Image/Build/Profile/WZRHPAG300H,$(1))
 	$(call Image/Build/Profile/ZCN1523H28,$(1))
 	$(call Image/Build/Profile/ZCN1523H516,$(1))
 endef
@@ -723,12 +821,13 @@ define Image/Build/Profile/Madwifi
 endef
 
 define Image/Build/squashfs
+	cp $(KDIR)/root.squashfs $(KDIR)/root.squashfs-4k
+	$(STAGING_DIR_HOST)/bin/padjffs2 $(KDIR)/root.squashfs-4k 4
+	cp $(KDIR)/root.squashfs-4k $(BIN_DIR)/$(IMG_PREFIX)-root.squashfs-4k
+	cp $(KDIR)/root.squashfs $(KDIR)/root.squashfs-64k
+	$(STAGING_DIR_HOST)/bin/padjffs2 $(KDIR)/root.squashfs-64k 4 8 64
+	cp $(KDIR)/root.squashfs-64k $(BIN_DIR)/$(IMG_PREFIX)-root.squashfs-64k
 	$(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=$(BIN_DIR)/$(IMG_PREFIX)-root.squashfs-4k bs=4k conv=sync
-	$(call add_jffs2_mark,$(BIN_DIR)/$(IMG_PREFIX)-root.squashfs-4k)
-	rm -f $(KDIR)/root.squashfs-4k.tmp0
 endef
 
 define Image/Build/Initramfs
@@ -738,7 +837,6 @@ endef
 define Image/Build
 	$(call Image/Build/$(1))
 	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
-
 	$(call Image/Build/Profile/$(PROFILE),$(1))
 endef