X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/747262510678320666ca9fbf41e89f1968ae1902..869647d532739acaa9c5a95c39b2d24fbcdac877:/target/linux/adm5120/image/Makefile diff --git a/target/linux/adm5120/image/Makefile b/target/linux/adm5120/image/Makefile index ba3dd38f7..f628456ab 100644 --- 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,11 +8,11 @@ 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 +JFFS2BLOCK := $(KDIR)/jffs2.block +JFFS2MARK := $(KDIR)/jffs2.mark define imgname -$(IMGNAME)-$(patsubst jffs2-%,jffs2,$(1))-$(2) +$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(patsubst jffs2-%,jffs2,$(1)) endef define Build/Clean @@ -21,9 +21,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 +38,7 @@ endef define Image/Build/LZMAKernel $(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \ - LOADER=openwrt-$(BOARD)-$(KERNEL)-ramfs-lzma-$(1).$(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 +53,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 +70,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