Marc Jones (marcj303(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1993
-gerrit
commit eb12dea419d4bb4e04da3b58fdd1c34572225cf2
Author: Marc Jones <marc.jones(a)se-eng.com>
Date: Fri Nov 30 16:22:51 2012 -0700
Clean up libpayload lpgcc and lpas scripts.
lpgcc and lpas are called by payload Makefiles to properly
build and link with libpayload.
Made lpas use the proper crosscompile AS, as lpgcc does with CC.
Added V=1 support to help users debug the build.
Fix basename $CC and $AS expansion.
Change-Id: Ia4dc8ba53ba7565521a79f1520155f3307b09f85
Signed-off-by: Marc Jones <marc.jones(a)se-eng.com>
---
payloads/libpayload/bin/lpas | 27 ++++++++++++++++++++++++---
payloads/libpayload/bin/lpgcc | 17 +++++++++++------
2 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/payloads/libpayload/bin/lpas b/payloads/libpayload/bin/lpas
index 37125b4..a82570c 100755
--- a/payloads/libpayload/bin/lpas
+++ b/payloads/libpayload/bin/lpas
@@ -27,17 +27,34 @@
## SUCH DAMAGE.
# AS wrapper for libpayload
+if [ -z "${V}" ] && [ "${V}" = 1 ]; then
+ DEBUGME=1
+else
+ DEBUGME=0
+fi
-DEFAULT_PREFIX=/opt
+if [ $DEBUGME -eq 1 ]; then
+ echo "AS = $AS"
+fi
+
+if [ -n "$AS" ]; then
+b=`basename "$AS"`
+if [ "$b" = "lpas" ]; then
+AS=""
+fi
+fi
+
+if [ "$AS" != "" ]; then
+DEFAULT_AS=$AS
+else
DEFAULT_AS=as
+fi
BASE=`dirname $0`
# This will set the _LIBDIR and _INCDIR variables used below
. $BASE/lp.functions
-DEBUGME=0
-
# This variable will contain the command line that the user wants to
# pass to gas
@@ -69,4 +86,8 @@ done
_ASFLAGS="--32 -I$_INCDIR"
+if [ $DEBUGME -eq 1 ]; then
+echo "$DEFAULT_AS $_ASFLAGS $CMDLINE"
+fi
+
$DEFAULT_AS $_ASFLAGS $CMDLINE
diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc
index b102c85..241f157 100755
--- a/payloads/libpayload/bin/lpgcc
+++ b/payloads/libpayload/bin/lpgcc
@@ -27,20 +27,26 @@
## SUCH DAMAGE.
# GCC wrapper for libpayload
+if [ -z "${V}" ] && [ "${V}" = 1 ]; then
+ DEBUGME=1
+else
+ DEBUGME=0
+fi
+
+if [ $DEBUGME -eq 1 ]; then
+ echo "CC = $CC"
+fi
+
# let's not recurse.
# This is a hack, I know, but it makes sure that really simple user errors
# don't fork-bomb your machine.
-# echo "CC = $CC"
-
if [ -n "$CC" ]; then
-b=`basename $CC`
+b=`basename "$CC"`
if [ "$b" = "lpgcc" ]; then
CC=""
fi
fi
-
-
if [ "$CC" != "" ]; then
DEFAULT_CC=$CC
else
@@ -62,7 +68,6 @@ trygccoption() {
return $?
}
-DEBUGME=0
DOLINK=1
# This variable will contain the command line that the user wants to
Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1992
-gerrit
commit a52ee4d9eb81b1586489a7531750ea6894f615b5
Author: Stefan Reinauer <reinauer(a)chromium.org>
Date: Fri Dec 7 13:13:26 2012 -0800
abuild: produce valid junit files
If no valid cross compiler is found, the junit file produced
by abuild is invalid, missing the closing </testcase> tag.
This breaks proper reporting in Jenkins of our ARM board at
this moment.
Change-Id: I94bfc7f334d33ceeb53451a7c5125058c1f33bd4
Signed-off-by: Stefan Reinauer <reinauer(a)google.com>
---
util/abuild/abuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/util/abuild/abuild b/util/abuild/abuild
index 9591d13..aefb1ea 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -368,8 +368,9 @@ function build_target
xml ""
xml "</mainboard>"
- junit " <testcase classname='board' name='$TARCH/$VENDOR/$MAINBOARD' >"
- junit "<failure type='NoCrossCompiler'>No cross-compiler for $TARCH found</failure>"
+ junit "<testcase classname='board' name='$TARCH/$VENDOR/$MAINBOARD' >"
+ junit " <failure type='NoCrossCompiler'>No cross-compiler for $TARCH found</failure>"
+ junit "</testcase>"
return 0
else
the following patch was just integrated into master:
commit 1b0c3526751b750e3cbfaf317e1eaf8d39fe3ba8
Author: Dave Frodin <dave.frodin(a)se-eng.com>
Date: Wed Dec 5 17:26:03 2012 -0700
coreinfo: change the foreground/background colors
The default curses library changed from tinycurses to
PDCurses. PDCurses fails to fill the entire active screen with
the assigned background colors when it writes 'blank' chars.
This will allow the menues to look better until I resolve that.
Change-Id: I70b5331d16dd0abaa1f0b02b725571844b7ac15e
Signed-off-by: Dave Frodin <dave.frodin(a)se-eng.com>
Reviewed-on: http://review.coreboot.org/1984
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Reviewed-by: Marc Jones <marcj303(a)gmail.com>
Build-Tested: build bot (Jenkins) at Fri Dec 7 15:24:30 2012, giving +1
Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Fri Dec 7 18:51:51 2012, giving +2
Reviewed-By: Marc Jones <marcj303(a)gmail.com> at Fri Dec 7 20:43:13 2012, giving +2
See http://review.coreboot.org/1984 for details.
-gerrit
the following patch was just integrated into master:
commit cbf3d407b8d943395f67d023795effe8f307b8c9
Author: Dave Frodin <dave.frodin(a)se-eng.com>
Date: Wed Dec 5 08:20:12 2012 -0700
Add function to map vendor/device to generic VBIOS IDs
Change-Id: I4d7c4ec2b91c97eacf96770c150c2b9a61309053
Signed-off-by: Dave Frodin <dave.frodin(a)se-eng.com>
Reviewed-on: http://review.coreboot.org/1982
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Build-Tested: build bot (Jenkins) at Fri Dec 7 15:11:37 2012, giving +1
Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Fri Dec 7 18:48:35 2012, giving +2
See http://review.coreboot.org/1982 for details.
-gerrit
the following patch was just integrated into master:
commit 0a90861ff2308cf03928dbe5b7c4d3dfde82ceb4
Author: Dave Frodin <dave.frodin(a)se-eng.com>
Date: Tue Nov 27 16:02:41 2012 -0700
libpayload: Don't let USB/PC/serial keyboards overwrite each other
Change-Id: I75c0066cf737e0cecac056487215622e2b3d4467
Signed-off-by: Dave Frodin <dave.frodin(a)se-eng.com>
Reviewed-on: http://review.coreboot.org/1981
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Build-Tested: build bot (Jenkins) at Fri Dec 7 15:05:07 2012, giving +1
Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Fri Dec 7 18:48:16 2012, giving +2
See http://review.coreboot.org/1981 for details.
-gerrit