From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 15 Dec 2011 22:03:44 +0000 (+0000)
Subject: ar71xx: put squash image right after the kernel on TP-Link boards
X-Git-Url: http://git.rohieb.name/openwrt.git/commitdiff_plain/f2945360c1f3aeedf7a4984291594e7dfb8b2b18

ar71xx: put squash image right after the kernel on TP-Link boards

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29545 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index bb72ab048..6fd72c1d3 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -11,6 +11,10 @@ define imgname
 $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
 endef
 
+define rootfs_align
+$(patsubst %-128k,0x20000,$(patsubst %-64k,0x10000,$(patsubst squashfs-%,4,$(1))))
+endef
+
 define sysupname
 $(call imgname,$(1),$(2))-sysupgrade.bin
 endef
@@ -333,12 +337,14 @@ define Image/Build/TPLINK
 	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
 		-H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION)\
 		-k $(KDIR)/kernel-$(2).bin \
-		-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) -a 0x10000 \
+		-r $(BIN_DIR)/$(IMG_PREFIX)-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 \
-		-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) -a 0x10000 \
+		-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
+		-a $(call rootfs_align,$(1)) -j \
 		-o $(call sysupname,$(1),$(2))
 endef
 
@@ -355,12 +361,14 @@ define Image/Build/TPLINK-LZMA
 	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
 		-H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION)\
 		-k $(KDIR)/vmlinux-$(2).bin.lzma \
-		-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) -a 0x10000 \
+		-r $(BIN_DIR)/$(IMG_PREFIX)-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 \
-		-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) -a 0x10000 \
+		-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
+		-a $(call rootfs_align,$(1)) -j \
 		-o $(call sysupname,$(1),$(2))
 endef