diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-10-09 18:17:52 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-10-09 18:17:52 +0000 |
| commit | d8c27b90f30073936e0f6ee532027ec86bec31bb (patch) | |
| tree | 4930d98046d8cba24957653326b5162f360b9a42 | |
| parent | 67f94a41e2df6189e2f9bc016b94c1507a7d5a1e (diff) | |
| download | upstream-d8c27b90f30073936e0f6ee532027ec86bec31bb.tar.gz upstream-d8c27b90f30073936e0f6ee532027ec86bec31bb.tar.bz2 upstream-d8c27b90f30073936e0f6ee532027ec86bec31bb.zip | |
fix ar7 image alignment for jffs2
SVN-Revision: 4998
| -rw-r--r-- | openwrt/target/image/ar7/Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/openwrt/target/image/ar7/Makefile b/openwrt/target/image/ar7/Makefile index f56ceffb67..d2af2d9a81 100644 --- a/openwrt/target/image/ar7/Makefile +++ b/openwrt/target/image/ar7/Makefile @@ -66,12 +66,13 @@ define Image/Prepare $(STAGING_DIR)/bin/srec2bin $(KDIR)/ram_zimage.sre $(KDIR)/vmlinux.bin endef -ifeq ($(FS),jffs2-8MB) -ALIGN:=bs=131072 conv=sync -endif -ifeq ($(FS),jffs2-4MB) -ALIGN:=bs=65536 conv=sync -endif +define align/jffs2-64k +bs=65536 conv=sync +endef + +define align/jffs2-128k +bs=131072 conv=sync +endef define Image/Build/CyberTAN (dd if=/dev/zero bs=16 count=1; cat $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin) | \ @@ -86,7 +87,7 @@ define Image/Build/sErCoMm endef define Image/Build - dd if=$(KDIR)/vmlinux.bin $(ALIGN) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin + dd if=$(KDIR)/vmlinux.bin $(call align/$(1)) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin cat $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/root.$(1) >> $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin $(call Image/Build/CyberTAN,$(1),AG1B,AG1B,$(1)) $(call Image/Build/CyberTAN,$(1),WA21,WA21,$(1)) |