[v2] r4192 - trunk/coreboot-v2/util/abuild

Author: stepan
Date: 2009-04-23 01:39:19 +0200 (Thu, 23 Apr 2009)
New Revision: 4192

Modified:
   trunk/coreboot-v2/util/abuild/abuild
Log:
Instead of just

coreboot-v2 $ util/abuild/abuild -t kontron/986lcd-m $PWD

you can now also say

coreboot-v2 $ util/abuild/abuild -t kontron/986lcd-m/Config-myconf.lb $PWD

and instead of using Config-abuild.lb or creating a temporary Config-abuild.lb,
abuild will use the existing Config-myconf.lb to build your image.

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified: trunk/coreboot-v2/util/abuild/abuild
===================================================================
--- trunk/coreboot-v2/util/abuild/abuild	2009-04-22 23:27:25 UTC (rev 4191)
+++ trunk/coreboot-v2/util/abuild/abuild	2009-04-22 23:39:19 UTC (rev 4192)
@@ -122,9 +122,14 @@
 {
    VENDOR=$1
    MAINBOARD=$2
+	CONFIG=$3
    TARCH=$( architecture $VENDOR $MAINBOARD )
    TARGCONFIG=$LBROOT/targets/$VENDOR/$MAINBOARD/Config-abuild.lb

+	if [ "$CONFIG" != "" ]; then
+		TARGCONFIG=$LBROOT/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
@@ -270,7 +275,8 @@
 {
    VENDOR=$1
    MAINBOARD=$2
-	create_config $VENDOR $MAINBOARD
+	CONFIG=$3
+	create_config $VENDOR $MAINBOARD $CONFIG
    create_builddir $VENDOR $MAINBOARD
 }

@@ -341,6 +347,7 @@
 {
    VENDOR=$1
    MAINBOARD=$2
+	CONFIG=$3
    TARCH=$( architecture $VENDOR $MAINBOARD )

# Allow architecture override in an abuild.info file.
@@ -459,7 +466,7 @@
    	return 0
    }
    
-	create_buildenv $VENDOR $MAINBOARD
+	create_buildenv $VENDOR $MAINBOARD $CONFIG
    if [ $? -eq 0  -a  $configureonly -eq 0 ]; then
    	compile_target $VENDOR $MAINBOARD && 
    		xml "  <status>ok</status>" ||
@@ -557,6 +564,7 @@
    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 $LBROOT)\n\n"
 }
@@ -636,7 +644,8 @@
    # 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