Add an "-l <num>" argument to abuild that sets the LOGLEVEL variables
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
diff --git a/targets/amd/dbm690t/Config-abuild.lb b/targets/amd/dbm690t/Config-abuild.lb
index ebac1d4..ec05545 100644
--- a/targets/amd/dbm690t/Config-abuild.lb
+++ b/targets/amd/dbm690t/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
option ROM_SIZE=1024*1024
romimage "normal"
diff --git a/targets/amd/pistachio/Config-abuild.lb b/targets/amd/pistachio/Config-abuild.lb
index ebac1d4..ec05545 100644
--- a/targets/amd/pistachio/Config-abuild.lb
+++ b/targets/amd/pistachio/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
option ROM_SIZE=1024*1024
romimage "normal"
diff --git a/targets/amd/serengeti_cheetah/Config-abuild.lb b/targets/amd/serengeti_cheetah/Config-abuild.lb
index 322da5b..88dd168 100644
--- a/targets/amd/serengeti_cheetah/Config-abuild.lb
+++ b/targets/amd/serengeti_cheetah/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "normal"
option USE_FAILOVER_IMAGE=0
diff --git a/targets/amd/serengeti_cheetah_fam10/Config-abuild.lb b/targets/amd/serengeti_cheetah_fam10/Config-abuild.lb
index 286461c..996a1b5 100644
--- a/targets/amd/serengeti_cheetah_fam10/Config-abuild.lb
+++ b/targets/amd/serengeti_cheetah_fam10/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
option ROM_SIZE=1024*1024
diff --git a/targets/arima/hdama/Config-abuild.lb b/targets/arima/hdama/Config-abuild.lb
index 57bc20f..44cec14 100644
--- a/targets/arima/hdama/Config-abuild.lb
+++ b/targets/arima/hdama/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
option ROM_SIZE=512*1024
diff --git a/targets/asus/a8n_e/Config-abuild.lb b/targets/asus/a8n_e/Config-abuild.lb
index 322da5b..88dd168 100644
--- a/targets/asus/a8n_e/Config-abuild.lb
+++ b/targets/asus/a8n_e/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "normal"
option USE_FAILOVER_IMAGE=0
diff --git a/targets/bcom/winnetp680/Config-abuild.lb b/targets/bcom/winnetp680/Config-abuild.lb
index 71d1b2b..d364cb7 100644
--- a/targets/bcom/winnetp680/Config-abuild.lb
+++ b/targets/bcom/winnetp680/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
option ROM_SIZE=512*1024
diff --git a/targets/digitallogic/msm586seg/Config-abuild.lb b/targets/digitallogic/msm586seg/Config-abuild.lb
index 46bad03..7efa904 100644
--- a/targets/digitallogic/msm586seg/Config-abuild.lb
+++ b/targets/digitallogic/msm586seg/Config-abuild.lb
@@ -6,6 +6,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "fallback"
option FALLBACK_SIZE = 256 * 1024
diff --git a/targets/emulation/qemu-x86/Config-abuild.lb b/targets/emulation/qemu-x86/Config-abuild.lb
index b5544a3..ce16c7c 100644
--- a/targets/emulation/qemu-x86/Config-abuild.lb
+++ b/targets/emulation/qemu-x86/Config-abuild.lb
@@ -6,6 +6,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
option ROM_SIZE=256*1024
diff --git a/targets/gigabyte/ga_2761gxdk/Config-abuild.lb b/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
index 0c102bd..bba2611 100644
--- a/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
+++ b/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
@@ -27,6 +27,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
option ROM_SIZE = 512*1024
diff --git a/targets/gigabyte/m57sli/Config-abuild.lb b/targets/gigabyte/m57sli/Config-abuild.lb
index 322da5b..88dd168 100644
--- a/targets/gigabyte/m57sli/Config-abuild.lb
+++ b/targets/gigabyte/m57sli/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "normal"
option USE_FAILOVER_IMAGE=0
diff --git a/targets/ibm/e326/Config-abuild.lb b/targets/ibm/e326/Config-abuild.lb
index 57bc20f..44cec14 100644
--- a/targets/ibm/e326/Config-abuild.lb
+++ b/targets/ibm/e326/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
option ROM_SIZE=512*1024
diff --git a/targets/iei/juki-511p/Config-abuild.lb b/targets/iei/juki-511p/Config-abuild.lb
index 0350f1f..3c203bd 100644
--- a/targets/iei/juki-511p/Config-abuild.lb
+++ b/targets/iei/juki-511p/Config-abuild.lb
@@ -6,6 +6,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
option ROM_SIZE=256*1024
###
diff --git a/targets/iwill/dk8_htx/Config-abuild.lb b/targets/iwill/dk8_htx/Config-abuild.lb
index 322da5b..88dd168 100644
--- a/targets/iwill/dk8_htx/Config-abuild.lb
+++ b/targets/iwill/dk8_htx/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "normal"
option USE_FAILOVER_IMAGE=0
diff --git a/targets/jetway/j7f24/Config-abuild.lb b/targets/jetway/j7f24/Config-abuild.lb
index 71d1b2b..d364cb7 100644
--- a/targets/jetway/j7f24/Config-abuild.lb
+++ b/targets/jetway/j7f24/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
option ROM_SIZE=512*1024
diff --git a/targets/kontron/986lcd-m/Config-abuild.lb b/targets/kontron/986lcd-m/Config-abuild.lb
index fcae71e..89171c3 100644
--- a/targets/kontron/986lcd-m/Config-abuild.lb
+++ b/targets/kontron/986lcd-m/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
option ROM_SIZE=1024*(1024-64)
option FALLBACK_SIZE=1024*512
diff --git a/targets/msi/ms7135/Config-abuild.lb b/targets/msi/ms7135/Config-abuild.lb
index 322da5b..88dd168 100644
--- a/targets/msi/ms7135/Config-abuild.lb
+++ b/targets/msi/ms7135/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "normal"
option USE_FAILOVER_IMAGE=0
diff --git a/targets/msi/ms7260/Config-abuild.lb b/targets/msi/ms7260/Config-abuild.lb
index 552e01ef..a03aba0 100644
--- a/targets/msi/ms7260/Config-abuild.lb
+++ b/targets/msi/ms7260/Config-abuild.lb
@@ -26,6 +26,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "normal"
option USE_FAILOVER_IMAGE = 0
diff --git a/targets/msi/ms9185/Config-abuild.lb b/targets/msi/ms9185/Config-abuild.lb
index e3be361..ac4fcb7 100644
--- a/targets/msi/ms9185/Config-abuild.lb
+++ b/targets/msi/ms9185/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "normal"
option USE_FALLBACK_IMAGE=0
diff --git a/targets/msi/ms9282/Config-abuild.lb b/targets/msi/ms9282/Config-abuild.lb
index e3be361..ac4fcb7 100644
--- a/targets/msi/ms9282/Config-abuild.lb
+++ b/targets/msi/ms9282/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "normal"
option USE_FALLBACK_IMAGE=0
diff --git a/targets/nvidia/l1_2pvv/Config-abuild.lb b/targets/nvidia/l1_2pvv/Config-abuild.lb
index 322da5b..88dd168 100644
--- a/targets/nvidia/l1_2pvv/Config-abuild.lb
+++ b/targets/nvidia/l1_2pvv/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "normal"
option USE_FAILOVER_IMAGE=0
diff --git a/targets/rca/rm4100/Config-abuild.lb b/targets/rca/rm4100/Config-abuild.lb
index 41df077..8162eca 100644
--- a/targets/rca/rm4100/Config-abuild.lb
+++ b/targets/rca/rm4100/Config-abuild.lb
@@ -26,6 +26,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "fallback"
option USE_FALLBACK_IMAGE = 1
diff --git a/targets/supermicro/h8dme/Config-abuild.lb b/targets/supermicro/h8dme/Config-abuild.lb
index 797e29c..9720675 100644
--- a/targets/supermicro/h8dme/Config-abuild.lb
+++ b/targets/supermicro/h8dme/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "normal"
option USE_FAILOVER_IMAGE=0
diff --git a/targets/supermicro/h8dmr/Config-abuild.lb b/targets/supermicro/h8dmr/Config-abuild.lb
index 8c204b6..8ee91ab 100644
--- a/targets/supermicro/h8dmr/Config-abuild.lb
+++ b/targets/supermicro/h8dmr/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "normal"
option USE_FAILOVER_IMAGE=0
diff --git a/targets/technexion/tim8690/Config-abuild.lb b/targets/technexion/tim8690/Config-abuild.lb
index 84a9797..d425fd5 100644
--- a/targets/technexion/tim8690/Config-abuild.lb
+++ b/targets/technexion/tim8690/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "normal"
option USE_FALLBACK_IMAGE=0
diff --git a/targets/technologic/ts5300/Config-abuild.lb b/targets/technologic/ts5300/Config-abuild.lb
index 22c86b1..6bd9cd5 100644
--- a/targets/technologic/ts5300/Config-abuild.lb
+++ b/targets/technologic/ts5300/Config-abuild.lb
@@ -6,6 +6,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "fallback"
option FALLBACK_SIZE = 256 * 1024
diff --git a/targets/thomson/ip1000/Config-abuild.lb b/targets/thomson/ip1000/Config-abuild.lb
index 501bc2c..02175bc 100644
--- a/targets/thomson/ip1000/Config-abuild.lb
+++ b/targets/thomson/ip1000/Config-abuild.lb
@@ -26,6 +26,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "fallback"
option USE_FALLBACK_IMAGE = 1
diff --git a/targets/tyan/s2895/Config-abuild.lb b/targets/tyan/s2895/Config-abuild.lb
index 322da5b..88dd168 100644
--- a/targets/tyan/s2895/Config-abuild.lb
+++ b/targets/tyan/s2895/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "normal"
option USE_FAILOVER_IMAGE=0
diff --git a/targets/tyan/s2912/Config-abuild.lb b/targets/tyan/s2912/Config-abuild.lb
index 322da5b..88dd168 100644
--- a/targets/tyan/s2912/Config-abuild.lb
+++ b/targets/tyan/s2912/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "normal"
option USE_FAILOVER_IMAGE=0
diff --git a/targets/tyan/s2912_fam10/Config-abuild.lb b/targets/tyan/s2912_fam10/Config-abuild.lb
index 1ca73e4..7431783 100644
--- a/targets/tyan/s2912_fam10/Config-abuild.lb
+++ b/targets/tyan/s2912_fam10/Config-abuild.lb
@@ -26,6 +26,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
romimage "normal"
option USE_FAILOVER_IMAGE=0
diff --git a/targets/via/epia-cn/Config-abuild.lb b/targets/via/epia-cn/Config-abuild.lb
index 71d1b2b..d364cb7 100644
--- a/targets/via/epia-cn/Config-abuild.lb
+++ b/targets/via/epia-cn/Config-abuild.lb
@@ -8,6 +8,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
option ROM_SIZE=512*1024
diff --git a/targets/via/epia-m/Config-abuild.lb b/targets/via/epia-m/Config-abuild.lb
index dd33367..52c1711 100644
--- a/targets/via/epia-m/Config-abuild.lb
+++ b/targets/via/epia-m/Config-abuild.lb
@@ -6,6 +6,7 @@
option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
option ROM_SIZE=256*1024
diff --git a/targets/via/pc2500e/Config-abuild.lb b/targets/via/pc2500e/Config-abuild.lb
index 40fb67c..c590daa 100644
--- a/targets/via/pc2500e/Config-abuild.lb
+++ b/targets/via/pc2500e/Config-abuild.lb
@@ -26,6 +26,7 @@
option HOSTCC = "CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
option ROM_SIZE = 512 * 1024
diff --git a/util/abuild/abuild b/util/abuild/abuild
index 33e0a33..0fd4226 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -52,6 +52,9 @@
# 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 HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
+__LOGLEVEL__
EOF
if [ "$TARCH" == i386 ] ; then
@@ -185,6 +189,14 @@
) > $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 @@
-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 @@
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 @@
-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;;