From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Tue, 11 Mar 2014 02:05:18 +0000 (+0900)
Subject: kbuild: use $(KBUILD_SRC) to check out-of-tree build
X-Git-Tag: v2014.04-rc3~70
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f5c66bdb1843dd84a899da6bc34a46563e5847f0;p=u-boot

kbuild: use $(KBUILD_SRC) to check out-of-tree build

Non-empty $(KBUILD_SRC) means out-of-tree build.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

diff --git a/Makefile b/Makefile
index 8a1fe9bcae..1b1cfb85ed 100644
--- a/Makefile
+++ b/Makefile
@@ -556,11 +556,9 @@ export CONFIG_SYS_TEXT_BASE
 
 # Use UBOOTINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
-UBOOTINCLUDE    :=
-ifneq ($(OBJTREE),$(SRCTREE))
-UBOOTINCLUDE	+= -I$(OBJTREE)/include
-endif
-UBOOTINCLUDE	+= -I$(srctree)/include \
+UBOOTINCLUDE    := \
+		-Iinclude \
+		$(if $(KBUILD_SRC), -I$(srctree)/include) \
 		-I$(srctree)/arch/$(ARCH)/include
 
 NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
diff --git a/mkconfig b/mkconfig
index 9827e4deb4..b755d2ac69 100755
--- a/mkconfig
+++ b/mkconfig
@@ -103,7 +103,7 @@ fi
 #
 # Create link to architecture specific headers
 #
-if [ "$SRCTREE" != "$OBJTREE" ] ; then
+if [ -n "$KBUILD_SRC" ] ; then
 	mkdir -p ${OBJTREE}/include
 	LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/
 	cd ${OBJTREE}/include
@@ -125,7 +125,7 @@ if [ "${arch}" = "arm" ] ; then
 	ln -s ${LNPREFIX}proc-armv asm/proc
 fi
 
-if [ "$SRCTREE" = "$OBJTREE" ] ; then
+if [ -z "$KBUILD_SRC" ] ; then
 	cd ${SRCTREE}/include
 fi