aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-08-14 10:20:53 +0000
committerJonas Gorski <jogo@openwrt.org>2015-08-14 10:20:53 +0000
commitbed330204a9f42a6796cb381cf4d67cc5cd7891e (patch)
tree263866c707db92a7fd59b30c440974032091d4b6
parent5b25a12e8fa741e4a63b081be1111a3194b86bf4 (diff)
downloadupstream-bed330204a9f42a6796cb381cf4d67cc5cd7891e.tar.gz
upstream-bed330204a9f42a6796cb381cf4d67cc5cd7891e.tar.bz2
upstream-bed330204a9f42a6796cb381cf4d67cc5cd7891e.zip
image.mk: move KDIR_TMP definition to a central location
Instead of each target defining it the same, move the KDIR_TMP definition to include/image.mk. In addition Image/Build/SysupgradeNAND already requires KDIR_TMP to be set, so it makes sense to have it globally defined. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46592
-rw-r--r--include/image.mk1
-rw-r--r--target/linux/ar71xx/image/Makefile1
-rw-r--r--target/linux/lantiq/image/Makefile2
-rw-r--r--target/linux/mvebu/image/Makefile4
-rw-r--r--target/linux/oxnas/image/Makefile1
5 files changed, 1 insertions, 8 deletions
diff --git a/include/image.mk b/include/image.mk
index 9dfce111a6..979db5f554 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -15,6 +15,7 @@ override MAKE:=$(_SINGLE)$(SUBMAKE)
override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE)
KDIR=$(KERNEL_BUILD_DIR)
+KDIR_TMP=$(KDIR)/tmp
DTS_DIR:=$(LINUX_DIR)/arch/$(ARCH)/boot/dts/
IMG_PREFIX:=openwrt-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index e894d78c62..2896c0101d 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -961,7 +961,6 @@ endef
LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
-KDIR_TMP:=$(KDIR)/tmp
VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux
UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index cbe334cb9c..0627b5bd7c 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -13,8 +13,6 @@ JFFS2_BLOCKSIZE = 64k 128k 256k
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
-KDIR_TMP:=$(KDIR)/tmp
-
LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
define Image/BuildLoader/Template
diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile
index df75836412..7f270dd530 100644
--- a/target/linux/mvebu/image/Makefile
+++ b/target/linux/mvebu/image/Makefile
@@ -12,10 +12,6 @@ include $(INCLUDE_DIR)/image.mk
LOADADDR:=0x00008000
-
-KDIR_TMP:=$(KDIR)/tmp
-
-
define Image/Build/DTB
cp $(KDIR)/zImage$(2) $(KDIR)/zImage$(2)-$(1);
cat $(DTS_DIR)/$(1).dtb >> $(KDIR)/zImage$(2)-$(1);
diff --git a/target/linux/oxnas/image/Makefile b/target/linux/oxnas/image/Makefile
index de6c4db3ab..953aa0304e 100644
--- a/target/linux/oxnas/image/Makefile
+++ b/target/linux/oxnas/image/Makefile
@@ -19,7 +19,6 @@ POGOPLUG_PRO_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
POGOPLUG_V3_UBI_OPTS = -m 2048 -p 128KiB -s 512
POGOPLUG_V3_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
-KDIR_TMP:=$(KDIR)/tmp
VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux
UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage