diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-11-24 13:55:40 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-11-24 13:55:40 +0000 |
| commit | d55a046c487d68af972477723fffa0f08113350f (patch) | |
| tree | 9e0b787a2610ed25229e89e6d04bb11790c1ff43 | |
| parent | cafe76e10361d2ca31edfb2017378b92c6e3b5b8 (diff) | |
| download | upstream-d55a046c487d68af972477723fffa0f08113350f.tar.gz upstream-d55a046c487d68af972477723fffa0f08113350f.tar.bz2 upstream-d55a046c487d68af972477723fffa0f08113350f.zip | |
ar71xx: the squashfs-4k images are unreliable in some builds. add 4k, 8k padding to the generic squashfs images and use them on 4k devices as well
SVN-Revision: 18526
| -rw-r--r-- | include/image.mk | 12 | ||||
| -rw-r--r-- | target/linux/ar71xx/image/Makefile | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/include/image.mk b/include/image.mk index a722086a07..d75ca3c30f 100644 --- a/include/image.mk +++ b/include/image.mk @@ -40,13 +40,17 @@ define add_jffs2_mark echo -ne '\xde\xad\xc0\xde' >> $(1) endef -# pad to 64k and add jffs2 end-of-filesystem mark -# do this twice to make sure that this works with 128k blocksize as well +# pad to 4k, 8k, 64k, 128k and add jffs2 end-of-filesystem mark define prepare_generic_squashfs - dd if=$(1) of=$(KDIR)/tmpfile.1 bs=64k conv=sync + dd if=$(1) of=$(KDIR)/tmpfile.0 bs=4k conv=sync + $(call add_jffs2_mark,$(KDIR)/tmpfile.0) + dd if=$(KDIR)/tmpfile.0 of=$(KDIR)/tmpfile.1 bs=4k conv=sync $(call add_jffs2_mark,$(KDIR)/tmpfile.1) - dd of=$(1) if=$(KDIR)/tmpfile.1 bs=64k conv=sync + dd if=$(KDIR)/tmpfile.1 of=$(KDIR)/tmpfile.2 bs=64k conv=sync + $(call add_jffs2_mark,$(KDIR)/tmpfile.2) + dd if=$(KDIR)/tmpfile.2 of=$(1) bs=64k conv=sync $(call add_jffs2_mark,$(1)) + rm -f $(KDIR)/tmpfile.* endef ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 33937e4028..ed623de20c 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -276,7 +276,7 @@ define Image/Build/Template/TPLINK4K endef define Image/Build/Template/TPLINK4K/squashfs - $(call Image/Build/Template/TPLINK,squashfs-4k,$(1),$(2),$(3)) + $(call Image/Build/Template/TPLINK,squashfs,$(1),$(2),$(3)) endef define Image/Build/Template/UBNT @@ -296,7 +296,7 @@ define Image/Build/Template/UBNTXM endef define Image/Build/Template/UBNTXM/squashfs - $(call Image/Build/Template/UBNTXM,squashfs-4k,$(1),$(2),$(3),$(4),$(5)) + $(call Image/Build/Template/UBNTXM,squashfs,$(1),$(2),$(3),$(4),$(5)) endef define Image/Build/Template/UBNTXM/jffs2-64k @@ -428,8 +428,6 @@ define Image/Build/Profile/Madwifi endef define Image/Build/squashfs - dd if=$(KDIR)/root.squashfs of=$(IMGNAME)-root.squashfs-4k bs=4k conv=sync - $(call add_jffs2_mark,$(IMGNAME)-root.squashfs-4k) $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) endef |