run preprocessor on hand-crafted config files in abuild, too

[coreboot.git] / util / abuild / abuild.sh

diff --git a/util/abuild/abuild.sh b/util/abuild/abuild.sh
index 07bad28885e7c6672129c5746989927d2e38e28e..53b492bfe02d4353676e44c6228615826c782a50 100755 (executable)
--- a/util/abuild/abuild.sh
+++ b/util/abuild/abuild.sh
@@ -85,22 +85,23 @@ function create_config
        TARGCONFIG=$LBROOT/targets/$VENDOR/$MAINBOARD/Config-abuild.lb
 
         # get a working payload for the board if we have one.
+
        if [ -x $payloads/payload.sh ]; then
                PAYLOAD=`$payloads/payload.sh $VENDOR $MAINBOARD`
+               echo "Using custom payload $PAYLOAD"
        fi
        
        mkdir -p $TARGET
 
         if [ -f $TARGCONFIG ]; then
                cp $TARGCONFIG $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
-               echo "Used existing test target $TARGCONFIG"
+               echo -n "Using existing test target $TARGCONFIG"
                xml "  <config>$TARGCONFIG</config>"
-               return 
-       fi
+       else
 
-       echo -n "  Creating config file..."
-       xml "  <config>autogenerated</config>"
-       ( cat << EOF
+               echo -n "  Creating config file..."
+               xml "  <config>autogenerated</config>"
+               ( cat << EOF
 # This will make a target directory of ./VENDOR_MAINBOARD
 
 target VENDOR_MAINBOARD
@@ -111,8 +112,8 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 EOF
-       if [ "$TARCH" == i386 ] ; then
-               cat <<EOF
+               if [ "$TARCH" == i386 ] ; then
+                       cat <<EOF
 romimage "normal"
        option USE_FALLBACK_IMAGE=0
        option ROM_IMAGE_SIZE=0x20000
@@ -128,22 +129,26 @@ romimage "fallback"
 end
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
 EOF
-       else
-               cat <<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
-       ) | sed -e s,VENDOR,$VENDOR,g \
+
+       sed -i.pre -e s,VENDOR,$VENDOR,g \
                -e s,MAINBOARD,$MAINBOARD,g \
                -e s,PAYLOAD,$PAYLOAD,g \
                -e s,CROSSCC,"$CC",g \
                -e s,CROSS_PREFIX,"$CROSS_COMPILE",g \
                -e s,CROSS_HOSTCC,"$HOSTCC",g \
-               > $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
+               $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
+               
        echo " ok"
 }