X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/2b1cf2b32ceaee4a99bf3b290f814095100962fb..8b3aaef2dd6245c2e6e42e434f946ef71846385a:/target/linux/ar71xx/image/Makefile

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 4b90429ed..701373090 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -25,16 +25,15 @@ endef
 
 LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
 
+KDIR_TMP:=$(KDIR)/tmp
 VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux
 UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
 fs_squash:=squashfs-only
-fs_all:=all
 fs_64k:=64k
 fs_64kraw:=64kraw
 fs_128k:=128k
 ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
 	fs_squash:=initramfs
-	fs_all:=initramfs
 	fs_64k:=initramfs
 	fs_64kraw:=initramfs
 	fs_128k:=initramfs
@@ -47,15 +46,15 @@ define CompressLzma
 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)
+	cp $(KDIR)/vmlinux $(KDIR_TMP)/vmlinux-$(1)
+	$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR_TMP)/vmlinux-$(1) "$(strip $(2))"
+	$(call CompressLzma,$(KDIR_TMP)/vmlinux-$(1),$(KDIR_TMP)/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
+	cp $(KDIR)/vmlinux $(KDIR_TMP)/vmlinux-$(1)
+	$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR_TMP)/vmlinux-$(1) "$(strip $(2))"
+	gzip -9 -c $(KDIR_TMP)/vmlinux-$(1) > $(KDIR_TMP)/vmlinux-$(1).bin.gz
 endef
 
 define MkuImage
@@ -66,16 +65,16 @@ endef
 
 define MkuImageLzma
 	$(call PatchKernelLzma,$(1),$(2))
-	$(call MkuImage,lzma,,$(KDIR)/vmlinux-$(1).bin.lzma,$(KDIR)/vmlinux-$(1).uImage)
+	$(call MkuImage,lzma,,$(KDIR_TMP)/vmlinux-$(1).bin.lzma,$(KDIR_TMP)/vmlinux-$(1).uImage)
 endef
 
 define MkuImageGzip
 	$(call PatchKernelGzip,$(1),$(2))
-	$(call MkuImage,gzip,,$(KDIR)/vmlinux-$(1).bin.gz,$(KDIR)/vmlinux-$(1).uImage)
+	$(call MkuImage,gzip,,$(KDIR_TMP)/vmlinux-$(1).bin.gz,$(KDIR_TMP)/vmlinux-$(1).uImage)
 endef
 
 define MkuImageOKLI
-	$(call MkuImage,lzma,-M 0x4f4b4c49,$(KDIR)/vmlinux.bin.lzma,$(KDIR)/vmlinux-$(1).okli)
+	$(call MkuImage,lzma,-M 0x4f4b4c49,$(KDIR)/vmlinux.bin.lzma,$(KDIR_TMP)/vmlinux-$(1).okli)
 endef
 
 define CatFiles
@@ -89,11 +88,11 @@ define CatFiles
 endef
 
 define Sysupgrade/KR
-	$(call CatFiles,$(KDIR)/vmlinux-$(2).uImage,$(3),$(KDIR)/root.$(1),$(4),$(call sysupname,$(1),$(2)))
+	$(call CatFiles,$(KDIR_TMP)/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)))
+	$(call CatFiles,$(KDIR)/root.$(1),$(4),$(KDIR_TMP)/vmlinux-$(2).uImage,$(3),$(call sysupname,$(1),$(2)))
 endef
 
 define Image/BuildLoader
@@ -126,13 +125,14 @@ define Image/BuildKernel
 	$(call MkuImage,gzip,,$(KDIR)/vmlinux.bin.gz,$(UIMAGE)-gzip.bin)
 	$(call MkuImage,lzma,,$(KDIR)/vmlinux.bin.lzma,$(UIMAGE)-lzma.bin)
 	$(call Image/Build/Initramfs)
+	-mkdir -p $(KDIR_TMP)
 endef
 
 define Image/Build/WRT400N
 	$(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)); \
