define a shared IMG_PREFIX variable used as a basename for image files, it contains...

[openwrt/staging/florian.git] / target / linux / adm5120 / image / Makefile

diff --git a/target/linux/adm5120/image/Makefile b/target/linux/adm5120/image/Makefile
index 710e82be5c345dc4285b3eeb58beb63098848dcd..cb9af208a24923ce4f8cafb7b2245fe86e463448 100644 (file)
--- a/target/linux/adm5120/image/Makefile
+++ b/target/linux/adm5120/image/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006,2007 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,8 @@ 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
-
-define imgname
-$(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(1))
-endef
+JFFS2BLOCK := $(KDIR)/jffs2.block
+JFFS2MARK := $(KDIR)/jffs2.mark
 
 define Build/Clean
        $(LOADER_MAKE) clean
@@ -21,9 +17,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 +34,7 @@ endef
 
 define Image/Build/LZMAKernel
        $(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \
-               LOADER=openwrt-$(BOARD)-$(KERNEL)-$(1)-ramfs.$(2) \
+               LOADER=$(BIN_DIR)/$(IMG_PREFIX)-$(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 +49,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 +66,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