Move architecture-specific includes to arch/$ARCH/include/asm

This helps to clean up the include/ directory so that it only contains
non-architecture-specific headers and also matches Linux's directory
layout which many U-Boot developers are already familiar with.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

1 files changed, 9 insertions, 11 deletions

diff --git a/mkconfig b/mkconfig
index 0f7f13e3a4..d3109e412c 100755
--- a/mkconfig
+++ b/mkconfig
@@ -42,30 +42,28 @@ if [ "$SRCTREE" != "$OBJTREE" ] ; then
 	mkdir -p ${OBJTREE}/include2
 	cd ${OBJTREE}/include2
 	rm -f asm
-	ln -s ${SRCTREE}/include/asm-$2 asm
-	LNPREFIX="../../include2/asm/"
+	ln -s ${SRCTREE}/arch/$2/include/asm asm
+	LNPREFIX=${SRCTREE}/arch/$2/include/asm/
 	cd ../include
-	rm -rf asm-$2
 	rm -f asm
-	mkdir asm-$2
-	ln -s asm-$2 asm
+	ln -s ${SRCTREE}/arch/$2/include/asm asm
 else
 	cd ./include
 	rm -f asm
-	ln -s asm-$2 asm
+	ln -s ../arch/$2/include/asm asm
 fi
 
-rm -f asm-$2/arch
+rm -f asm/arch
 
 if [ -z "$6" -o "$6" = "NULL" ] ; then
-	ln -s ${LNPREFIX}arch-$3 asm-$2/arch
+	ln -s ${LNPREFIX}arch-$3 asm/arch
 else
-	ln -s ${LNPREFIX}arch-$6 asm-$2/arch
+	ln -s ${LNPREFIX}arch-$6 asm/arch
 fi
 
 if [ "$2" = "arm" ] ; then
-	rm -f asm-$2/proc
-	ln -s ${LNPREFIX}proc-armv asm-$2/proc
+	rm -f asm/proc
+	ln -s ${LNPREFIX}proc-armv asm/proc
 fi
 
 #