add Kbuild support to abuild and enable it per default;
[coreboot.git] / util / abuild / abuild
index 173acd01b9445361a7a4e56bae358d460633aa48..bb43d368298b6258b2309ecce5d4978cf30f8c89 100755 (executable)
@@ -1,11 +1,11 @@
 #!/bin/bash
 #
-#  LinuxBIOS autobuild
+#  coreboot autobuild
 #
-#  This script builds LinuxBIOS images for all available targets.
+#  This script builds coreboot images for all available targets.
 #
 #  (C) 2004 by Stefan Reinauer <stepan@openbios.org>
-#  (C) 2006 by coresystems GmbH <info@coresystems.de>
+#  (C) 2006-2010 by coresystems GmbH <info@coresystems.de>
 #
 #  This file is subject to the terms and conditions of the GNU General
 #  Public License. See the file COPYING in the main directory of this
 
 #set -x # Turn echo on....
 
-ABUILD_DATE="October 24, 2006"
-ABUILD_VERSION="0.4"
+ABUILD_DATE="January 29th, 2010"
+ABUILD_VERSION="0.9"
 
 # Where shall we place all the build trees?
-TARGET=$( pwd )/linuxbios-builds
+TARGET=$( pwd )/coreboot-builds
 XMLFILE=$( pwd )/abuild.xml
 
 # path to payload. Should be more generic
@@ -27,16 +27,45 @@ PAYLOAD=/dev/null
 # Lines of error context to be printed in FAILURE case
 CONTEXT=5
 
-TESTSUBMISSION="http://qa.linuxbios.org/deployment/send.php"
+TESTSUBMISSION="http://qa.coreboot.org/deployment/send.php"
+
+# Number of CPUs to compile on per default
+cpus=1
+
+# Configure-only mode
+configureonly=0
+# use old config method "newconfig"
+oldconfig=0
 
 # One might want to adjust these in case of cross compiling
-MAKE="make"
+for i in make gmake gnumake nonexistant_make; do
+       $i --version 2>/dev/null |grep "GNU Make" >/dev/null && break
+done
+if [ "$i" = "nonexistant_make" ]; then
+       echo No GNU Make found.
+       exit 1
+fi
+MAKE=$i
 PYTHON=python
 
 # this can be changed to xml by -x
 mode=text
 
+# silent mode.. no compiler calls, only warnings in the log files.
+# this is disabled per default but can be enabled with -s
+silent=
+
+# clang mode enabled by -sb option.
+scanbuild=false
+
+# stackprotect mode enabled by -ns option.
+stackprotect=false
+
+# loglevel changed with -l / --loglevel option
+loglevel=default
+
 ARCH=`uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+       -e s/i86pc/i386/ \
        -e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/ \
        -e "s/Power Macintosh/ppc/"`
 
@@ -76,7 +105,7 @@ function vendors
 {
        # make this a function so we can easily select
        # without breaking readability
-       ls -1 "$LBROOT/src/mainboard" | grep -v CVS
+       ls -1 "$ROOT/src/mainboard" | grep -v Kconfig | grep -v Makefile
 }
 
 function mainboards
@@ -86,32 +115,44 @@ function mainboards
        
        VENDOR=$1
        
-       ls -1 $LBROOT/src/mainboard/$VENDOR | grep -v CVS 
+       ls -1 $ROOT/src/mainboard/$VENDOR | grep -v Kconfig
 }
 
 function architecture
 {
        VENDOR=$1
        MAINBOARD=$2
-       cat $LBROOT/src/mainboard/$VENDOR/$MAINBOARD/Config.lb | \
-               grep ^arch | cut -f 2 -d\ 
+       if [ $oldconfig -eq 1 ]; then
+               ARCH=`cat $ROOT/src/mainboard/$VENDOR/$MAINBOARD/Config.lb | \
+                       grep ^arch | cut -f 2 -d\ `
+               echo $ARCH | sed s/ppc/powerpc/
+       else
+               ARCH=`cat $ROOT/src/mainboard/$VENDOR/$MAINBOARD/Kconfig | \
+                       grep "select ARCH_"|cut -f2- -d_`
+               echo $ARCH | sed s/X86/i386/
+       fi
 }
 