+		wrt400n $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR)/root.$(1) $(call factoryname,$(1),$(2)); \
 	fi
 endef
 
@@ -166,10 +166,10 @@ define Image/Build/WZRHPG30XNH
 		) > $(call imgname,$(1),$(2))-tftp.bin; \
 		buffalo-enc -p $(4) -v 1.99 \
 			-i $(call sysupname,$(1),$(2)) \
-			-o $(KDIR)/$(2).enc; \
+			-o $(KDIR_TMP)/$(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 \
+			-i $(KDIR_TMP)/$(2).enc \
 			-o $(call factoryname,$(1),$(2)); \
 	fi
 endef
@@ -184,10 +184,10 @@ define Image/Build/WHRHPG300N
 		) > $(call imgname,$(1),$(2))-tftp.bin; \
 		buffalo-enc -p $(5) -v 1.99 \
 			-i $(call sysupname,$(1),$(2)) \
-			-o $(KDIR)/$(2).enc; \
+			-o $(KDIR_TMP)/$(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 \
+			-i $(KDIR_TMP)/$(2).enc \
 			-o $(call factoryname,$(1),$(2)); \
 	fi
 endef
@@ -197,7 +197,7 @@ define Image/Build/Cameo
 	$(call Sysupgrade/KR,$(1),$(2),$(5),$(6))
 	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
 		( \
-			dd if=$(KDIR)/vmlinux-$(2).uImage bs=$(5) conv=sync; \
+			dd if=$(KDIR_TMP)/vmlinux-$(2).uImage bs=$(5) conv=sync; \
 			dd if=$(KDIR)/root.$(1) bs=$(6) conv=sync; \
 			echo -n $(7); \
 		) > $(call factoryname,$(1),$(2)); \
@@ -217,7 +217,7 @@ endef
 define Image/Build/Ath
 	$(call Sysupgrade/$(7),$(1),$(2),$(5),$(6))
 	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
-		dd if=$(KDIR)/vmlinux-$(2).uImage \
+		dd if=$(KDIR_TMP)/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; \
@@ -231,7 +231,7 @@ endef
 
 define Image/Build/AthGzip/initramfs
 	$(call MkuImageLzma,$(2),$(3) $($(4)))
-	$(CP) $(KDIR)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin
+	$(CP) $(KDIR_TMP)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin
 endef
 
 define Image/Build/AthLzma
@@ -241,12 +241,12 @@ endef
 
 define Image/Build/AthLzma/initramfs
 	$(call MkuImageLzma,$(2),$(3) $($(4)))
-	$(CP) $(KDIR)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin
+	$(CP) $(KDIR_TMP)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin
 endef
 
 define Image/Build/PB4X
 	$(call PatchKernelLzma,$(2),$(3))
-	dd if=$(KDIR)/vmlinux-$(2).bin.lzma \
+	dd if=$(KDIR_TMP)/vmlinux-$(2).bin.lzma \
 	   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
@@ -258,40 +258,42 @@ endef
 
 
 define Image/Build/MyLoader
-	-$(STAGING_DIR_HOST)/bin/mkmylofw -B $(2) -s $(3) \
-		-p0x030000:0xe0000:al:0x80060000:kernel:$(KDIR)/vmlinux.bin.lzma \
+	$(call PatchKernelLzma,$(2),$(3))
+	-$(STAGING_DIR_HOST)/bin/mkmylofw -B $(2) -s $(4) \
+		-p0x030000:0xe0000:al:0x80060000:kernel:$(KDIR_TMP)/vmlinux-$(2).bin.lzma \
 		-p0x110000:0:::rootfs:$(KDIR)/root.$(1) \
-		$(call imgname,$(1),$(2))-$(4)-factory.img
+		$(call imgname,$(1),$(2))-$(5)-factory.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 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
+	dd if=$(KDIR_TMP)/vmlinux-$(2).uImage of=$(KDIR_TMP)/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.bin \
+		-k $(KDIR_TMP)/vmlinux-$(2).uImage.bin \
 		-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
 		-o $(call factoryname,$(1),$(2))
 endef
 
 define Image/Build/UBNT
 	$(call PatchKernelLzma,$(2),$(3))
-	dd if=$(KDIR)/vmlinux-$(2).bin.lzma of=$(KDIR)/vmlinux-$(2).lzma bs=64k conv=sync
+	dd if=$(KDIR_TMP)/vmlinux-$(2).bin.lzma of=$(KDIR_TMP)/vmlinux-$(2).lzma bs=64k conv=sync
 	-$(STAGING_DIR_HOST)/bin/mkfwimage \
 		-B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \
-		-k $(KDIR)/vmlinux-$(2).lzma \
+		-k $(KDIR_TMP)/vmlinux-$(2).lzma \
 		-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
 		-o $(call factoryname,$(1),$(2))
 	-sh $(TOPDIR)/scripts/combined-image.sh \
-		"$(KDIR)/vmlinux-$(2).lzma" \
+		"$(KDIR_TMP)/vmlinux-$(2).lzma" \
 		"$(BIN_DIR)/$(IMG_PREFIX)-root.$(1)" \
   $(call sysupname,$(1),$(2))
 endef
 
+planex_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1408k(kernel),6336k(rootfs),128k(art)ro,7744k@0x50000(firmware)
 define Image/Build/Planex
-	$(call MkuImageGzip,$(2),$(3))
+	$(call MkuImageGzip,$(2),$(3) $(planex_mtdlayout))
 	$(call Sysupgrade/KR,$(1),$(2),1441792,6356992)
 	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
 		$(STAGING_DIR_HOST)/bin/mkplanexfw \
@@ -310,7 +312,7 @@ define Image/Build/ALFA
 		rm -rf $(KDIR)/$(1); \
 		mkdir -p $(KDIR)/$(1); \
 		cd $(KDIR)/$(1); \
-		cp $(KDIR)/vmlinux-$(2).uImage $(KDIR)/$(1)/$(6); \
+		cp $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR)/$(1)/$(6); \
 		cp $(KDIR)/root.$(1) $(KDIR)/$(1)/$(7); \
 		$(TAR) zcf $(call factoryname,$(1),$(2)) -C $(KDIR)/$(1) $(6) $(7); \
 		( \
@@ -320,21 +322,24 @@ define Image/Build/ALFA
 	fi
 endef
 
+define Image/Build/TPLINKOLD/loader
+	$(call Image/BuildLoaderAlone,$(1),gz,$(2),0x22000,0)
+endef
+
 define Image/Build/TPLINKOLD
-	$(call Image/BuildLoaderAlone,$(2),gz,$(3),0x22000,0)
 	$(call MkuImageOKLI,$(2))
 	( \
 		dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \
-		dd if=$(KDIR)/vmlinux-$(2).okli conv=sync; \
-	) > $(KDIR)/kernel-$(2).bin
+		dd if=$(KDIR_TMP)/vmlinux-$(2).okli conv=sync; \
+	) > $(KDIR_TMP)/kernel-$(2).bin
 	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
 		-H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION)\
