diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-09 18:17:52 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-09 18:17:52 +0000 |
| commit | 89aea3f3076969b89f040146a6969132b06aac05 (patch) | |
| tree | 5093a241b0cce2442ae060e275b3882a42cf9a23 | |
| parent | 498cebec28f2dcd38f85510571b960bd3b15818b (diff) | |
fix ar7 image alignment for jffs2
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4998 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/image/ar7/Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/target/image/ar7/Makefile b/target/image/ar7/Makefile index f56ceffb67..d2af2d9a81 100644 --- a/target/image/ar7/Makefile +++ b/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)) |