-function create_config
+function create_config_old
 {
        VENDOR=$1
        MAINBOARD=$2
+       CONFIG=$3
        TARCH=$( architecture $VENDOR $MAINBOARD )
-       TARGCONFIG=$LBROOT/targets/$VENDOR/$MAINBOARD/Config-abuild.lb
+       TARGCONFIG=$ROOT/targets/$VENDOR/$MAINBOARD/Config-abuild.lb
+
+       if [ "$CONFIG" != "" ]; then
+               TARGCONFIG=$ROOT/targets/$VENDOR/$MAINBOARD/$CONFIG
+       fi
 
         # get a working payload for the board if we have one.
         # the --payload option expects a directory containing 
-       # an executable shell script payload.sh
+       # a shell script payload.sh
        #   Usage: payload.sh [VENDOR] [DEVICE]
        # the script returns an absolute path to the payload binary.
 
-       if [ -x $payloads/payload.sh ]; then
-               PAYLOAD=`$payloads/payload.sh $VENDOR $MAINBOARD`
+       if [ -f $payloads/payload.sh ]; then
+               PAYLOAD=`sh $payloads/payload.sh $VENDOR $MAINBOARD`
                printf "Using payload $PAYLOAD\n"
        fi
        
@@ -122,7 +163,6 @@ function create_config
                printf "Using existing test target $TARGCONFIG"
                xml "  <config>$TARGCONFIG</config>"
        else
-
                printf "  Creating config file..."
                xml "  <config>autogenerated</config>"
                ( cat << EOF
@@ -132,58 +172,142 @@ target VENDOR_MAINBOARD
 mainboard VENDOR/MAINBOARD
 
 option CC="CROSSCC"
-option CROSS_COMPILE="CROSS_PREFIX"
+option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 EOF
                if [ "$TARCH" == i386 ] ; then
                        cat <<EOF
 romimage "normal"
-       option USE_FALLBACK_IMAGE=0
-       option ROM_IMAGE_SIZE=0x17000
-       option LINUXBIOS_EXTRA_VERSION=".0-normal"
+       option CONFIG_USE_FALLBACK_IMAGE=0
+       option COREBOOT_EXTRA_VERSION=".0-normal"
        payload __PAYLOAD__
 end
 
 romimage "fallback" 
-       option USE_FALLBACK_IMAGE=1
-       option ROM_IMAGE_SIZE=0x17000
-       option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+       option CONFIG_USE_FALLBACK_IMAGE=1
+       option COREBOOT_EXTRA_VERSION=".0-fallback"
        payload __PAYLOAD__
 end
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
 EOF
                else
                        cat <<EOF
 romimage "only"
-       option LINUXBIOS_EXTRA_VERSION=".0"
+       option COREBOOT_EXTRA_VERSION=".0"
        payload __PAYLOAD__
 end
-buildrom ./linuxbios.rom ROM_SIZE "only"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "only"
 EOF
                fi 
                ) > $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
        fi
 
-       if [ "`which lzma`" != "" -a "$PAYLOAD" != /dev/null ]; then
-               COMPRESSION="option CONFIG_COMPRESSED_PAYLOAD_LZMA=1"
+       if [ "$loglevel" != "default" ]; then
+               LOGLEVEL1="option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=$loglevel"
+               LOGLEVEL2="option CONFIG_DEFAULT_CONSOLE_LOGLEVEL=$loglevel"
        else
-               COMPRESSION="# no compression"
+               LOGLEVEL1="# no loglevel override"
+               LOGLEVEL2=""
+       fi
+
+       COMPRESSION="# no compression"
+       if which lzma >/dev/null 2>/dev/null; then
+               if [ "$PAYLOAD" != /dev/null ]; then
+                       COMPRESSION="option CONFIG_COMPRESSED_PAYLOAD_LZMA=1"
+               fi
        fi
 
-       sed -i.pre -e s,VENDOR,$VENDOR,g \
-               -e s,MAINBOARD,$MAINBOARD,g \
-               -e s,payload\ __PAYLOAD__,payload\ $PAYLOAD,g \
-               -e s,CROSSCC,"$CC",g \
-               -e s,CROSS_PREFIX,"$CROSS_COMPILE",g \
-               -e s,CROSS_HOSTCC,"$HOSTCC",g \
-               -e s,__COMPRESSION__,"$COMPRESSION",g \
-               $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
+       cp $TARGET/Config-${VENDOR}_${MAINBOARD}.lb $TARGET/Config-${VENDOR}_${MAINBOARD}.lb.pre
+       sed -e s:VENDOR:$VENDOR:g \
+               -e s:MAINBOARD:$MAINBOARD:g \
+               -e s:payload\ __PAYLOAD__:payload\ $PAYLOAD:g \
+               -e s:CROSSCC:"$CC":g \
+               -e s:CROSS_PREFIX:"$CROSS_COMPILE":g \
+               -e s:CROSS_HOSTCC:"$HOSTCC":g \
+               -e s:__COMPRESSION__:"$COMPRESSION":g \
+               -e s:__LOGLEVEL__:"$LOGLEVEL1"\
+"$LOGLEVEL2":g \
+               $TARGET/Config-${VENDOR}_${MAINBOARD}.lb.pre > $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
        printf " ok\n"
 }
 
