X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fabuild%2Fabuild;h=0ed295ff1826319c6d87172d731d3194041ff156;hb=140a990a612e25a6d4974f696b9fa757e834d764;hp=173acd01b9445361a7a4e56bae358d460633aa48;hpb=dabbf5777b172f13748569b442e2b5e2fe0c2f00;p=coreboot.git

diff --git a/util/abuild/abuild b/util/abuild/abuild
index 173acd01b..0ed295ff1 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -1,42 +1,80 @@
 #!/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
 #  archive for more details.
-#     
+#
 
 #set -x # Turn echo on....
 
-ABUILD_DATE="October 24, 2006"
-ABUILD_VERSION="0.4"
+ABUILD_DATE="December 10th, 2010"
+ABUILD_VERSION="0.9.1"
 
 # Where shall we place all the build trees?
-TARGET=$( pwd )/linuxbios-builds
+TARGET=coreboot-builds
 XMLFILE=$( pwd )/abuild.xml
 
 # path to payload. Should be more generic
 PAYLOAD=/dev/null
 
 # Lines of error context to be printed in FAILURE case
-CONTEXT=5
+CONTEXT=6
+
+TESTSUBMISSION="http://qa.coreboot.org/deployment/send.php"
+
+# Number of CPUs to compile on per default
+cpus=1
+
+# Configure-only mode
+configureonly=0
 
-TESTSUBMISSION="http://qa.linuxbios.org/deployment/send.php"
+# Did any board fail to build?
+failed=0
 
 # One might want to adjust these in case of cross compiling
-MAKE="make"
-PYTHON=python
+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
 
 # 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
+
+# use ccache
+ccache=false
+
+# stackprotect mode enabled by -ns option.
+stackprotect=false
+
+# loglevel changed with -l / --loglevel option
+loglevel=default
+
+# update existing image
+update=false
+
+# CBFS prefix
+cbfs_prefix=fallback
+
 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/"`
 
