Add an "-l <num>" argument to abuild that sets the LOGLEVEL variables
authorPatrick Georgi <patrick.georgi@coresystems.de>
Tue, 21 Apr 2009 20:31:18 +0000 (20:31 +0000)
committerPatrick Georgi <patrick.georgi@coresystems.de>
Tue, 21 Apr 2009 20:31:18 +0000 (20:31 +0000)
to the specified value.

Only change Config-abuild.lb, as the others are for manual buildtarget
use - adding __LOGLEVEL__ there would kill the build as it isn't
replaced by the actual content.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4153 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

34 files changed:
targets/amd/dbm690t/Config-abuild.lb
targets/amd/pistachio/Config-abuild.lb
targets/amd/serengeti_cheetah/Config-abuild.lb
targets/amd/serengeti_cheetah_fam10/Config-abuild.lb
targets/arima/hdama/Config-abuild.lb
targets/asus/a8n_e/Config-abuild.lb
targets/bcom/winnetp680/Config-abuild.lb
targets/digitallogic/msm586seg/Config-abuild.lb
targets/emulation/qemu-x86/Config-abuild.lb
targets/gigabyte/ga_2761gxdk/Config-abuild.lb
targets/gigabyte/m57sli/Config-abuild.lb
targets/ibm/e326/Config-abuild.lb
targets/iei/juki-511p/Config-abuild.lb
targets/iwill/dk8_htx/Config-abuild.lb
targets/jetway/j7f24/Config-abuild.lb
targets/kontron/986lcd-m/Config-abuild.lb
targets/msi/ms7135/Config-abuild.lb
targets/msi/ms7260/Config-abuild.lb
targets/msi/ms9185/Config-abuild.lb
targets/msi/ms9282/Config-abuild.lb
targets/nvidia/l1_2pvv/Config-abuild.lb
targets/rca/rm4100/Config-abuild.lb
targets/supermicro/h8dme/Config-abuild.lb
targets/supermicro/h8dmr/Config-abuild.lb
targets/technexion/tim8690/Config-abuild.lb
targets/technologic/ts5300/Config-abuild.lb
targets/thomson/ip1000/Config-abuild.lb
targets/tyan/s2895/Config-abuild.lb
targets/tyan/s2912/Config-abuild.lb
targets/tyan/s2912_fam10/Config-abuild.lb
targets/via/epia-cn/Config-abuild.lb
targets/via/epia-m/Config-abuild.lb
targets/via/pc2500e/Config-abuild.lb
util/abuild/abuild

index ebac1d42ab516606280e26b66fd58a59c16f8149..ec05545ff7192668c534af5e4b1d608ee259ed1a 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 option ROM_SIZE=1024*1024
 romimage "normal"
index ebac1d42ab516606280e26b66fd58a59c16f8149..ec05545ff7192668c534af5e4b1d608ee259ed1a 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 option ROM_SIZE=1024*1024
 romimage "normal"
index 322da5bfbd0969b7d843ac1db52b877b7568c29b..88dd1684e32ce44e2c03906786cce466c1b964a7 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "normal"
        option USE_FAILOVER_IMAGE=0
index 286461cb453bd347b64495d3791476a7bcc98a9c..996a1b50c3807bffcbe2416fa8c0b40e2c2965f1 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 option ROM_SIZE=1024*1024
 
index 57bc20faf6dd6e6246a2af7508da2ad65978074c..44cec1431df632889c755e777a49835726ee6912 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 option ROM_SIZE=512*1024
 
index 322da5bfbd0969b7d843ac1db52b877b7568c29b..88dd1684e32ce44e2c03906786cce466c1b964a7 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "normal"
        option USE_FAILOVER_IMAGE=0
index 71d1b2bb13176603b290a833dfb0d6c646ab7ea5..d364cb7cbdc78477f47690029af5891fc19f5947 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 option ROM_SIZE=512*1024
 
