X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fadm5120%2Fimage%2FMakefile;h=f42c0451e8ffaa42b5811956086f11d778e714a1;hb=1894c74cbe6e676838bdf70cd2be235399b46335;hp=710e82be5c345dc4285b3eeb58beb63098848dcd;hpb=e0bf434350dd0cc7190c2892d9010f0c9ae0f394;p=openwrt-10.03%2F.git

diff --git a/target/linux/adm5120/image/Makefile b/target/linux/adm5120/image/Makefile
index 710e82be5..f42c0451e 100644
--- a/target/linux/adm5120/image/Makefile
+++ b/target/linux/adm5120/image/Makefile
@@ -8,8 +8,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
-IMGNAME := $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)
-JFFS2EOF := $(KDIR)/jffs2.eof
+IMGNAME := $(BIN_DIR)/openwrt-$(BOARD)
+JFFS2BLOCK := $(KDIR)/jffs2.block
+JFFS2MARK := $(KDIR)/jffs2.mark
 
 define imgname
 $(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(1))
@@ -21,9 +22,12 @@ endef
 
 define Image/Prepare
 	cat $(KDIR)/vmlinux | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
-	rm -f $(JFFS2EOF)
-	touch $(JFFS2EOF)
-	$(call prepare_generic_squashfs,$(JFFS2EOF))
+	rm -f $(JFFS2BLOCK)
+	touch $(JFFS2BLOCK)
+	$(call prepare_generic_squashfs,$(JFFS2BLOCK))
+	rm -f $(JFFS2MARK)
+	touch $(JFFS2MARK)
+	$(call add_jffs2_mark,$(JFFS2MARK))
 endef
 
 define Image/Build/Loader
@@ -35,7 +39,7 @@ endef
 
 define Image/Build/LZMAKernel
 	$(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \
-		LOADER=openwrt-$(BOARD)-$(KERNEL)-$(1)-ramfs.$(2) \
+		LOADER=openwrt-$(BOARD)-$(1)-ramfs.$(2) \
 		LOADER_DATA=$(KDIR)/vmlinux.lzma \
 		LZMA_TEXT_START=$(3) LZMA_STARTUP_ORG=$(4) \
 		CONFIG_PASS_KARGS=$(5) CONFIG_BOARD=$(6) \
@@ -50,6 +54,10 @@ define Image/Build/LZMAKernel/Admboot
 	$(call Image/Build/LZMAKernel,$(1),$(2),0x80500000,0x6D8,y,$(1))
 endef
 
+define Image/Build/LZMAKernel/Cellvision
+	$(call Image/Build/LZMAKernel,$(1),$(3),0x80500000,0x6D8,y,$(2))
+endef
+
 define Image/Build/LZMAKernel/KArgs
 	$(call Image/Build/LZMAKernel,$(1),$(2),0x80500000,0,y,$(1))
 endef
@@ -63,7 +71,7 @@ define trxalign/jffs2-64k
 endef
 
 define trxalign/squashfs
--a 1024 -f $(KDIR)/root.squashfs -a 0x10000 -A $(JFFS2EOF)
+-a 1024 -f $(KDIR)/root.squashfs -a 0x10000 -A $(JFFS2BLOCK)
 endef
 
 define Image/Build/TRX