diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-03-11 11:05:18 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-03-12 17:04:54 -0400 |
| commit | f5c66bdb1843dd84a899da6bc34a46563e5847f0 (patch) | |
| tree | 117065e9b144ece96a179f20345fec39d4ede896 | |
| parent | 4ab3fc5eba1d24f37ab33f83ea39c1f7082075d3 (diff) | |
| download | u-boot-imx-f5c66bdb1843dd84a899da6bc34a46563e5847f0.zip u-boot-imx-f5c66bdb1843dd84a899da6bc34a46563e5847f0.tar.gz u-boot-imx-f5c66bdb1843dd84a899da6bc34a46563e5847f0.tar.bz2 | |
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>
| -rw-r--r-- | Makefile | 8 | ||||
| -rwxr-xr-x | mkconfig | 4 |
2 files changed, 5 insertions, 7 deletions
@@ -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) @@ -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 |