index 46bad0336226238dc3880d8e4c505434cd27b483..7efa9040ec88679c008667456cddd5c7350565ee 100644 (file)
@@ -6,6 +6,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "fallback" 
        option FALLBACK_SIZE = 256 * 1024
index b5544a32bd14493683a0c283192129fb49ff0bc3..ce16c7cccf675222587151fa9fe7a65fd8c95524 100644 (file)
@@ -6,6 +6,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 option ROM_SIZE=256*1024
 
index 0c102bd5b4cb8ff336dcb9cbde7894aa9c0117bc..bba261153cbda79015b9711be748c719986ec2f9 100644 (file)
@@ -27,6 +27,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 option ROM_SIZE = 512*1024
 
index 322da5bfbd0969b7d843ac1db52b877b7568c29b..88dd1684e32ce44e2c03906786cce466c1b964a7 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "normal"
        option USE_FAILOVER_IMAGE=0
index 57bc20faf6dd6e6246a2af7508da2ad65978074c..44cec1431df632889c755e777a49835726ee6912 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 option ROM_SIZE=512*1024
 
index 0350f1f4aaaeb76130c86e20378499e4f24e3211..3c203bdd9b2022c1ec6d88a623371d2c35801894 100644 (file)
@@ -6,6 +6,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 option ROM_SIZE=256*1024
 ###
index 322da5bfbd0969b7d843ac1db52b877b7568c29b..88dd1684e32ce44e2c03906786cce466c1b964a7 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "normal"
        option USE_FAILOVER_IMAGE=0
index 71d1b2bb13176603b290a833dfb0d6c646ab7ea5..d364cb7cbdc78477f47690029af5891fc19f5947 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 option ROM_SIZE=512*1024
 
index fcae71e14d4efc34e772606fcc1537e1820a19f5..89171c3da7b81807868784d10f580659a360d880 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 option ROM_SIZE=1024*(1024-64)
 option FALLBACK_SIZE=1024*512
index 322da5bfbd0969b7d843ac1db52b877b7568c29b..88dd1684e32ce44e2c03906786cce466c1b964a7 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "normal"
        option USE_FAILOVER_IMAGE=0
index 552e01ef9d7983ebf035ce4b8c7ee69a53da3445..a03aba0f40c50b7dc1922efc754158b79f34ae84 100644 (file)
@@ -26,6 +26,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "normal"
        option USE_FAILOVER_IMAGE = 0
index e3be361e2c9f6ef2fa94da740066a8461204d2d4..ac4fcb7fe690360d04a0f8a5447324762be904f8 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "normal"
        option USE_FALLBACK_IMAGE=0
index e3be361e2c9f6ef2fa94da740066a8461204d2d4..ac4fcb7fe690360d04a0f8a5447324762be904f8 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "normal"
        option USE_FALLBACK_IMAGE=0
index 322da5bfbd0969b7d843ac1db52b877b7568c29b..88dd1684e32ce44e2c03906786cce466c1b964a7 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "normal"
        option USE_FAILOVER_IMAGE=0
index 41df077180e438a901e5b5005dd897435b4a1cd8..8162eca6be36390d2d1f50772ab35cec0ecb2477 100644 (file)
@@ -26,6 +26,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "fallback"
        option USE_FALLBACK_IMAGE = 1
index 797e29c0142f65e4b887f5cde7bb8fdd8b5e4c49..9720675b807bc9bf9c6a3ff017451e3a5a1dd538 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "normal"
         option USE_FAILOVER_IMAGE=0
index 8c204b69f45f1b43a9d36422fd26f3c015045acb..8ee91ab323d439ca129a377d89e8c7a34ac915f7 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "normal"
         option USE_FAILOVER_IMAGE=0
index 84a979770549e97e93692d8f7def9996343a91c7..d425fd5666bbe2099fa3a0a67ea9ea1657b318d2 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "normal"
        option USE_FALLBACK_IMAGE=0
index 22c86b11425cf8dfd889dc42f161387fb5c490bc..6bd9cd56b7812ae4f5857f93c4ac51ddf4bbef9d 100644 (file)
@@ -6,6 +6,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "fallback" 
        option FALLBACK_SIZE = 256 * 1024