+function create_config
+{
+       VENDOR=$1
+       MAINBOARD=$2
+       CONFIG=$3
+
+       build_dir=$TARGET/${VENDOR}_${MAINBOARD}
+
+        # get a working payload for the board if we have one.
+        # the --payload option expects a directory containing 
+       # a shell script payload.sh
+       #   Usage: payload.sh [VENDOR] [DEVICE]
+       # the script returns an absolute path to the payload binary.
+
+       if [ -f $payloads/payload.sh ]; then
+               PAYLOAD=`sh $payloads/payload.sh $VENDOR $MAINBOARD`
+               printf "Using payload $PAYLOAD\n"
+       fi
+
+       $MAKE distclean obj=${build_dir}
+       mkdir -p ${build_dir}
+
+       if [ "$CONFIG" != "" ]; then
+               printf "  Using existing configuration $CONFIG ... "
+               xml "  <config>$CONFIG</config>"
+               cp $CONFIG .config
+       else
+               printf "  Creating config file... "
+               xml "  <config>autogenerated</config>"
+               grep "depends[\t ]on[\t ]*VENDOR" src/mainboard/$VENDOR/$MAINBOARD/../Kconfig | \
+                       sed "s,^.*\(VENDOR_.*\)[^A-Z0-9_]*,CONFIG_\1=y," > .config
+               grep "config[\t ]*BOARD" src/mainboard/$VENDOR/$MAINBOARD/Kconfig | \
+                       sed "s,^.*\(BOARD_.*\)[^A-Z0-9_]*,CONFIG_\1=y," >> .config
+               grep "select[\t ]*ARCH" src/mainboard/$VENDOR/$MAINBOARD/Kconfig | \
+                       sed "s,^.*\(ARCH_.*\)[^A-Z0-9_]*,CONFIG_\1=y," >> .config
+               echo "CONFIG_MAINBOARD_DIR=\"$VENDOR/$MAINBOARD\"" >> .config
+               if [ "$PAYLOAD" != "/dev/null" ]; then
+                       echo "# CONFIG_PAYLOAD_NONE is not set" >> .config
+                       echo "CONFIG_PAYLOAD_ELF=\"$PAYLOAD\"" >> .config
+               fi
+
+               if [ "$loglevel" != "default" ]; then
+                       printf "(loglevel override) "
+                       echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL_$loglevel=y"
+                       echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=$loglevel"
+                       echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL_$loglevel=y"
+                       echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL=$loglevel"
+               fi
+       fi
+
+       yes "" | $MAKE oldconfig obj=${build_dir} > ${build_dir}/config.log
+       ret=$?
+       mv .config.old $TARGET/${VENDOR}_${MAINBOARD}/config.in
+       if [ $ret -eq 0 ]; then
+               printf "ok\n"
+               xml "  <builddir>ok</builddir>"
+               xml "  <log>"
+               xmlfile $build_dir/config.log
+               xml "  </log>"
+               xml ""
+               return 0
+       else
+               printf "FAILED! Log excerpt:\n"
+               xml "  <builddir>failed</builddir>"
+               xml "  <log>"
+               xmlfile $build_dir/config.log
+               xml "  </log>"
+               xml ""
+               tail -n $CONTEXT $build_dir/config.log 2> /dev/null || tail -$CONTEXT $build_dir/config.log
+               return 1
+       fi
+}
+
 function create_builddir
 {      
        VENDOR=$1
@@ -192,7 +316,7 @@ function create_builddir
        printf "  Creating builddir..."
 
        target_dir=$TARGET
-       config_dir=$LBROOT/util/newconfig
+       config_dir=$ROOT/util/newconfig
        yapps2_py=$config_dir/yapps2.py
        config_g=$config_dir/config.g
        config_lb=Config-${VENDOR}_${MAINBOARD}.lb
@@ -212,10 +336,13 @@ function create_builddir
        # make sure config.py is up-to-date
 
        export PYTHONPATH=$config_dir
-       $PYTHON $config_py $config_lb $LBROOT &> $build_dir/config.log
+       $PYTHON $config_py $config_lb $ROOT &> $build_dir/config.log
        if [ $? -eq 0 ]; then
                printf "ok\n"
                xml "  <builddir>ok</builddir>"
+               xml "  <log>"
+               xmlfile $build_dir/config.log
+               xml "  </log>"
                xml ""
                return 0
        else
@@ -225,7 +352,7 @@ function create_builddir
                xmlfile $build_dir/config.log
                xml "  </log>"
                xml ""
-               tail -n $CONTEXT $build_dir/config.log
+               tail -n $CONTEXT $build_dir/config.log 2> /dev/null || tail -$CONTEXT $build_dir/config.log
                return 1
        fi
 }
