Bugfix: remove embedded null (\0) from CFG_BOOTFILE macro in TQM8540_config

[J-u-boot.git] / mkconfig

diff --git a/mkconfig b/mkconfig
index 4fe6e448bee49de675e1483092debe110ade7de2..c3e4cea8d9e90e798cb8a8d8cb2a6da889ae1e78 100755 (executable)
--- a/mkconfig
+++ b/mkconfig
@@ -5,7 +5,7 @@
 #
 # Parameters:  Target  Architecture  CPU  Board [VENDOR] [SOC]
 #
-# (C) 2002 DENX Software Engineering, Wolfgang Denk <[email protected]>
+# (C) 2002-2006 DENX Software Engineering, Wolfgang Denk <[email protected]>
 #
 
 APPEND=no      # Default: Create new config file
@@ -27,24 +27,38 @@ done
 
 echo "Configuring for ${BOARD_NAME} board..."
 
-cd ./include
-
 #
 # Create link to architecture specific headers
 #
-rm -f asm
-ln -s asm-$2 asm
+if [ "$SRCTREE" != "$OBJTREE" ] ; then
+       mkdir -p ${OBJTREE}/include
+       mkdir -p ${OBJTREE}/include2
+       cd ${OBJTREE}/include2
+       rm -f asm
+       ln -s ${SRCTREE}/include/asm-$2 asm
+       LNPREFIX="../../include2/asm/"
+       cd ../include
+       rm -rf asm-$2
+       rm -f asm
+       mkdir asm-$2
+       ln -s asm-$2 asm
+else
+       cd ./include
+       rm -f asm
+       ln -s asm-$2 asm
+fi
+
 rm -f asm-$2/arch
 
 if [ -z "$6" -o "$6" = "NULL" ] ; then
-       ln -s arch-$3 asm-$2/arch
+       ln -s ${LNPREFIX}arch-$3 asm-$2/arch
 else
-       ln -s arch-$6 asm-$2/arch
+       ln -s ${LNPREFIX}arch-$6 asm-$2/arch
 fi
 
 if [ "$2" = "arm" ] ; then
        rm -f asm-$2/proc
-       ln -s proc-armv asm-$2/proc
+       ln -s ${LNPREFIX}proc-armv asm-$2/proc
 fi
 
 #