summaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/image
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-12-15 22:03:44 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-12-15 22:03:44 +0000
commitf2945360c1f3aeedf7a4984291594e7dfb8b2b18 (patch)
tree5fec2e6129e273609142e16e21409f5c3fc3e443 /target/linux/ar71xx/image
parenta7f91afe84c02353d2bf0ea5b5fbede0634fb9e9 (diff)
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
Diffstat (limited to 'target/linux/ar71xx/image')
-rw-r--r--target/linux/ar71xx/image/Makefile16
1 files changed, 12 insertions, 4 deletions
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