@@ -234,8 +361,14 @@ function create_buildenv
 {
        VENDOR=$1
        MAINBOARD=$2
-       create_config $VENDOR $MAINBOARD
-       create_builddir $VENDOR $MAINBOARD
+       CONFIG=$3
+       if [ $oldconfig -eq 1 ]; then
+               create_config_old $VENDOR $MAINBOARD $CONFIG
+               create_builddir $VENDOR $MAINBOARD
+       else
+               create_config $VENDOR $MAINBOARD $CONFIG
+               cp .config $TARGET/${VENDOR}_${MAINBOARD}/coreboot.config
+       fi
 }
 
 function compile_target
@@ -243,17 +376,35 @@ function compile_target
        VENDOR=$1
        MAINBOARD=$2
 
-       printf "  Compiling image .."
+       printf "  Compiling image "
+       test "$cpus" == "" && printf "in parallel .. "
+       test "$cpus" == "1" && printf "on 1 cpu .. "
+       test 0$cpus -gt 1 && printf "on %d cpus in parallel .. " $cpus
+
        CURR=$( pwd )
-       cd $TARGET/${VENDOR}_${MAINBOARD}
-       stime=`date +%s`
-       eval $MAKE &> make.log
-       ret=$?
-       etime=`date +%s`
+       stime=`perl -e 'print time();'`
+       if [ $oldconfig -eq 1 ]; then
+               cd $TARGET/${VENDOR}_${MAINBOARD}
+               eval $MAKE $silent -j $cpus &> make.log
+               ret=$?
+       else
+               build_dir=$TARGET/${VENDOR}_${MAINBOARD}
+               eval $MAKE $silent -j $cpus obj=${build_dir} \
+                       &> ${build_dir}/make.log
+               ret=$?
+               mv .config ${build_dir}/config.build
+               mv .xcompile ${build_dir}/xcompile.build
+               mv ..config.tmp ${build_dir}/config.deps
+               cd $TARGET/${VENDOR}_${MAINBOARD}
+       fi
+       etime=`perl -e 'print time();'`
        duration=$(( $etime - $stime ))
        if [ $ret -eq 0 ]; then
                xml "  <compile>ok</compile>"
                xml "  <compiletime>${duration}s</compiletime>"
+               xml "  <log>"
+               xmlfile make.log
+               xml "  </log>"
                printf "ok\n" > compile.status
                printf "ok. (took ${duration}s)\n"
                cd $CURR
@@ -266,7 +417,7 @@ function compile_target
                xml "  </log>"
 
                printf "FAILED after ${duration}s! Log excerpt:\n"
-               tail -n $CONTEXT make.log
+               tail -n $CONTEXT make.log 2> /dev/null || tail -$CONTEXT make.log
                cd $CURR
                return 1
        fi
@@ -290,7 +441,7 @@ function build_broken
 {
        CURR=`pwd`
        status="yes"
-       [ -r "$LBROOT/src/mainboard/${VENDOR}/${MAINBOARD}/BROKEN" ] && status="no"
+       [ -r "$ROOT/src/mainboard/${VENDOR}/${MAINBOARD}/BROKEN" ] && status="no"
        [ "$buildbroken" == "true" -o "$status" == "yes" ]
 }
 
@@ -298,12 +449,32 @@ function build_target
 {
        VENDOR=$1
        MAINBOARD=$2
+       CONFIG=$3
        TARCH=$( architecture $VENDOR $MAINBOARD )
 
+       # Allow architecture override in an abuild.info file.
+       # This is used for the Motorola Sandpoint, which is not a real target
+       # but a skeleton target for the Sandpoint X3.
+       [ -r "$ROOT/src/mainboard/${VENDOR}/${MAINBOARD}/abuild.info" ] && \
+               source $ROOT/src/mainboard/${VENDOR}/${MAINBOARD}/abuild.info
+
        # default setting
-       CC='$(CROSS_COMPILE)gcc'
-       HOSTCC='gcc'
-       CROSS_COMPILE=''
+
+       CC="${CROSS_COMPILE}gcc"
+       CROSS_COMPILE=""
+       found_crosscompiler=false
+       if which $TARCH-elf-gcc 2>/dev/null >/dev/null; then
+               # i386-elf target needs --divide, for i386-linux, that's the default
+               if [ "$TARCH" = "i386" ]; then
+                       CC="$CC -Wa,--divide"
+               fi
+               CROSS_COMPILE="$TARCH-elf-"
+               CC=gcc
+               echo using $CROSS_COMPILE$CC
+               found_crosscompiler=true
+       fi
+
+       HOSTCC='gcc'
 
        printf "Processing mainboard/$VENDOR/$MAINBOARD"
 
@@ -314,11 +485,8 @@ function build_target
        xml ""
        xml "  <architecture>$TARCH</architecture>"
        xml ""
-       
-       [ -r "$LBROOT/src/mainboard/${VENDOR}/${MAINBOARD}/abuild.info" ] && \
-               source $LBROOT/src/mainboard/${VENDOR}/${MAINBOARD}/abuild.info
-       
-       if [ "$ARCH" == "$TARCH" ]; then
+
+       if [ "$ARCH" = "$TARCH" -o $found_crosscompiler = true ]; then
                printf " ($TARCH: ok)\n"
        else
                found_crosscompiler=false
@@ -332,7 +500,7 @@ function build_target
                fi
                if [ "$found_crosscompiler" == "false" -a "$TARCH" == ppc ];then
                        for prefix in powerpc-eabi- powerpc-linux- ppc_74xx- \
-                           powerpc-7450-linux-gnu-; do
+                           powerpc-7450-linux-gnu- powerpc-elf-; do
                                if ${prefix}gcc --version > /dev/null 2> /dev/null ; then
                                        found_crosscompiler=true
                                        CROSS_COMPILE=$prefix
@@ -353,7 +521,7 @@ function build_target
                
                        return 0
                else
-                       printf " ($TARCH: ok, we're $ARCH)\n"
+                       printf " ($TARCH: ok, we're $ARCH with a ${CROSS_COMPILE} cross compiler)\n"
                        xml "  <compiler>"
                        xml "    <path>`which ${CROSS_COMPILE}gcc`</path>"
                        xml "    <version>`${CROSS_COMPILE}gcc --version | head -1`</version>"
@@ -362,6 +530,27 @@ function build_target
                fi
        fi
 
+       CC=${CROSS_COMPILE}$CC
+
+       if  [ "$stackprotect" = "true" ]; then
+               CC="$CC -fno-stack-protector"
+       fi
+
+       if  [ "$scanbuild" = "true" ]; then
+               ccwrap=`mktemp`
+               mkdir -p $TARGET/${VENDOR}_${MAINBOARD}
+               mkdir -p $TARGET/scan-build-results-tmp
+               mv $ccwrap $TARGET/${VENDOR}_${MAINBOARD}
+               ccwrap=$TARGET/${VENDOR}_${MAINBOARD}/`basename $ccwrap`
+               echo '#!/bin/sh' > $ccwrap
+               echo $CC' "$@"' >> $ccwrap
+               chmod +x $ccwrap
+               origMAKE=$MAKE
+               MAKE="scan-build --use-cc=$ccwrap -o $TARGET/scan-build-results-tmp -analyze-headers $MAKE GCC=$ccwrap"
+               CC="\$(CC)"
+               HOSTCC="CCC_CC=$HOSTCC \$(CC)"
+       fi
+
        built_successfully $VENDOR $MAINBOARD && \
        {
                printf " ( mainboard/$VENDOR/$MAINBOARD previously ok )\n\n"
@@ -380,11 +569,15 @@ function build_target
                return 0
        }
        
-       create_buildenv $VENDOR $MAINBOARD
-       if [ $? -eq 0 ]; then
+       create_buildenv $VENDOR $MAINBOARD $CONFIG
+       if [ $? -eq 0  -a  $configureonly -eq 0 ]; then
                compile_target $VENDOR $MAINBOARD && 
                        xml "  <status>ok</status>" ||
                        xml "<status>broken</status>"
+               if [ "$scanbuild" = "true" ]; then
+                       mv `dirname $TARGET/scan-build-results-tmp/*/index.html` $TARGET/${VENDOR}_${MAINBOARD}-scanbuild
+                       MAKE=$origMAKE
+               fi
        fi
 
        xml ""
@@ -403,7 +596,7 @@ function test_target
        fi
 
        # image does not exist. we silently skip the patch.
-       if [ ! -r "$TARGET/${VENDOR}_${MAINBOARD}/linuxbios.rom" ]; then
+       if [ ! -r "$TARGET/${VENDOR}_${MAINBOARD}/coreboot.rom" ]; then
                return 0
        fi
 
@@ -422,17 +615,38 @@ function test_target
 
        printf "Submitting image for board $VENDOR $MAINBOARD to test system...\n"
 
-       curl -f -F "romfile=@$TARGET/${VENDOR}_${MAINBOARD}/linuxbios.rom" \
+       curl -f -F "romfile=@$TARGET/${VENDOR}_${MAINBOARD}/coreboot.rom" \
                -F "mode=abuild" -F "mainboard=${VENDOR}_${MAINBOARD}" -F "submit=Upload" \
-               "http://qa.linuxbios.org/deployment/send.php"
+               "http://qa.coreboot.org/deployment/send.php"
 
        printf "\n"
        return 0
 }
 
