image.mk: move KDIR_TMP definition to a central location
authorJonas Gorski <jogo@openwrt.org>
Fri, 14 Aug 2015 10:20:53 +0000 (10:20 +0000)
committerJonas Gorski <jogo@openwrt.org>
Fri, 14 Aug 2015 10:20:53 +0000 (10:20 +0000)
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

include/image.mk
target/linux/ar71xx/image/Makefile
target/linux/lantiq/image/Makefile
target/linux/mvebu/image/Makefile
target/linux/oxnas/image/Makefile

index 9dfce11..979db5f 100644 (file)
@@ -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))
index e894d78..2896c01 100644 (file)
@@ -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
 
index cbe334c..0627b5b 100644 (file)
@@ -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
index df75836..7f270dd 100644 (file)
@@ -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);
index de6c4db..953aa03 100644 (file)
@@ -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