-		-k $(KDIR)/kernel-$(2).bin \
+		-k $(KDIR_TMP)/kernel-$(2).bin \
 		-r $(KDIR)/root.$(1) \
 		-o $(call factoryname,$(1),$(2))
 	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
 		-H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) -s\
-		-k $(KDIR)/kernel-$(2).bin \
+		-k $(KDIR_TMP)/kernel-$(2).bin \
 		-r $(KDIR)/root.$(1) \
 		-o $(call sysupname,$(1),$(2))
 endef
@@ -347,22 +352,25 @@ define Image/Build/TPLINKOLD/initramfs
 		-o $(call imgname,$(1),$(2))-uImage.bin
 endef
 
+define Image/Build/TPLINK/loader
+	$(call Image/BuildLoaderAlone,$(1),gz,$(2),0x22000,0)
+endef
+
 define Image/Build/TPLINK
-	$(call Image/BuildLoaderAlone,$(2),gz,$(3),0x22000,0)
 	$(call MkuImageOKLI,$(2))
 	( \
 		dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \
-		dd if=$(KDIR)/vmlinux-$(2).okli conv=sync; \
-	) > $(KDIR)/kernel-$(2).bin
+		dd if=$(KDIR_TMP)/vmlinux-$(2).okli conv=sync; \
+	) > $(KDIR_TMP)/kernel-$(2).bin
 	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
 		-H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION)\
-		-k $(KDIR)/kernel-$(2).bin \
+		-k $(KDIR_TMP)/kernel-$(2).bin \
 		-r $(KDIR)/root.$(1) \
 		-a $(call rootfs_align,$(1)) -j \
 		-o $(call factoryname,$(1),$(2))
 	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
 		-H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) -s\
-		-k $(KDIR)/kernel-$(2).bin \
+		-k $(KDIR_TMP)/kernel-$(2).bin \
 		-r $(KDIR)/root.$(1) \
 		-a $(call rootfs_align,$(1)) -j \
 		-o $(call sysupname,$(1),$(2))
@@ -380,13 +388,13 @@ define Image/Build/TPLINK-LZMA
 	$(call PatchKernelLzma,$(2),$(3))
 	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
 		-H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION)\
-		-k $(KDIR)/vmlinux-$(2).bin.lzma \
+		-k $(KDIR_TMP)/vmlinux-$(2).bin.lzma \
 		-r $(KDIR)/root.$(1) \
 		-a $(call rootfs_align,$(1)) -j \
 		-o $(call factoryname,$(1),$(2))
 	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
 		-H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) -s \
-		-k $(KDIR)/vmlinux-$(2).bin.lzma \
+		-k $(KDIR_TMP)/vmlinux-$(2).bin.lzma \
 		-r $(KDIR)/root.$(1) \
 		-a $(call rootfs_align,$(1)) -j \
 		-o $(call sysupname,$(1),$(2))
@@ -396,13 +404,13 @@ define Image/Build/TPLINK-LZMA/initramfs
 	$(call PatchKernelLzma,$(2),$(3))
 	-$(STAGING_DIR_HOST)/bin/mktplinkfw -c \
 		-H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) -s \
-		-k $(KDIR)/vmlinux-$(2).bin.lzma \
+		-k $(KDIR_TMP)/vmlinux-$(2).bin.lzma \
 		-o $(call imgname,$(1),$(2))-uImage.bin
 endef
 
 define Image/Build/CyberTAN
 	$(call MkuImageGzip,$(2),$(3))