+function remove_target
+{
+       if [ "$remove" != "true" ]; then
+               return 0
+       fi
+
+       VENDOR=$1
+       MAINBOARD=$2
+
+       # Save the generated coreboot.rom file of each board.
+       if [ -r "$TARGET/${VENDOR}_${MAINBOARD}/coreboot.rom" ]; then
+               cp $TARGET/${VENDOR}_${MAINBOARD}/coreboot.rom \
+                  ${VENDOR}_${MAINBOARD}_coreboot.rom
+       fi
+
+       printf "Removing build dir for board $VENDOR $MAINBOARD...\n"
+       rm -rf $TARGET/${VENDOR}_${MAINBOARD}
+
+       return 0
+}
+
 function myhelp
 {
-       printf "Usage: $0 [-v] [-a] [-b] [-t <vendor/board>] [-p <dir>] [lbroot]\n"
+       printf "Usage: $0 [-v] [-a] [-b] [-r] [-t <vendor/board>] [-p <dir>] [lbroot]\n"
        printf "       $0 [-V|--version]\n"
        printf "       $0 [-h|--help]\n\n"
 
@@ -440,6 +654,7 @@ function myhelp
        printf "    [-v|--verbose]                print more messages\n"
        printf "    [-a|--all]                    build previously succeeded ports as well\n"
        printf "    [-b|--broken]                 attempt to build ports that are known broken\n"
+       printf "    [-r|--remove]                 remove output dir after build\n"
        printf "    [-t|--target <vendor/board>]  attempt to build target vendor/board only\n"
        printf "    [-p|--payloads <dir>]         use payloads in <dir> to build images\n"
        printf "    [-V|--version]                print version number and exit\n"
@@ -447,18 +662,24 @@ function myhelp
        printf "    [-x|--xml]                    write xml log file \n"
        printf "                                  (defaults to $XMLFILE)\n"
        printf "    [-T|--test]                   submit image(s) to automated test system\n"
-       printf "    [lbroot]                      absolute path to LinuxBIOS sources\n"
-       printf "                                  (defaults to $LBROOT)\n\n"
+       printf "    [-c|--cpus <numcpus>]         build on <numcpus> at the same time\n"
+       printf "    [-s|--silent]                 omit compiler calls in logs\n"
+       printf "    [-ns|--nostackprotect]        use gcc -fno-stack-protector option\n"
+       printf "    [-sb|--scan-build]            use clang's static analyzer\n"
+       printf "    [-C|--config]                 configure-only mode\n"
+       printf "    [-l|--loglevel <num>]         set loglevel\n"
+       printf "    [lbroot]                      absolute path to coreboot sources\n"
+       printf "                                  (defaults to $ROOT)\n\n"
 }
 
 function myversion 
 {
        cat << EOF
 
-LinuxBIOS autobuild v$ABUILD_VERSION ($ABUILD_DATE)
+coreboot autobuild v$ABUILD_VERSION ($ABUILD_DATE)
 
 Copyright (C) 2004 by Stefan Reinauer <stepan@openbios.org>
-Copyright (C) 2006 by coresystems GmbH <info@coresystems.de>
+Copyright (C) 2006-2010 by coresystems GmbH <info@coresystems.de>
 
 This program is free software; you may redistribute it under the terms
 of the GNU General Public License. This program has absolutely no
@@ -470,29 +691,48 @@ EOF
 # default options
 target=""
 buildall=false
-LBROOT=$( cd ../..; pwd )
 verbose=false
 
-# parse parameters
-args=`getopt -l version,verbose,help,all,target:,broken,payloads:,test Vvhat:bp:T -- "$@"`
+test -f util/newconfig/config.g && ROOT=$( pwd )
+test -f ../util/newconfig/config.g && ROOT=$( cd ..; pwd )
+test "$ROOT" = "" && ROOT=$( cd ../..; pwd )
+
+# parse parameters.. try to find out whether we're running GNU getopt
+getoptbrand="`getopt -V`"
+if [ "${getoptbrand:0:6}" == "getopt" ]; then
+       # Detected GNU getopt that supports long options.
+       args=`getopt -l version,verbose,help,all,target:,broken,payloads:,test,cpus:,silent,xml,config,loglevel:,oldconfig Vvhat:bp:Tc:sxCl:o -- "$@"`
+       eval set "$args"
+else
+       # Detected non-GNU getopt
+       args=`getopt Vvhat:bp:Tc:sxCl:o $*`
+       set -- $args
+fi
 
 if [ $? != 0 ]; then
        myhelp
        exit 1
 fi
 
-eval set "$args"
 while true ; do
        case "$1" in
                -x|--xml)       shift; mode=xml; rm -f $XMLFILE ;;
                -t|--target)    shift; target="$1"; shift;;
                -a|--all)       shift; buildall=true;;
                -b|--broken)    shift; buildbroken=true;;
