Nanako/openwrt
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

image.mk: move KDIR_TMP definition to a central location

Browse Source 
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
This commit is contained in:
Jonas Gorski 2015-08-14 10:20:53 +00:00
parent 5b25a12e8f
commit bed330204a
5 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/image.mk
View File

@ -15,6 +15,7 @@ override MAKE:=$(_SINGLE)$(SUBMAKE)
override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE) override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE)
KDIR=$(KERNEL_BUILD_DIR) KDIR=$(KERNEL_BUILD_DIR)
KDIR_TMP=$(KDIR)/tmp
DTS_DIR:=$(LINUX_DIR)/arch/$(ARCH)/boot/dts/ DTS_DIR:=$(LINUX_DIR)/arch/$(ARCH)/boot/dts/
IMG_PREFIX:=openwrt-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) IMG_PREFIX:=openwrt-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))

1
target/linux/ar71xx/image/Makefile
View File

@ -961,7 +961,6 @@ endef
LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR) LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
KDIR_TMP:=$(KDIR)/tmp
VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux
UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage

2
target/linux/lantiq/image/Makefile
View File

@ -13,8 +13,6 @@ JFFS2_BLOCKSIZE = 64k 128k 256k
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
KDIR_TMP:=$(KDIR)/tmp
LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR) LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
define Image/BuildLoader/Template define Image/BuildLoader/Template

4
target/linux/mvebu/image/Makefile
View File

@ -12,10 +12,6 @@ include $(INCLUDE_DIR)/image.mk
LOADADDR:=0x00008000 LOADADDR:=0x00008000
KDIR_TMP:=$(KDIR)/tmp
define Image/Build/DTB define Image/Build/DTB
cp $(KDIR)/zImage$(2) $(KDIR)/zImage$(2)-$(1); cp $(KDIR)/zImage$(2) $(KDIR)/zImage$(2)-$(1);
cat $(DTS_DIR)/$(1).dtb >> $(KDIR)/zImage$(2)-$(1); cat $(DTS_DIR)/$(1).dtb >> $(KDIR)/zImage$(2)-$(1);

1
target/linux/oxnas/image/Makefile
View 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_UBI_OPTS = -m 2048 -p 128KiB -s 512
POGOPLUG_V3_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096 POGOPLUG_V3_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
KDIR_TMP:=$(KDIR)/tmp
VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux
UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage