X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Fimage%2Far7%2FMakefile;h=d2af2d9a8156c224ea00d0330abae49fa57adbed;hb=9dcbd6314842f862186a4688f44adaa2e49b6746;hp=5ee6b0dc103ccd17c03402d73f4053283fa138bc;hpb=a8de4fb9f24fea095e80a3fcd5c69bd6029e39d2;p=openwrt-10.03%2F.git

diff --git a/target/image/ar7/Makefile b/target/image/ar7/Makefile
index 5ee6b0dc1..d2af2d9a8 100644
--- a/target/image/ar7/Makefile
+++ b/target/image/ar7/Makefile
@@ -1,3 +1,9 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
@@ -60,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) | \
@@ -80,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))