make only needs to read Makefile.incs once, thanks to the
[coreboot.git] / util / abuild / abuild
index 525740ddd9845453ece21f178d5743607737179c..fbb801ec8288309271d8aac9d26f2d3527baa9da 100755 (executable)
@@ -18,7 +18,7 @@ ABUILD_DATE="January 29th, 2010"
 ABUILD_VERSION="0.9"
 
 # Where shall we place all the build trees?
-TARGET=$( pwd )/coreboot-builds
+TARGET=coreboot-builds
 XMLFILE=$( pwd )/abuild.xml
 
 # path to payload. Should be more generic
@@ -34,8 +34,6 @@ 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
 for i in make gmake gnumake nonexistant_make; do
@@ -46,7 +44,6 @@ if [ "$i" = "nonexistant_make" ]; then
        exit 1
 fi
 MAKE=$i
-PYTHON=python
 
 # this can be changed to xml by -x
 mode=text
@@ -58,6 +55,9 @@ silent=
 # clang mode enabled by -sb option.
 scanbuild=false
 
+# use ccache
+ccache=false
+
 # stackprotect mode enabled by -ns option.
 stackprotect=false
 
@@ -122,117 +122,9 @@ function architecture
 {
        VENDOR=$1
        MAINBOARD=$2
-       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_old
-{
-       VENDOR=$1
-       MAINBOARD=$2
-       CONFIG=$3
-       TARCH=$( architecture $VENDOR $MAINBOARD )
-       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 
-       # 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
-       
-       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
-               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 CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option HOSTCC="CROSS_HOSTCC"
-
-__COMPRESSION__
-__LOGLEVEL__
-
-EOF
-               if [ "$TARCH" == i386 ] ; then
-                       cat <<EOF
-romimage "normal"
-       option CONFIG_USE_FALLBACK_IMAGE=0
-       option COREBOOT_EXTRA_VERSION=".0-normal"
-       payload __PAYLOAD__
-end
-
-romimage "fallback" 
-       option CONFIG_USE_FALLBACK_IMAGE=1
-       option COREBOOT_EXTRA_VERSION=".0-fallback"
-       payload __PAYLOAD__
-end
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
-EOF
-               else
-                       cat <<EOF
-romimage "only"
-       option COREBOOT_EXTRA_VERSION=".0"
-       payload __PAYLOAD__
-end
-buildrom ./coreboot.rom CONFIG_ROM_SIZE "only"
-EOF
-               fi 
-               ) > $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
-       fi
-
-       if [ "$loglevel" != "default" ]; then
-               LOGLEVEL1="option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=$loglevel"
-               LOGLEVEL2="option CONFIG_DEFAULT_CONSOLE_LOGLEVEL=$loglevel"
-       else
-               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
-
-       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"
+       ARCH=`cat $ROOT/src/mainboard/$VENDOR/$MAINBOARD/Kconfig | \
+               grep "select ARCH_"|cut -f2- -d_`
+       echo $ARCH | sed s/X86/i386/
 }
 
 function create_config
@@ -273,15 +165,27 @@ function create_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
+                       echo "CONFIG_PAYLOAD_ELF=y" >> .config
+                       echo "CONFIG_FALLBACK_PAYLOAD_FILE=\"$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"
+                       echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL_$loglevel=y" >> .config
+                       echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=$loglevel" >> .config
+                       echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL_$loglevel=y" >> .config
+                       echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL=$loglevel" >> .config
+               fi
+
+               if [ "$ccache" = "true" ]; then
+                       printf "(ccache enabled) "
+                       echo "CONFIG_CCACHE=y" >> .config
+               fi
+
+               if [ "$scanbuild" = "true" ]; then
+                       printf "(scan-build enabled) "
+                       echo "CONFIG_SCANBUILD_ENABLE=y" >> .config
+                       echo "CONFIG_SCANBUILD_REPORT_LOCATION=\"$TARGET/scan-build-results-tmp\"" >> .config
                fi
        fi
 
@@ -308,66 +212,22 @@ function create_config
        fi
 }
 
