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 | e2b57ecf5f1f50f7b5f5644e483e06dd67a3cb5f (patch) | |
tree | f8563604e7685c30b0a2a675ca80379a34114565 /target/linux/avr32/image | |
parent | 040c06438896144dfe148910f922a0d9bb0058b0 (diff) | |
download | upstream-e2b57ecf5f1f50f7b5f5644e483e06dd67a3cb5f.tar.gz upstream-e2b57ecf5f1f50f7b5f5644e483e06dd67a3cb5f.tar.bz2 upstream-e2b57ecf5f1f50f7b5f5644e483e06dd67a3cb5f.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
SVN-Revision: 20834
Diffstat (limited to 'target/linux/avr32/image')
-rw-r--r-- | target/linux/avr32/image/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/target/linux/avr32/image/Makefile b/target/linux/avr32/image/Makefile index 692c325b5e..595a5d9fcf 100644 --- a/target/linux/avr32/image/Makefile +++ b/target/linux/avr32/image/Makefile @@ -1,10 +1,9 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # - include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk @@ -23,7 +22,7 @@ define Image/Prepare endef define Image/BuildKernel - cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage + cp $(KDIR)/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage $(STAGING_DIR_HOST)/bin/lzma e $(LINUX_DIR)/arch/avr32/boot/images/vmlinux.bin $(KDIR)/vmlinux.lzma mkimage -A avr32 -O linux -T kernel -a 0x10000000 -C lzma \ @@ -31,7 +30,7 @@ define Image/BuildKernel -n 'OpenWrt Linux-$(LINUX_VERSION)' \ -d $(KDIR)/vmlinux.lzma $(KDIR)/uImage-lzma - cp $(KDIR)/uImage-lzma $(BIN_DIR)/openwrt-$(BOARD)-uImage-lzma + cp $(KDIR)/uImage-lzma $(BIN_DIR)/$(IMG_PREFIX)-uImage-lzma endef define Image/Build @@ -43,14 +42,14 @@ define Image/Build/squashfs ( \ dd if=$(KDIR)/uImage bs=1024k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \ - ) > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img + ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).img endef define Image/Build/jffs2-64k ( \ dd if=$(KDIR)/uImage bs=1024k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \ - ) > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img + ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).img endef $(eval $(call BuildImage)) |