diff options
author | Nicolas Thill <nico@openwrt.org> | 2010-04-12 23:15:56 +0000 |
---|---|---|
committer | Nicolas Thill <nico@openwrt.org> | 2010-04-12 23:15:56 +0000 |
commit | 9d42bb1a218d092b8c9447cf16ec2c94f7881c8d (patch) | |
tree | 422842a370190fdfcc59b10055cbbf761974bb76 /target/linux/adm5120/image | |
parent | debf59c4e6f85df3132eae86b2e8c8399040c1ce (diff) | |
download | upstream-9d42bb1a218d092b8c9447cf16ec2c94f7881c8d.tar.gz upstream-9d42bb1a218d092b8c9447cf16ec2c94f7881c8d.tar.bz2 upstream-9d42bb1a218d092b8c9447cf16ec2c94f7881c8d.zip |
define a shared IMG_PREFIX variable used as a basename for image files, it contains board & subtarget infos (if appropriate) allowing subtargets to share the same bin directory without overwriting each other's files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20834 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/image')
-rw-r--r-- | target/linux/adm5120/image/Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/adm5120/image/Makefile b/target/linux/adm5120/image/Makefile index f42c0451e8..cb9af208a2 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,14 +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) JFFS2BLOCK := $(KDIR)/jffs2.block JFFS2MARK := $(KDIR)/jffs2.mark -define imgname -$(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(1)) -endef - define Build/Clean $(LOADER_MAKE) clean endef @@ -39,7 +34,7 @@ endef define Image/Build/LZMAKernel $(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \ - LOADER=openwrt-$(BOARD)-$(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) \ |