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

[karo-tx-uboot.git] / mkconfig

diff --git a/mkconfig b/mkconfig
index 4fe6e448bee49de675e1483092debe110ade7de2..d3109e412c4b7837d57b5b8971410d7c013fa7ca 100755 (executable)
--- a/mkconfig
+++ b/mkconfig
@@ -5,17 +5,19 @@
 #
 # Parameters:  Target  Architecture  CPU  Board [VENDOR] [SOC]
 #
-# (C) 2002 DENX Software Engineering, Wolfgang Denk <wd@denx.de>
+# (C) 2002-2006 DENX Software Engineering, Wolfgang Denk <wd@denx.de>
 #
 
 APPEND=no      # Default: Create new config file
 BOARD_NAME=""  # Name to print in make output
+TARGETS=""
 
 while [ $# -gt 0 ] ; do
        case "$1" in
        --) shift ; break ;;
        -a) shift ; APPEND=yes ;;
        -n) shift ; BOARD_NAME="${1%%_config}" ; shift ;;
+       -t) shift ; TARGETS="`echo $1 | sed 's:_: :g'` ${TARGETS}" ; shift ;;
        *)  break ;;
        esac
 done
@@ -25,26 +27,43 @@ done
 [ $# -lt 4 ] && exit 1
 [ $# -gt 6 ] && exit 1
 
-echo "Configuring for ${BOARD_NAME} board..."
+if [ "${ARCH}" -a "${ARCH}" != "$2" ]; then
+       echo "Failed: \$ARCH=${ARCH}, should be '$2' for ${BOARD_NAME}" 1>&2
+       exit 1
+fi
 
-cd ./include
+echo "Configuring for ${BOARD_NAME} board..."
 
 #
 # Create link to architecture specific headers
 #
-rm -f asm
-ln -s asm-$2 asm
-rm -f asm-$2/arch
+if [ "$SRCTREE" != "$OBJTREE" ] ; then
+       mkdir -p ${OBJTREE}/include
+       mkdir -p ${OBJTREE}/include2
+       cd ${OBJTREE}/include2
+       rm -f asm
+       ln -s ${SRCTREE}/arch/$2/include/asm asm
+       LNPREFIX=${SRCTREE}/arch/$2/include/asm/
+       cd ../include
+       rm -f asm
+       ln -s ${SRCTREE}/arch/$2/include/asm asm
+else
+       cd ./include
+       rm -f asm
+       ln -s ../arch/$2/include/asm asm
+fi
+
+rm -f asm/arch
 
 if [ -z "$6" -o "$6" = "NULL" ] ; then
-       ln -s arch-$3 asm-$2/arch
+       ln -s ${LNPREFIX}arch-$3 asm/arch
 else
-       ln -s arch-$6 asm-$2/arch
+       ln -s ${LNPREFIX}arch-$6 asm/arch
 fi
 
 if [ "$2" = "arm" ] ; then
-       rm -f asm-$2/proc
-       ln -s proc-armv asm-$2/proc
+       rm -f asm/proc
+       ln -s ${LNPREFIX}proc-armv asm/proc
 fi
 
 #
@@ -58,6 +77,13 @@ echo "BOARD  = $4" >> config.mk
 
 [ "$6" ] && [ "$6" != "NULL" ] && echo "SOC    = $6" >> config.mk
 
+# Assign board directory to BOARDIR variable
+if [ -z "$5" -o "$5" = "NULL" ] ; then
+    BOARDDIR=$4
+else
+    BOARDDIR=$5/$4
+fi
+
 #
 # Create board specific header file
 #
@@ -68,6 +94,16 @@ else
        > config.h              # Create new config file
 fi
 echo "/* Automatically generated - do not edit */" >>config.h
-echo "#include <configs/$1.h>" >>config.h
+
+for i in ${TARGETS} ; do
+       echo "#define CONFIG_MK_${i} 1" >>config.h ;
+done
+
+cat << EOF >> config.h
+#define CONFIG_BOARDDIR board/$BOARDDIR
+#include <config_defaults.h>
+#include <configs/$1.h>
+#include <asm/config.h>
+EOF
 
 exit 0