@@ -59,173 +97,151 @@ function debug
 function xml
 {
 	test "$mode" == "xml" && printf "$*\n" >> $XMLFILE
+	return 0
 }
 
 function xmlfile
 {
-	test "$mode" == "xml" && { 
+	test "$mode" == "xml" && {
 		printf '<![CDATA[\n'
 		cat $1
-		printf ']]>\n' 
+		printf ']]>\n'
 	} >> $XMLFILE
 }
 
+function junit
+{
+	test "$mode" == "junit" && printf "$*\n" >> $XMLFILE
+	return 0
+}
+
+function junitfile
+{
+	test "$mode" == "junit" && {
+		printf '<![CDATA[\n'
+		cat $1
+		printf ']]>\n'
+	} >> $XMLFILE
+}
 
 
 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
 {
 	# make this a function so we can easily select
 	# without breaking readability
-	
+
 	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\ 
+	ARCH=`cat $ROOT/src/mainboard/$VENDOR/$MAINBOARD/Kconfig | \
+		grep "select ARCH_"|cut -f2- -d_`
+	echo $ARCH | sed s/X86/i386/
 }
 
 function create_config
 {
 	VENDOR=$1
 	MAINBOARD=$2
-	TARCH=$( architecture $VENDOR $MAINBOARD )
-	TARGCONFIG=$LBROOT/targets/$VENDOR/$MAINBOARD/Config-abuild.lb
+	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 
-	# an executable shell script payload.sh
+        # 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 [ -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
-	
-	mkdir -p $TARGET
 
-        if [ -f $TARGCONFIG ]; then
-        	cp $TARGCONFIG $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
-		printf "Using existing test target $TARGCONFIG"
-		xml "  <config>$TARGCONFIG</config>"
-	else
+	[ "$update" = "true" ] && mv ${build_dir}/coreboot.rom coreboot.rom.tmp
+	mkdir -p ${build_dir}
+	mkdir -p $TARGET/sharedutils
+	[ "$update" = "true" ] && mv coreboot.rom.tmp ${build_dir}/coreboot.rom
 
-		printf "  Creating config file..."
-		xml "  <config>autogenerated</config>"
-		( cat << EOF
-# This will make a target directory of ./VENDOR_MAINBOARD
-
-target VENDOR_MAINBOARD
-mainboard VENDOR/MAINBOARD
-
-option CC="CROSSCC"
-option CROSS_COMPILE="CROSS_PREFIX"
-option HOSTCC="CROSS_HOSTCC"
-
-__COMPRESSION__
-
-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"
-	payload __PAYLOAD__
-end
-
-romimage "fallback" 
-	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x17000
-	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
-	payload __PAYLOAD__
-end
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
-EOF
-		else
-			cat <<EOF
-romimage "only"
-	option LINUXBIOS_EXTRA_VERSION=".0"
-	payload __PAYLOAD__
-end
-buildrom ./linuxbios.rom 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 [ "$CONFIG" != "" ]; then
+		printf "  Using existing configuration $CONFIG ... "
+		xml "  <config>$CONFIG</config>"
+		cp src/mainboard/$VENDOR/$MAINBOARD/$CONFIG ${build_dir}/config.build
 	else
-		COMPRESSION="# no compression"
-	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
-	printf " ok\n"
-}
-
-function create_builddir
-{	
-	VENDOR=$1
-	MAINBOARD=$2
-	
-	printf "  Creating builddir..."
+		printf "  Creating config file... "
+		xml "  <config>autogenerated</config>"
+		grep "if[\t ]*VENDOR" src/mainboard/$VENDOR/$MAINBOARD/../Kconfig | \
+			sed "s,^.*\(VENDOR_.*\)[^A-Z0-9_]*,CONFIG_\1=y," > ${build_dir}/config.build
+		grep "if[\t ]*BOARD" src/mainboard/$VENDOR/$MAINBOARD/Kconfig | \
+			sed "s,^.*\(BOARD_.*\)[^A-Z0-9_]*,CONFIG_\1=y," >> ${build_dir}/config.build
+		grep "select[\t ]*ARCH" src/mainboard/$VENDOR/$MAINBOARD/Kconfig | \
+			sed "s,^.*\(ARCH_.*\)[^A-Z0-9_]*,CONFIG_\1=y," >> ${build_dir}/config.build
+		echo "CONFIG_MAINBOARD_DIR=\"$VENDOR/$MAINBOARD\"" >> ${build_dir}/config.build
+		echo "CONFIG_CBFS_PREFIX=\"$cbfs_prefix\"" >> ${build_dir}/config.build
+		if [ "$PAYLOAD" != "/dev/null" ]; then
+			echo "# CONFIG_PAYLOAD_NONE is not set" >> ${build_dir}/config.build
+			echo "# CONFIG_PAYLOAD_SEABIOS is not set" >> ${build_dir}/config.build
+			echo "CONFIG_PAYLOAD_ELF=y" >> ${build_dir}/config.build
+			echo "CONFIG_PAYLOAD_FILE=\"$PAYLOAD\"" >> ${build_dir}/config.build
+		fi
 
-	target_dir=$TARGET
-	config_dir=$LBROOT/util/newconfig
-	yapps2_py=$config_dir/yapps2.py
-	config_g=$config_dir/config.g
-	config_lb=Config-${VENDOR}_${MAINBOARD}.lb
+		if [ "$loglevel" != "default" ]; then
+			printf "(loglevel override) "
+			echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL_$loglevel=y" >> ${build_dir}/config.build
+			echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=$loglevel" >> ${build_dir}/config.build
+			echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL_$loglevel=y" >> ${build_dir}/config.build
+			echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL=$loglevel" >> ${build_dir}/config.build
+		fi
 
-	cd $target_dir
+		if [ "$update" != "false" ]; then
+			printf "(update) "
+			echo "CONFIG_UPDATE_IMAGE=y" >> ${build_dir}/config.build
+		fi
 
-	build_dir=${VENDOR}_${MAINBOARD}
-	config_py=$build_dir/config.py
+		if [ "$ccache" = "true" ]; then
+			printf "(ccache enabled) "
+			echo "CONFIG_CCACHE=y" >> ${build_dir}/config.build
+		fi
 
-	if [ ! -d $build_dir ] ; then
-		mkdir -p $build_dir
-	fi
-	if [ ! -f $config_py ]; then
-		$PYTHON $yapps2_py $config_g $config_py &> $build_dir/py.log
+		if [ "$scanbuild" = "true" ]; then
+			printf "(scan-build enabled) "
+			echo "CONFIG_SCANBUILD_ENABLE=y" >> ${build_dir}/config.build
+			echo "CONFIG_SCANBUILD_REPORT_LOCATION=\"$TARGET/scan-build-results-tmp\"" >> ${build_dir}/config.build
+		fi
 	fi
 
-	# make sure config.py is up-to-date
-
-	export PYTHONPATH=$config_dir
-	$PYTHON $config_py $config_lb $LBROOT &> $build_dir/config.log
-	if [ $? -eq 0 ]; then
-		printf "ok\n"
+	#yes "" | $MAKE oldconfig -j $cpus obj=${build_dir} objutil=$TARGET/sharedutils &> ${build_dir}/config.log
+	yes "" | $MAKE oldconfig DOTCONFIG=${build_dir}/config.build obj=${build_dir} objutil=$TARGET/sharedutils &> ${build_dir}/config.log
+	ret=$?
+	if [ $ret -eq 0 ]; then
+		printf "ok; "
 		xml "  <builddir>ok</builddir>"
+		xml "  <log>"
+		xmlfile $build_dir/config.log
+		xml "  </log>"
 		xml ""
 		return 0
 	else
-		printf "FAILED! Log excerpt:\n"
+		# Does this ever happen?
+		printf "FAILED!\nLog excerpt:\n"
 		xml "  <builddir>failed</builddir>"
 		xml "  <log>"
 		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,63 +250,84 @@ function create_buildenv
 {
 	VENDOR=$1
 	MAINBOARD=$2
-	create_config $VENDOR $MAINBOARD
-	create_builddir $VENDOR $MAINBOARD
+	CONFIG=$3
+
+	create_config $VENDOR $MAINBOARD $CONFIG
+	ret=$?
+
+	# Allow simple "make" in the target directory
+	MAKEFILE=$TARGET/${VENDOR}_${MAINBOARD}/Makefile
+	echo "# autogenerated" > $MAKEFILE
+	echo "TOP=$ROOT" >> $MAKEFILE
+	echo "BUILD=$TARGET" >> $MAKEFILE
+	echo "OBJ=\$(BUILD)/${VENDOR}_${MAINBOARD}" >> $MAKEFILE
+	echo "OBJUTIL=\$(BUILD)/sharedutils" >> $MAKEFILE
+	echo "all:" >> $MAKEFILE
+	echo "	@cp -a config.h config.h.bak" >> $MAKEFILE
+	echo "	@cd \$(TOP); \$(MAKE) oldconfig DOTCONFIG=\$(OBJ)/config.build objutil=\$(OBJUTIL) obj=\$(OBJ)" >> $MAKEFILE
+	echo "	@tail -n+6 config.h > config.new; tail -n+6 config.h.bak > config.old" >> $MAKEFILE
+	echo "	@cmp -s config.new config.old && cp -a config.h.bak config.h || echo \"Config file changed\"" >> $MAKEFILE
+	echo "	@rm config.h.bak config.new config.old" >> $MAKEFILE
+	echo "	@cd \$(TOP); \$(MAKE) DOTCONFIG=\$(OBJ)/config.build objutil=\$(OBJUTIL) obj=\$(OBJ)" >> $MAKEFILE
+
+	return $ret
 }
 
 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
+	#stime=`perl -e 'print time();' 2>/dev/null || date +%s`
+	build_dir=$TARGET/${VENDOR}_${MAINBOARD}
+	eval $MAKE $silent -j $cpus DOTCONFIG=${build_dir}/config.build obj=${build_dir} objutil=$TARGET/sharedutils \
+		&> ${build_dir}/make.log
 	ret=$?
-	etime=`date +%s`
+	mv .xcompile ${build_dir}/xcompile.build
+	cd $TARGET/${VENDOR}_${MAINBOARD}
+
+	etime=`perl -e 'print time();' 2>/dev/null || date +%s`
 	duration=$(( $etime - $stime ))
+	xml "  <buildtime>${duration}s</buildtime>"
+	junit " <testcase classname='board' name='$TARCH/$VENDOR/$MAINBOARD' time='$duration' >"
+
+	xml "  <log>"
+	xmlfile make.log
+	xml "  </log>"
+
 	if [ $ret -eq 0 ]; then
 		xml "  <compile>ok</compile>"
-		xml "  <compiletime>${duration}s</compiletime>"
+		junit "<system-out>"
+		junitfile make.log
+		junit "</system-out>"
 		printf "ok\n" > compile.status
 		printf "ok. (took ${duration}s)\n"
 		cd $CURR
 		return 0
 	else
 		xml "  <compile>failed</compile>"
-		xml "  <compiletime>${duration}s</compiletime>"
-		xml "  <log>"
-		xmlfile make.log
-		xml "  </log>"
-
-		printf "FAILED after ${duration}s! Log excerpt:\n"
-		tail -n $CONTEXT make.log
+		junit "<failure type='BuildFailed'>"
+		junitfile make.log
+		junit "</failure>"
+		printf "FAILED after ${duration}s!\nLog excerpt:\n"
+		tail -n $CONTEXT make.log 2> /dev/null || tail -$CONTEXT make.log
 		cd $CURR
+		failed=1
 		return 1
 	fi
 }
 
-function built_successfully
-{
-	CURR=`pwd`
-	status="fail"
-	if [ -d "$TARGET/${VENDOR}_${MAINBOARD}" ]; then
-		cd $TARGET/${VENDOR}_${MAINBOARD}
-		if [ -r compile.status ] ; then
-			status=`cat compile.status`
-		fi
-		cd $CURR
-	fi
-	[ "$buildall" != "true" -a "$status" == "ok" ]
-}
-
 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,14 +335,34 @@ 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=''
 
-	printf "Processing mainboard/$VENDOR/$MAINBOARD"
+	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
+		CROSS_TEXT=", using $CROSS_COMPILE$CC"
+		found_crosscompiler=true
+	fi
+
+ 	HOSTCC='gcc'
+
+	printf "Building $VENDOR/$MAINBOARD; "
 
 	xml "<mainboard>"
 	xml ""
@@ -314,13 +371,11 @@ 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
-		printf " ($TARCH: ok)\n"
+
+	if [ "$ARCH" = "$TARCH" -o $found_crosscompiler = true ]; then
+		printf "$TARCH: ok$CROSS_TEXT\n"
 	else
+		# FIXME this is basically the same as above.
 		found_crosscompiler=false
 		if [ "$ARCH" == amd64 -a "$TARCH" == i386 ]; then
 			CC="gcc -m32"
@@ -332,7 +387,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
@@ -340,20 +395,23 @@ function build_target
 			done
 		fi
 
-	
+
 		# TBD: look for suitable cross compiler suite
 		# cross-$TARCH-gcc and cross-$TARCH-ld
-		
+
 		# Check result:
 		if [ $found_crosscompiler == "false" ]; then
-			printf " ($TARCH: skipped, we're $ARCH)\n\n"
+			printf "$TARCH: skipped, we're $ARCH\n\n"
 			xml "  <status>notbuilt</status>"
 			xml ""
 			xml "</mainboard>"
-		
+
+			junit " <testcase classname='board' name='$TARCH/$VENDOR/$MAINBOARD' >"
+			junit "<failure type='NoCrossCompiler'>No cross-compiler for $TARCH found</failure>"
+
 			return 0
 		else
-			printf " ($TARCH: ok, we're $ARCH)\n"
+			printf "$TARCH: ok, $ARCH using ${CROSS_COMPILE}gcc\n"
 			xml "  <compiler>"
 			xml "    <path>`which ${CROSS_COMPILE}gcc`</path>"
 			xml "    <version>`${CROSS_COMPILE}gcc --version | head -1`</version>"
@@ -362,14 +420,11 @@ function build_target
 		fi
 	fi
 
-	built_successfully $VENDOR $MAINBOARD && \
-	{
-		printf " ( mainboard/$VENDOR/$MAINBOARD previously ok )\n\n"
-		xml "  <status>previouslyok</status>"
-		xml ""
-		xml "</mainboard>"
-		return 0
-	}
+	CC=${CROSS_COMPILE}$CC
+
+	if  [ "$stackprotect" = "true" ]; then
+		CC="$CC -fno-stack-protector"
+	fi
 
 	build_broken $VENDOR $MAINBOARD || \
 	{
@@ -377,18 +432,33 @@ function build_target
 		xml "  <status>knownbroken</status>"
 		xml ""
 		xml "</mainboard>"
+		junit " <testcase classname='board' name='$TARCH/$VENDOR/$MAINBOARD' >"
+		junit "<failure type='KnownBroken'>Board is marked as broken</failure>"
 		return 0
 	}
-	
-	create_buildenv $VENDOR $MAINBOARD
-	if [ $? -eq 0 ]; then
-		compile_target $VENDOR $MAINBOARD && 
+
+	stime=`perl -e 'print time();' 2>/dev/null || date +%s`
+	create_buildenv $VENDOR $MAINBOARD $CONFIG
+	if [ $? -eq 0  -a  $configureonly -eq 0 ]; then
+		if [ "$scanbuild" = "true" ]; then
+			rm -rf $TARGET/scan-build-results-tmp
+		fi
+		compile_target $VENDOR $MAINBOARD &&
 			xml "  <status>ok</status>" ||
 			xml "<status>broken</status>"
+		if [ "$scanbuild" = "true" ]; then
+			rm -rf $TARGET/${VENDOR}_${MAINBOARD}-scanbuild
+			mv `dirname $TARGET/scan-build-results-tmp/*/index.html` $TARGET/${VENDOR}_${MAINBOARD}-scanbuild
+		fi
 	fi
+	# Not calculated here because we still print it in compile_target
+	#etime=`perl -e 'print time();' 2>/dev/null || date +%s`
+	#duration=$(( $etime - $stime ))
+	#xml "  <buildtime>${duration}s</buildtime>"
 
 	xml ""
 	xml "</mainboard>"
+	junit "</testcase>"
 
 	printf "\n"
 }
@@ -403,7 +473,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 +492,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,25 +531,37 @@ 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"
 	printf "    [-h|--help]			  print this help and exit\n"
 	printf "    [-x|--xml]			  write xml log file \n"
 	printf "                                  (defaults to $XMLFILE)\n"
+	printf "    [-J|--junit]		  write JUnit formatted 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 "    [-y|--ccache]                 use ccache\n"
+	printf "    [-C|--config]                 configure-only mode\n"
+	printf "    [-l|--loglevel <num>]         set loglevel\n"
+	printf "    [-u|--update]                 update existing image\n"
+	printf "    [-P|--prefix <name>]          file name prefix in CBFS\n"
+	printf "    [lbroot]			  absolute path to coreboot sources\n"
+	printf "				  (defaults to $ROOT)\n\n"
 }
 