-	$(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/image.tmp -f $(KDIR)/vmlinux-$(2).uImage \
+	$(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/image.tmp -f $(KDIR_TMP)/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 \
@@ -418,23 +426,23 @@ define Image/Build/Netgear/Build_uImage
 	-rm -rf $(KDIR)/$(1)
 	mkdir -p $(KDIR)/$(1)/image
 	$(STAGING_DIR_HOST)/bin/wndr3700 \
-		$(KDIR)/vmlinux-$(1).uImage \
+		$(KDIR_TMP)/vmlinux-$(1).uImage \
 		$(KDIR)/$(1)/image/uImage \
 		$(4)
 	$(STAGING_DIR_HOST)/bin/mksquashfs-lzma \
-		$(KDIR)/$(1) $(KDIR)/vmlinux-$(1).uImage.squashfs.tmp \
+		$(KDIR)/$(1) $(KDIR_TMP)/vmlinux-$(1).uImage.squashfs.tmp \
 		-nopad -noappend -root-owned -be
 	-rm -rf $(KDIR)/$(1)
 	mkimage -A mips -O linux -T filesystem -C none \
 		-a 0xbf070000 -e 0xbf070000 \
 		-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-		-d $(KDIR)/vmlinux-$(1).uImage.squashfs.tmp \
-		$(KDIR)/vmlinux-$(1).uImage.squashfs.tmp2
+		-d $(KDIR_TMP)/vmlinux-$(1).uImage.squashfs.tmp \
+		$(KDIR_TMP)/vmlinux-$(1).uImage.squashfs.tmp2
 	$(STAGING_DIR_HOST)/bin/wndr3700 \
-		$(KDIR)/vmlinux-$(1).uImage.squashfs.tmp2 \
-		$(KDIR)/vmlinux-$(1).uImage.squashfs \
+		$(KDIR_TMP)/vmlinux-$(1).uImage.squashfs.tmp2 \
+		$(KDIR_TMP)/vmlinux-$(1).uImage.squashfs \
 		$(4)
-	-rm -f $(KDIR)/vmlinux-$(1).uImage.squashfs.tmp*
+	-rm -f $(KDIR_TMP)/vmlinux-$(1).uImage.squashfs.tmp*
 endef
 
 define Image/Build/Netgear/Estimate_uImage
@@ -444,38 +452,38 @@ define Image/Build/Netgear/Estimate_uImage
 		kk=`echo '$(3)' | sed -e 's/.*[:,]\([0-9]*\)k(kernel).*/\1/'`; \
 		rk=`echo '$(3)' | sed -e 's/.*[:,]\([0-9]*\)k(rootfs).*/\1/'`; \
 		let 'tk = kk + rk'; \
-		s=`stat -c'%s' '$(KDIR)/vmlinux-$(1)_est.uImage.squashfs'`; \
+		s=`stat -c'%s' '$(KDIR_TMP)/vmlinux-$(1)_est.uImage.squashfs'`; \
 		c=`echo '$(3)' | wc -c`; \
 		let 'kk = (((s + c) / (64 * 1024) + 1) * 64)'; \
 		let 'rk = tk - kk'; \
 		echo '$(3)' | sed -e "s/[0-9]*k(kernel)/$$$${kk}k(kernel)/" \
 				  -e "s/[0-9]*k(rootfs)/$$$${rk}k(rootfs)/" > \
-			'$(KDIR)/$(1)_mtdparts'; \
+			'$(KDIR_TMP)/$(1)_mtdparts'; \
 		let 'k = kk * 1024'; \
-		echo "$$$${k}" > '$(KDIR)/$(1)_kernel_maxsize'; \
+		echo "$$$${k}" > '$(KDIR_TMP)/$(1)_kernel_maxsize'; \
 		let 'r = rk * 1024'; \
-		echo "$$$${r}" > '$(KDIR)/$(1)_rootfs_maxsize'; \
+		echo "$$$${r}" > '$(KDIR_TMP)/$(1)_rootfs_maxsize'; \
 	)
-	-rm -f $(KDIR)/vmlinux-$(1)_est \
-	       $(KDIR)/vmlinux-$(1)_est.bin.lzma \
-	       $(KDIR)/vmlinux-$(1)_est.uImage \
-	       $(KDIR)/vmlinux-$(1)_est.uImage.squashfs
+	-rm -f $(KDIR_TMP)/vmlinux-$(1)_est \
+	       $(KDIR_TMP)/vmlinux-$(1)_est.bin.lzma \
+	       $(KDIR_TMP)/vmlinux-$(1)_est.uImage \
+	       $(KDIR_TMP)/vmlinux-$(1)_est.uImage.squashfs
 endef
 
 define Image/Build/Netgear
 	$(call Image/Build/Netgear/Estimate_uImage,$(2),$(3),$(4),$(5))
-	$(call Image/Build/Netgear/Build_uImage,$(2),$(3),`cat $(KDIR)/$(2)_mtdparts`,$(5))
-	if [ `stat -c%s '$(KDIR)/vmlinux-$(2).uImage.squashfs'` -gt \
-	     `cat '$(KDIR)/$(2)_kernel_maxsize'` ]; then \
-                echo "$(KDIR)/vmlinux-$(2).uImage.squashfs is too big" >& 2; \
+	$(call Image/Build/Netgear/Build_uImage,$(2),$(3),`cat $(KDIR_TMP)/$(2)_mtdparts`,$(5))
+	if [ `stat -c%s '$(KDIR_TMP)/vmlinux-$(2).uImage.squashfs'` -gt \
+	     `cat '$(KDIR_TMP)/$(2)_kernel_maxsize'` ]; then \
+                echo "$(KDIR_TMP)/vmlinux-$(2).uImage.squashfs is too big" >& 2; \
 	else if [ `stat -c%s '$(KDIR)/root.$(1)'` -gt \
-	     `cat '$(KDIR)/$(2)_rootfs_maxsize'` ]; then \
+	     `cat '$(KDIR_TMP)/$(2)_rootfs_maxsize'` ]; then \
                 echo "$(KDIR)/root.$(1) is too big" >& 2; \
 	else \
 		( \
 			set -e; \
-			dd if=$(KDIR)/vmlinux-$(2).uImage.squashfs \
-			bs=`cat '$(KDIR)/$(2)_kernel_maxsize'` conv=sync; \
+			dd if=$(KDIR_TMP)/vmlinux-$(2).uImage.squashfs \
+			bs=`cat '$(KDIR_TMP)/$(2)_kernel_maxsize'` conv=sync; \
 			dd if=$(KDIR)/root.$(1) bs=64k; \
 		) > $(call sysupname,$(1),$(2)); \
 		for r in $(7) ; do \
