Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / mkconfig

diff --git a/mkconfig b/mkconfig
index 9827e4deb4dcbc6a59622211ef55687c611e07de..2bf5897528d9fbc14377033a48dad47f5b9e3386 100755 (executable)
--- a/mkconfig
+++ b/mkconfig
@@ -103,10 +103,10 @@ fi
 #
 # Create link to architecture specific headers
 #
-if [ "$SRCTREE" != "$OBJTREE" ] ; then
-       mkdir -p ${OBJTREE}/include
-       LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/
-       cd ${OBJTREE}/include
+if [ -n "$KBUILD_SRC" ] ; then
+       mkdir -p ${objtree}/include
+       LNPREFIX=${srctree}/arch/${arch}/include/asm/
+       cd ${objtree}/include
        mkdir -p asm
 else
        cd arch/${arch}/include
@@ -120,13 +120,8 @@ else
        ln -s ${LNPREFIX}arch-${soc} asm/arch
 fi
 
-if [ "${arch}" = "arm" ] ; then
-       rm -f asm/proc
-       ln -s ${LNPREFIX}proc-armv asm/proc
-fi
-
-if [ "$SRCTREE" = "$OBJTREE" ] ; then
-       cd ${SRCTREE}/include
+if [ -z "$KBUILD_SRC" ] ; then
+       cd ${srctree}/include
 fi
 
 #