projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f386622
)
ar71xx: put squash image right after the kernel on TP-Link boards
author
Gabor Juhos
<juhosg@openwrt.org>
Thu, 15 Dec 2011 22:03:44 +0000
(22:03 +0000)
committer
Gabor Juhos
<juhosg@openwrt.org>
Thu, 15 Dec 2011 22:03:44 +0000
(22:03 +0000)
SVN-Revision: 29545
target/linux/ar71xx/image/Makefile
patch
|
blob
|
history
diff --git
a/target/linux/ar71xx/image/Makefile
b/target/linux/ar71xx/image/Makefile
index bb72ab048a110f825c2621843ac1ef5a68d5e6a3..6fd72c1d368916b42b19471831cc2626a8032797 100644
(file)
--- 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
$(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
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 \
-$(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 \
-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
-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 \
-$(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 \
-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
-o $(call sysupname,$(1),$(2))
endef