arm: make 'MAKEALL -a' distinguish between arm and aarch64

[karo-tx-uboot.git] / mkconfig

diff --git a/mkconfig b/mkconfig
index 1d06c8ebfed872da5ba35aad364c764376d5c098..b96c81fbc2b50336e279cd3d78495badaf1fb9de 100755 (executable)
--- a/mkconfig
+++ b/mkconfig
@@ -85,6 +85,13 @@ if [ "${ARCH}" -a "${ARCH}" != "${arch}" ]; then
        exit 1
 fi
 
+#
+# Test above needed aarch64, now we need arm
+#
+if [ "${arch}" = "aarch64" ]; then
+       arch="arm"
+fi
+
 if [ "$options" ] ; then
        echo "Configuring for ${BOARD_NAME} - Board: ${CONFIG_NAME}, Options: ${options}"
 else
@@ -96,17 +103,11 @@ fi
 #
 if [ "$SRCTREE" != "$OBJTREE" ] ; then
        mkdir -p ${OBJTREE}/include
-       mkdir -p ${OBJTREE}/include2
-       cd ${OBJTREE}/include2
-       rm -f asm
-       ln -s ${SRCTREE}/arch/${arch}/include/asm asm
        LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/
-       cd ../include
+       cd ${OBJTREE}/include
        mkdir -p asm
 else
-       cd ./include
-       rm -f asm
-       ln -s ../arch/${arch}/include/asm asm
+       cd arch/${arch}/include
 fi
 
 rm -f asm/arch
@@ -122,6 +123,10 @@ if [ "${arch}" = "arm" ] ; then
        ln -s ${LNPREFIX}proc-armv asm/proc
 fi
 
+if [ "$SRCTREE" = "$OBJTREE" ] ; then
+       cd ${SRCTREE}/include
+fi
+
 #
 # Create include file for Make
 #