+               -r|--remove)    shift; remove=true; shift;;
                -v|--verbose)   shift; verbose=true;;
                -V|--version)   shift; myversion; exit 0;;
                -h|--help)      shift; myversion; myhelp; exit 0;;
                -p|--payloads)  shift; payloads="$1"; shift;;
                -T|--test)      shift; hwtest=true;;
+               -c|--cpus)      shift; cpus="$1"; test "$cpus" == "max" && cpus=""; shift;;
+               -s|--silent)    shift; silent="-s";;
+               -ns|--nostackprotect) shift; stackprotect=true;;
+               -sb|--scan-build) shift; scanbuild=true;;
+               -C|--config)    shift; configureonly=1;;
+               -l|--loglevel)  shift; loglevel="$1"; shift;;
+               -o|--oldconfig) shift; oldconfig=1;;
                --)             shift; break;;
                -*)             printf "Invalid option\n\n"; myhelp; exit 1;;
                *)              break;;
@@ -500,9 +740,9 @@ while true ; do
 done
 
 # /path/to/freebios2/
-test -z "$1" || LBROOT=$1
+test -z "$1" || ROOT=$1
 
-debug "LBROOT=$LBROOT"
+debug "ROOT=$ROOT"
 
 xml '<?xml version="1.0" encoding="utf-8"?>'
 xml '<abuild>'
@@ -511,7 +751,8 @@ if [ "$target" != "" ]; then
        # build a single board
        VENDOR=`printf $target|cut -f1 -d/`
        MAINBOARD=`printf $target|cut -f2 -d/`
-       build_target $VENDOR $MAINBOARD
+       CONFIG=`printf $target|cut -f3 -d/`
+       build_target $VENDOR $MAINBOARD $CONFIG
        test_target $VENDOR $MAINBOARD
 else
        # build all boards per default
@@ -519,6 +760,7 @@ else
                for MAINBOARD in $( mainboards $VENDOR ); do
                        build_target $VENDOR $MAINBOARD
                        test_target $VENDOR $MAINBOARD
+                       remove_target $VENDOR $MAINBOARD
                done
        done
 fi