-function myversion 
+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 +573,51 @@ 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/sconfig/sconfig.l && ROOT=$( pwd )
+test -f ../util/sconfig/sconfig.l && 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,junit,xml,config,loglevel:,remove,prefix:,update,nostackprotect,scan-build,ccache -o Vvhat:bp:Tc:sJxCl:rP:uy -- "$@"`
+	eval set -- $args
+else
+	# Detected non-GNU getopt
+	args=`getopt Vvhat:bp:Tc:sJxCl:rP:uy $*`
+	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 ;;
+		-J|--junit)     shift; mode=junit; rm -f $XMLFILE ;;
 		-t|--target)	shift; target="$1"; shift;;
 		-a|--all)	shift; buildall=true;;
 		-b|--broken)	shift; buildbroken=true;;
-		-v|--verbose)	shift; verbose=true;;
+		-r|--remove)	shift; remove=true;;
+		-v|--verbose)	shift; verbose=true; silent='V=1';;
 		-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;;
+		-y|--ccache)    shift; ccache=true;;
+		-C|--config)    shift; configureonly=1;;
+		-l|--loglevel)  shift; loglevel="$1"; shift;;
+		-u|--update)    shift; update="true";;
+		-P|--prefix)    shift; cbfs_prefix="$1"; shift;;
 		--)		shift; break;;
 		-*)		printf "Invalid option\n\n"; myhelp; exit 1;;
 		*)		break;;
@@ -500,18 +625,28 @@ 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>'
 
+junit '<?xml version="1.0" encoding="utf-8"?>'
+junit '<testsuite>'
+
 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/`
+	if [ ! -r $ROOT/src/mainboard/$target ]; then
+		printf "No such target: $target\n"
+		xml '</abuild>'
+		junit '</testsuite>'
+		exit 1
+	fi
+	build_target $VENDOR $MAINBOARD $CONFIG
 	test_target $VENDOR $MAINBOARD
 else
 	# build all boards per default
@@ -519,8 +654,11 @@ else
 		for MAINBOARD in $( mainboards $VENDOR ); do
 			build_target $VENDOR $MAINBOARD
 			test_target $VENDOR $MAINBOARD
+			remove_target $VENDOR $MAINBOARD
 		done
 	done
 fi
 xml '</abuild>'
+junit '</testsuite>'
 
+exit $failed