index 501bc2c0a6549a57dba87e32e579577c1e98e8ae..02175bc26bde49eee68ee2a0d24a58cb0d316e4a 100644 (file)
@@ -26,6 +26,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "fallback"
        option USE_FALLBACK_IMAGE = 1
index 322da5bfbd0969b7d843ac1db52b877b7568c29b..88dd1684e32ce44e2c03906786cce466c1b964a7 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "normal"
        option USE_FAILOVER_IMAGE=0
index 322da5bfbd0969b7d843ac1db52b877b7568c29b..88dd1684e32ce44e2c03906786cce466c1b964a7 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "normal"
        option USE_FAILOVER_IMAGE=0
index 1ca73e429f6b620ded36509c31ef26e75f94da1a..7431783fb40a1cd43e7a6f33ff284cb4b230ca4e 100644 (file)
@@ -26,6 +26,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 romimage "normal"
        option USE_FAILOVER_IMAGE=0
index 71d1b2bb13176603b290a833dfb0d6c646ab7ea5..d364cb7cbdc78477f47690029af5891fc19f5947 100644 (file)
@@ -8,6 +8,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 option ROM_SIZE=512*1024
 
index dd3336782ba754ab0c67372329ba44eb2322d826..52c1711bd205258f36606345203ca1beebb5d96c 100644 (file)
@@ -6,6 +6,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 option ROM_SIZE=256*1024
 
index 40fb67cd502288efaea0d4f8e40cb1cf80cacb3e..c590daaa5e85d7e7d2c57f29d37c340d25ef2827 100644 (file)
@@ -26,6 +26,7 @@ option CROSS_COMPILE = "CROSS_PREFIX"
 option HOSTCC = "CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 option ROM_SIZE = 512 * 1024
 
index 33e0a335bbee10f2a3918f7be1f37edac8521437..0fd4226b99965f9fdc052f42087c4358fa158dc4 100755 (executable)
@@ -52,6 +52,9 @@ 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/ \
@@ -154,6 +157,7 @@ option CROSS_COMPILE="CROSS_PREFIX"
 option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
+__LOGLEVEL__
 
 EOF
                if [ "$TARCH" == i386 ] ; then
@@ -185,6 +189,14 @@ EOF
                ) > $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
        fi
 
+       if [ "$loglevel" != "default" ]; then
+               LOGLEVEL1="option MAXIMUM_CONSOLE_LOGLEVEL=$loglevel"
+               LOGLEVEL2="option DEFAULT_CONSOLE_LOGLEVEL=$loglevel"
+       else
+               LOGLEVEL1="# no loglevel override"
+               LOGLEVEL2=""
+       fi
+
        if [ "`which lzma`" != "" -a "$PAYLOAD" != /dev/null ]; then
                COMPRESSION="option CONFIG_COMPRESSED_PAYLOAD_LZMA=1"
        else
@@ -199,6 +211,8 @@ EOF
                -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"
 }
@@ -573,11 +587,11 @@ verbose=false
 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 Vvhat:bp:Tc:sxC -- "$@"`
+       args=`getopt -l version,verbose,help,all,target:,broken,payloads:,test,cpus:,silent,xml,config,loglevel Vvhat:bp:Tc:sxCl: -- "$@"`
        eval set "$args"
 else
        # Detected non-GNU getopt
-       args=`getopt Vvhat:bp:Tc:sxC $*`
+       args=`getopt Vvhat:bp:Tc:sxCl: $*`
        set -- $args
 fi
 
@@ -603,6 +617,7 @@ while true ; do
                -ns|--nostackprotect) shift; stackprotect=true;;
                -sb|--scan-build) shift; scanbuild=true;;
                -C|--config)    shift; configureonly=1;;
+               -l|--loglevel)  shift; loglevel="$1"; shift;;
                --)             shift; break;;
                -*)             printf "Invalid option\n\n"; myhelp; exit 1;;
                *)              break;;