-function create_builddir
-{      
-       VENDOR=$1
-       MAINBOARD=$2
-       
-       printf "  Creating builddir..."
-
-       target_dir=$TARGET
-       config_dir=$ROOT/util/newconfig
-       yapps2_py=$config_dir/yapps2.py
-       config_g=$config_dir/config.g
-       config_lb=Config-${VENDOR}_${MAINBOARD}.lb
-
-       cd $target_dir
-
-       build_dir=${VENDOR}_${MAINBOARD}
-       config_py=$build_dir/config.py
-
-       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
-       fi
-
-       # make sure config.py is up-to-date
-
-       export PYTHONPATH=$config_dir
-       $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
-               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_buildenv
 {
        VENDOR=$1
        MAINBOARD=$2
        CONFIG=$3
-       if [ $oldconfig -eq 1 ]; then
-               create_config_old $VENDOR $MAINBOARD $CONFIG
-               create_builddir $VENDOR $MAINBOARD
-       else
-               create_config $VENDOR $MAINBOARD $CONFIG
-       fi
+       create_config $VENDOR $MAINBOARD $CONFIG
+
+       # Allow simple "make" in the target directory
+       MAKEFILE=$TARGET/${VENDOR}_${MAINBOARD}/Makefile
+       echo "# autogenerated makefile" > $MAKEFILE
+       echo "TOP=$ROOT" >> $MAKEFILE
+       echo "OUT=$TARGET/${VENDOR}_${MAINBOARD}" >> $MAKEFILE
+       echo "coreboot.rom:" >> $MAKEFILE
+       echo "  cp config.build \$(TOP)/.config" >> $MAKEFILE
+       echo "  cd \$(TOP); \$(MAKE) oldconfig obj=\$(OUT)" >> $MAKEFILE
+       echo "  cd \$(TOP); \$(MAKE) obj=\$(OUT)" >> $MAKEFILE
 }
 
 function compile_target
@@ -381,22 +241,15 @@ function compile_target
        test 0$cpus -gt 1 && printf "on %d cpus in parallel .. " $cpus
 
        CURR=$( pwd )
-       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();'`
+       stime=`perl -e 'print time();' 2>/dev/null || date +%s`
+       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
+       cd $TARGET/${VENDOR}_${MAINBOARD}
+       etime=`perl -e 'print time();' 2>/dev/null || date +%s`
        duration=$(( $etime - $stime ))
        if [ $ret -eq 0 ]; then
                xml "  <compile>ok</compile>"
@@ -535,21 +388,6 @@ function build_target
                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"
@@ -665,6 +503,7 @@ function myhelp
        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 "    [lbroot]                      absolute path to coreboot sources\n"
@@ -692,19 +531,19 @@ target=""
 buildall=false
 verbose=false
 
-test -f util/newconfig/config.g && ROOT=$( pwd )
-test -f ../util/newconfig/config.g && ROOT=$( cd ..; pwd )
+test -f util/sconfig/config.g && ROOT=$( pwd )
+test -f ../util/sconfig/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 -- "$@"`
+       args=`getopt -l version,verbose,help,all,target:,broken,payloads:,test,cpus:,silent,xml,config,loglevel:,ccache Vvhat:bp:Tc:sxCl:y -- "$@"`
        eval set "$args"
 else
        # Detected non-GNU getopt
-       args=`getopt Vvhat:bp:Tc:sxCl:o $*`
+       args=`getopt Vvhat:bp:Tc:sxCl:y $*`
        set -- $args
 fi
 
@@ -720,7 +559,7 @@ while true ; do
                -a|--all)       shift; buildall=true;;
                -b|--broken)    shift; buildbroken=true;;
                -r|--remove)    shift; remove=true; shift;;
-               -v|--verbose)   shift; verbose=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;;
@@ -729,9 +568,9 @@ while true ; do
                -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;;
-               -o|--oldconfig) shift; oldconfig=1;;
                --)             shift; break;;
                -*)             printf "Invalid option\n\n"; myhelp; exit 1;;
                *)              break;;