@@ -491,7 +499,7 @@ endef
 define Image/Build/Netgear/initramfs
 	$(call MkuImageLzma,$(2),$(3) $($(4)))
 	$(STAGING_DIR_HOST)/bin/wndr3700 \
-		$(KDIR)/vmlinux-$(2).uImage \
+		$(KDIR_TMP)/vmlinux-$(2).uImage \
 		$(call imgname,$(1),$(2))-uImage.bin \
 		$(5)
 endef
@@ -517,12 +525,12 @@ define Image/Build/OpenMesh
 	$(call MkuImageLzma,$(2))
 	-sh $(TOPDIR)/scripts/om2p-fwupgradecfg-gen.sh \
 		"$(BUILD_DIR)/om2p-fwupgrade.cfg" \
-		"$(KDIR)/vmlinux-$(2).uImage" \
+		"$(KDIR_TMP)/vmlinux-$(2).uImage" \
 		"$(KDIR)/root.$(1)"
 	-sh $(TOPDIR)/scripts/combined-ext-image.sh \
 		"$(3)" "$(call factoryname,$(1),$(2))" \
 		"$(BUILD_DIR)/om2p-fwupgrade.cfg" "fwupgrade.cfg" \
-		"$(KDIR)/vmlinux-$(2).uImage" "kernel" \
+		"$(KDIR_TMP)/vmlinux-$(2).uImage" "kernel" \
 		"$(KDIR)/root.$(1)" "rootfs"
 endef
 
@@ -532,7 +540,7 @@ define Image/Build/Zcomax
 	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
 		$(STAGING_DIR_HOST)/bin/mkzcfw \
 			-B $(2) \
-			-k $(KDIR)/vmlinux-$(2).uImage \
+			-k $(KDIR_TMP)/vmlinux-$(2).uImage \
 			-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
 			-o $(call imgname,$(1),$(2))-factory.img; \
 	fi
