[adm5120] rewrite of memory detection code, should be fix #1909

[openwrt.git] / target / linux / rdc-2.6 / image / Makefile

diff --git a/target/linux/rdc-2.6/image/Makefile b/target/linux/rdc-2.6/image/Makefile
index 0608240..e73d27b 100644 (file)
--- a/target/linux/rdc-2.6/image/Makefile
+++ b/target/linux/rdc-2.6/image/Makefile
@@ -7,19 +7,31 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-define Build/Clean
-endef
-
 define Image/Prepare
+       $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/bzImage
 endef
 
-define Image/Prepare
-        cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
+define trxalign/jffs2-128k
+bs=128k
+endef
+define trxalign/jffs2-64k
+bs=64k
+endef
+define trxalign/squashfs
+bs=1024
 endef
 
-define Image/Build/ar525w
+define Image/Build/Airlink
+       touch $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-$(2).img
+       mv $(KDIR)/root.$(1) $(KDIR)/root.tmp
+       dd of=$(KDIR)/root.$(1) if=$(KDIR)/root.tmp $(call trxalign/$(1)) conv=sync
+       rm -f $(KDIR)/root.tmp
+       $(STAGING_DIR)/bin/airlink -b 1 -j $(shell bash -c 'echo $$[$(3)]') $(KDIR)/bzImage $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-$(2).img
 endef
 
-$(call Image/Build/ar525w,$(1),$(patsubst jffs2-%,jffs2,$(1)))
+define Image/Build
+       $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).bzImage
+       $(call Image/Build/Airlink,$(1),ar525w,$(patsubst jffs2-%k,%,$(1)))
+endef
 
 $(eval $(call BuildImage))