x86: Implement panic output for coreboot

[J-u-boot.git] / mkconfig

diff --git a/mkconfig b/mkconfig
index c3e4cea8d9e90e798cb8a8d8cb2a6da889ae1e78..73f852ed8adb977af32f988142a0c245d77b6363 100755 (executable)
--- a/mkconfig
+++ b/mkconfig
@@ -5,27 +5,88 @@
 #
 # Parameters:  Target  Architecture  CPU  Board [VENDOR] [SOC]
 #
-# (C) 2002-2006 DENX Software Engineering, Wolfgang Denk <[email protected]>
+# (C) 2002-2010 DENX Software Engineering, Wolfgang Denk <[email protected]>
 #
 
 APPEND=no      # Default: Create new config file
 BOARD_NAME=""  # Name to print in make output
+TARGETS=""
+
+arch=""
+cpu=""
+board=""
+vendor=""
+soc=""
+options=""
+
+if [ \( $# -eq 2 \) -a \( "$1" = "-A" \) ] ; then
+       # Automatic mode
+       line=`egrep -i "^[[:space:]]*${2}[[:space:]]" boards.cfg` || {
+               echo "make: *** No rule to make target \`$2_config'.  Stop." >&2
+               exit 1
+       }
+
+       set ${line}
+       # add default board name if needed
+       [ $# = 3 ] && set ${line} ${1}
+fi
 
 while [ $# -gt 0 ] ; do
        case "$1" in
        --) shift ; break ;;
        -a) shift ; APPEND=yes ;;
-       -n) shift ; BOARD_NAME="${1%%_config}" ; shift ;;
+       -n) shift ; BOARD_NAME="${1%_config}" ; shift ;;
+       -t) shift ; TARGETS="`echo $1 | sed 's:_: :g'` ${TARGETS}" ; shift ;;
        *)  break ;;
        esac
 done
 
-[ "${BOARD_NAME}" ] || BOARD_NAME="$1"
-
 [ $# -lt 4 ] && exit 1
-[ $# -gt 6 ] && exit 1
+[ $# -gt 7 ] && exit 1
+
+# Strip all options and/or _config suffixes
+CONFIG_NAME="${1%_config}"
 
-echo "Configuring for ${BOARD_NAME} board..."
+[ "${BOARD_NAME}" ] || BOARD_NAME="${1%_config}"
+
+arch="$2"
+cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $1}'`
+spl_cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $2}'`
+if [ "$4" = "-" ] ; then
+       board=${BOARD_NAME}
+else
+       board="$4"
+fi
+[ $# -gt 4 ] && [ "$5" != "-" ] && vendor="$5"
+[ $# -gt 5 ] && [ "$6" != "-" ] && soc="$6"
+[ $# -gt 6 ] && [ "$7" != "-" ] && {
+       # check if we have a board config name in the options field
+       # the options field mave have a board config name and a list
+       # of options, both separated by a colon (':'); the options are
+       # separated by commas (',').
+       #
+       # Check for board name
+       tmp="${7%:*}"
+       if [ "$tmp" ] ; then
+               CONFIG_NAME="$tmp"
+       fi
+       # Check if we only have a colon...
+       if [ "${tmp}" != "$7" ] ; then
+               options=${7#*:}
+               TARGETS="`echo ${options} | sed 's:,: :g'` ${TARGETS}"
+       fi
+}
+
+if [ "${ARCH}" -a "${ARCH}" != "${arch}" ]; then
+       echo "Failed: \$ARCH=${ARCH}, should be '${arch}' for ${BOARD_NAME}" 1>&2
+       exit 1
+fi
+
+if [ "$options" ] ; then
+       echo "Configuring for ${BOARD_NAME} - Board: ${CONFIG_NAME}, Options: ${options}"
+else
+       echo "Configuring for ${BOARD_NAME} board..."
+fi
 
 #
 # Create link to architecture specific headers
@@ -35,42 +96,54 @@ 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/${arch}/include/asm asm
+       LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/
        cd ../include
-       rm -rf asm-$2
-       rm -f asm
-       mkdir asm-$2
-       ln -s asm-$2 asm
+       mkdir -p asm
 else
        cd ./include
        rm -f asm
-       ln -s asm-$2 asm
+       ln -s ../arch/${arch}/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
+if [ -z "${soc}" ] ; then
+       ln -s ${LNPREFIX}arch-${cpu} asm/arch
 else
-       ln -s ${LNPREFIX}arch-$6 asm-$2/arch
+       ln -s ${LNPREFIX}arch-${soc} asm/arch
 fi
 
-if [ "$2" = "arm" ] ; then
-       rm -f asm-$2/proc
-       ln -s ${LNPREFIX}proc-armv asm-$2/proc
+if [ "${arch}" = "arm" ] ; then
+       rm -f asm/proc
+       ln -s ${LNPREFIX}proc-armv asm/proc
 fi
 
 #
 # Create include file for Make
 #
-echo "ARCH   = $2" >  config.mk
-echo "CPU    = $3" >> config.mk
-echo "BOARD  = $4" >> config.mk
+( echo "ARCH   = ${arch}"
+    if [ ! -z "$spl_cpu" ] ; then
+       echo 'ifeq ($(CONFIG_SPL_BUILD),y)'
+       echo "CPU    = ${spl_cpu}"
+       echo "else"
+       echo "CPU    = ${cpu}"
+       echo "endif"
+    else
+       echo "CPU    = ${cpu}"
+    fi
+    echo "BOARD  = ${board}"
 
-[ "$5" ] && [ "$5" != "NULL" ] && echo "VENDOR = $5" >> config.mk
+    [ "${vendor}" ] && echo "VENDOR = ${vendor}"
+    [ "${soc}"    ] && echo "SOC    = ${soc}"
+    exit 0 ) > config.mk
 
-[ "$6" ] && [ "$6" != "NULL" ] && echo "SOC    = $6" >> config.mk
+# Assign board directory to BOARDIR variable
+if [ -z "${vendor}" ] ; then
+    BOARDDIR=${board}
+else
+    BOARDDIR=${vendor}/${board}
+fi
 
 #
 # Create board specific header file
@@ -82,6 +155,28 @@ 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
+       i="`echo ${i} | sed '/=/ {s/=/  /;q; } ; { s/$/ 1/; }'`"
+       echo "#define CONFIG_${i}" >>config.h ;
+done
+
+echo "#define CONFIG_SYS_ARCH  \"${arch}\""  >> config.h
+echo "#define CONFIG_SYS_CPU   \"${cpu}\""   >> config.h
+echo "#define CONFIG_SYS_BOARD \"${board}\"" >> config.h
+
+[ "${vendor}" ] && echo "#define CONFIG_SYS_VENDOR \"${vendor}\"" >> config.h
+
+[ "${soc}"    ] && echo "#define CONFIG_SYS_SOC    \"${soc}\""    >> config.h
+
+cat << EOF >> config.h
+#define CONFIG_BOARDDIR board/$BOARDDIR
+#include <config_cmd_defaults.h>
+#include <config_defaults.h>
+#include <configs/${CONFIG_NAME}.h>
+#include <asm/config.h>
+#include <config_fallbacks.h>
+#include <config_uncmd_spl.h>
+EOF
 
 exit 0