@@ -554,6 +562,10 @@ define Image/Build/Template/all/jffs2-128k
 	$(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
+define Image/Build/Template/squashfs-only/loader
+	$(call Image/Build/$(1)/loader,$(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),$(8))
 endef
@@ -566,6 +578,10 @@ define Image/Build/Template/64k/jffs2-64k
 	$(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
+define Image/Build/Template/64kraw/loader
+	$(call Image/Build/$(1)/loader,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
+endef
+
 define Image/Build/Template/64kraw/squashfs
 	$(call Image/Build/$(1),squashfs-raw,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
@@ -587,6 +603,12 @@ define Image/Build/Profile/ALFANX
 	$(call Image/Build/Template/$(fs_64k)/$(1),ALFA,alfa-nx,$(alfa_nx_cmdline),1638400,6291456,vmlinux.gz.uImage,pb9x-2.6.31-jffs2)
 endef
 
+alfa_ap96_cmdline=board=ALFA-AP96 console=ttyS0,115200
+alfa_ap96_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,13312k(rootfs),2048k(kernel),512k(caldata)ro,15360k@0x80000(firmware)
+define Image/Build/Profile/ALFAAP96
+	$(call Image/Build/Template/$(fs_128k)/$(1),AthLzma,alfa-ap96,$(alfa_ap96_cmdline),alfa_ap96_mtdlayout,2097152,13631488,RK)
+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)
 
@@ -637,11 +659,12 @@ define Image/Build/Profile/PB92
 	$(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,pb92,$(pb92_cmdline),,917504,2818048,KR)
 endef
 
+wp543_cmdline=console=ttyS0,115200
 define Image/Build/Profile/WP543
-	$(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,0x200000,2M)
-	$(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,0x400000,4M)
-	$(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,0x800000,8M)
-	$(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,0x1000000,16M)
+	$(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,$(wp543_cmdline),0x200000,2M)
+	$(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,$(wp543_cmdline),0x400000,4M)
+	$(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,$(wp543_cmdline),0x800000,8M)
+	$(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,$(wp543_cmdline),0x1000000,16M)
 endef
 
 dir600a1_cmdline=board=DIR-600-A1 console=ttyS0,115200
@@ -679,6 +702,11 @@ define Image/Build/Profile/DIR615C1
 	$(call Image/Build/Template/$(fs_squash)/$(1),Cameo913x,dir-615-c1,$(dir615c1_cmdline),"AP81-AR9130-RT-070614-02")
 endef
 
+rw2458n_cmdline=board=RW2458N console=ttyS0,115200
+define Image/Build/Profile/RW2458N
+	$(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,rw2458n,$(rw2458n_cmdline),XM,UBNTXM,ar7240)
+endef
+
 tew632brp_cmdline=board=TEW-632BRP console=ttyS0,115200
 define Image/Build/Profile/TEW632BRP
 	$(call Image/Build/Template/$(fs_squash)/$(1),Cameo913x,tew-632brp,$(tew632brp_cmdline),"AP81-AR9130-RT-070614-00")
@@ -730,7 +758,7 @@ define Image/Build/Profile/UBNTNANOM
 	$(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
+ubntunifi_cmdline=board=UBNT-UF console=ttyS0,115200
 define Image/Build/Profile/UBNTUNIFI
 	$(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-unifi,$(ubntunifi_cmdline),XM,UBNTXM,ar7240)
 endef
@@ -780,6 +808,11 @@ define Image/Build/Profile/TLMR3420
 	$(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-mr3420-v1,$(tlmr3420_cmdline),0x34200001,1,4M)
 endef
 
+tlwa701_cmdline=board=TL-WA901ND console=ttyS0,115200
+define Image/Build/Profile/TLWA701
+	$(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wa701n-v1,$(tlwa701_cmdline),0x07010001,1,4M)
+endef
+
 tlwa901_cmdline=board=TL-WA901ND console=ttyS0,115200
 tlwa901v2_cmdline=board=TL-WA901ND-v2 console=ttyS0,115200
 define Image/Build/Profile/TLWA901
@@ -815,11 +848,12 @@ endef
 tlwr841v15_cmdline=board=TL-WR841N-v1.5 console=ttyS0,115200
 tlwr841v3_cmdline=board=TL-WR941ND console=ttyS0,115200
 tlwr841v5_cmdline=board=TL-WR741ND console=ttyS0,115200
+tlwr841v7_cmdline=board=TL-WR841N-v7 console=ttyS0,115200
 define Image/Build/Profile/TLWR841
 	$(call Image/Build/Template/$(fs_squash)/$(1),TPLINKOLD,tl-wr841n-v1.5,$(tlwr841v15_cmdline),0x08410002,2,4M)
 	$(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr841nd-v3,$(tlwr841v3_cmdline),0x08410003,3,4M)
 	$(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr841nd-v5,$(tlwr841v5_cmdline),0x08410005,1,4M)
-	$(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr841nd-v7,$(tlwr841v5_cmdline),0x08410007,1,4M)
+	$(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr841nd-v7,$(tlwr841v7_cmdline),0x08410007,1,4M)
 endef
 
 tlwr941v2_cmdline=board=TL-WR941ND console=ttyS0,115200
@@ -835,6 +869,11 @@ define Image/Build/Profile/TLWR1043
 	$(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr1043nd-v1,$(tlwr1043_cmdline),0x10430001,1,8M)
 endef
 
+tlwr2543_cmdline=board=TL-WR2543N console=ttyS0,115200
+define Image/Build/Profile/TLWR2543
+	$(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK-LZMA,tl-wr2543n-v1,$(tlwr2543_cmdline),0x25430001,1,8Mlzma)
+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_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),14848k(rootfs),64k(art)ro,15872k@0x70000(firmware)
@@ -913,6 +952,7 @@ define Image/Build/Profile/ALL0258N
 endef
 
 define Image/Build/Profile/Default
+	$(call Image/Build/Profile/ALFAAP96,$(1))
 	$(call Image/Build/Profile/ALFANX,$(1))
 	$(call Image/Build/Profile/ALL0258N,$(1))
 	$(call Image/Build/Profile/AP121,$(1))
@@ -936,11 +976,13 @@ define Image/Build/Profile/Default
 	$(call Image/Build/Profile/PB42,$(1))
 	$(call Image/Build/Profile/PB44,$(1))
 	$(call Image/Build/Profile/PB92,$(1))
+	$(call Image/Build/Profile/RW2458N,$(1))
 	$(call Image/Build/Profile/TEW632BRP,$(1))
 	$(call Image/Build/Profile/TEW652BRP,$(1))
 	$(call Image/Build/Profile/TLMR3020,$(1))
 	$(call Image/Build/Profile/TLMR3220,$(1))
 	$(call Image/Build/Profile/TLMR3420,$(1))
+	$(call Image/Build/Profile/TLWA701,$(1))
 	$(call Image/Build/Profile/TLWA901,$(1))
 	$(call Image/Build/Profile/TLWR703,$(1))
 	$(call Image/Build/Profile/TLWR740,$(1))
@@ -949,6 +991,7 @@ define Image/Build/Profile/Default
 	$(call Image/Build/Profile/TLWR841,$(1))
 	$(call Image/Build/Profile/TLWR941,$(1))
 	$(call Image/Build/Profile/TLWR1043,$(1))
+	$(call Image/Build/Profile/TLWR2543,$(1))
 	$(call Image/Build/Profile/UBNT,$(1))
 	$(call Image/Build/Profile/WP543,$(1))
 	$(call Image/Build/Profile/WNDR3700,$(1))
@@ -990,6 +1033,10 @@ define Image/Build/Initramfs
 	$(call Image/Build/Profile/$(PROFILE),initramfs)
 endef
 
+define Image/Prepare
+	$(call Image/Build/Profile/Default,loader)
+endef
+
 define Image/Build
 	$(call Image/Build/$(1))
 	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync