Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13888
-gerrit
commit 7b79b6ec21a4c1abfabbc66a08544a46c5b3adfa
Author: Martin Roth <martinroth(a)google.com>
Date: Thu Mar 3 12:11:47 2016 -0700
util/futility: trivial - Add distclean target
The what-jenkins-does build runs distclean when building the utilities.
It doesn't fail the build if distclean fails, but it generates a
scary warning.
Change-Id: Iac90958951976ed326a89ef2b5f2d9f17f9f2d6b
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
util/futility/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/util/futility/Makefile b/util/futility/Makefile
index 3ce45ed..f00e2eb 100644
--- a/util/futility/Makefile
+++ b/util/futility/Makefile
@@ -12,6 +12,8 @@ clean:
$(RM) $(objutil)/futility/futility
$(RM) -r $(objutil)/futility/build
+distclean: clean
+
ifneq ($(V),1)
ifneq ($(Q),)
.SILENT:
Antonello Dettori (dev(a)dettori.io) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13887
-gerrit
commit 1c67b7bc7294a4d31b39142afef3e5619e58a094
Author: Antonello Dettori <dev(a)dettori.io>
Date: Thu Mar 3 16:25:35 2016 +0000
adm/thatcher: Removed #include early_serial.c from romstage
Remove dependency on early_serial.c and instead use the
Super I/O's header to access the functions needed.
Change-Id: I9edf7fc2501aa832106dda9213e702dbcc1200b4
Signed-off-by: Antonello Dettori <dev(a)dettori.io>
---
src/mainboard/amd/thatcher/romstage.c | 3 ++-
src/superio/smsc/lpc47n217/Makefile.inc | 2 ++
src/superio/smsc/lpc47n217/early_serial.c | 3 ++-
src/superio/smsc/lpc47n217/lpc47n217.h | 3 +++
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/mainboard/amd/thatcher/romstage.c b/src/mainboard/amd/thatcher/romstage.c
index 10b7df1..11997bc 100644
--- a/src/mainboard/amd/thatcher/romstage.c
+++ b/src/mainboard/amd/thatcher/romstage.c
@@ -2,6 +2,7 @@
* This file is part of the coreboot project.
*
* Copyright (C) 2012 Advanced Micro Devices, Inc.
+ * Copyright (C) 2016 Antonello Dettori <dev(a)dettori.io>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -30,7 +31,7 @@
#include <cpu/x86/bist.h>
#include <cpu/x86/lapic.h>
#include <southbridge/amd/agesa/hudson/hudson.h>
-#include <superio/smsc/lpc47n217/early_serial.c>
+#include <superio/smsc/lpc47n217/lpc47n217.h>
#include <cpu/amd/agesa/s3_resume.h>
#include "cbmem.h"
diff --git a/src/superio/smsc/lpc47n217/Makefile.inc b/src/superio/smsc/lpc47n217/Makefile.inc
index f3c5ad4..9c31883 100644
--- a/src/superio/smsc/lpc47n217/Makefile.inc
+++ b/src/superio/smsc/lpc47n217/Makefile.inc
@@ -2,6 +2,7 @@
## This file is part of the coreboot project.
##
## Copyright (C) 2005 Digital Design Corporation
+## Copyright (C) 2016 Antonello Dettori <dev(a)dettori.io>
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -14,4 +15,5 @@
## GNU General Public License for more details.
##
+ramstage-$(CONFIG_SUPERIO_SMSC_LPC47N217) += early_serial.c
ramstage-$(CONFIG_SUPERIO_SMSC_LPC47N217) += superio.c
diff --git a/src/superio/smsc/lpc47n217/early_serial.c b/src/superio/smsc/lpc47n217/early_serial.c
index dfe06b9..8944b26 100644
--- a/src/superio/smsc/lpc47n217/early_serial.c
+++ b/src/superio/smsc/lpc47n217/early_serial.c
@@ -2,6 +2,7 @@
* This file is part of the coreboot project.
*
* Copyright (C) 2005 Digital Design Corporation
+ * Copyright (C) 2016 Antonello Dettori <dev(a)dettori.io>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -105,7 +106,7 @@ static void lpc47n217_pnp_set_enable(pnp_devfn_t dev, int enable)
* @param dev High 8 bits = Super I/O port, low 8 bits = logical device number.
* @param iobase Processor I/O port address to assign to this serial device.
*/
-static void lpc47n217_enable_serial(pnp_devfn_t dev, u16 iobase)
+void lpc47n217_enable_serial(pnp_devfn_t dev, u16 iobase)
{
/*
* NOTE: Cannot use pnp_set_XXX() here because they assume chip
diff --git a/src/superio/smsc/lpc47n217/lpc47n217.h b/src/superio/smsc/lpc47n217/lpc47n217.h
index 20689d1..21906f1 100644
--- a/src/superio/smsc/lpc47n217/lpc47n217.h
+++ b/src/superio/smsc/lpc47n217/lpc47n217.h
@@ -2,6 +2,7 @@
* This file is part of the coreboot project.
*
* Copyright (C) 2005 Digital Design Corporation
+ * Copyright (C) 2016 Antonello Dettori <dev(a)dettori.io>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -27,4 +28,6 @@
#define LPC47N217_MAX_CONFIG_REGISTER 0x39
+void lpc47n217_enable_serial(pnp_devfn_t dev, u16 iobase);
+
#endif
the following patch was just integrated into master:
commit c3a08a9d5e47f252b3f7b19bb153054eab35674e
Author: zbao <fishbaozi(a)gmail.com>
Date: Wed Mar 2 14:47:27 2016 +0800
amdfwtool: Fix some PSP2 issues
1. Change the function which integrated one firmware, to the function
which pushes the whole group. Use fw_table as a parameter instead
of using the global table name.
2. Let PSP2 and PSP1 not dependent on the other. It turns out PSP2
can exist without PSP1. For some APU, the PSP directory has to be
put in PSP2 field (ROMSIG 0x14).
3. Reserve 32 more bytes in PSP2 header. It is defined by spec. It
is tested, and it is true.
These above changes are overlapping, hard to split them. Sorry.
Change-Id: I834630d9596d7fb941e2cad5d00ac3af04a537b5
Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com>
Reviewed-on: https://review.coreboot.org/13808
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth(a)google.com>
See https://review.coreboot.org/13808 for details.
-gerrit
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13876
-gerrit
commit e283ec143ebc5f16ae9720106c44f57759093905
Author: Martin Roth <martinroth(a)google.com>
Date: Wed Mar 2 12:16:13 2016 -0700
kconfig_lint: make sure if and endif statements are balanced
In Kconfig files, the 'if' and 'endif' statements need to match up. A
file can't start an if statement that's completed in the next file.
Add a check as the files are being parsed to make sure that they match
up correctly.
Change-Id: If51207ea037089ab84c768e5a868270468cf4c4f
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
util/lint/kconfig_lint | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/util/lint/kconfig_lint b/util/lint/kconfig_lint
index 38fa968..c955343 100755
--- a/util/lint/kconfig_lint
+++ b/util/lint/kconfig_lint
@@ -447,6 +447,7 @@ sub build_and_parse_kconfig_tree {
my @inside_menu = (); # stack of menu names
my $inside_choice = "";
my $configs_inside_choice;
+ my %fileinfo;
#start the tree off by loading the top level kconfig
@config_to_parse = load_kconfig_file( $top_level_kconfig, "", 0, 0, "", 0 );
@@ -601,12 +602,14 @@ sub build_and_parse_kconfig_tree {
my $expr = $1;
push( @inside_if, $expr );
handle_expressions( $expr, $inside_config, $filename, $line_no );
+ $fileinfo{$filename}{iflevel}++;
}
# endif
elsif ( $line =~ /^\s*endif/ ) {
$inside_config = "";
pop(@inside_if);
+ $fileinfo{$filename}{iflevel}--;
}
#range <symbol> <symbol> [if <expr>]
@@ -665,6 +668,16 @@ sub build_and_parse_kconfig_tree {
}
push @wholeconfig, @parseline;
}
+
+ foreach my $file ( keys %fileinfo ) {
+ if ( $fileinfo{$file}{iflevel} > 0 ) {
+ show_error("$file has $fileinfo{$file}{iflevel} more 'if' statement(s) than 'endif' statements.");
+ }
+ elsif ( $fileinfo{$file}{iflevel} < 0 ) {
+ show_error(
+ "$file has " . ( $fileinfo{$file}{iflevel} * -1 ) . " more 'endif' statement(s) than 'if' statements." );
+ }
+ }
}
#-------------------------------------------------------------------------------
the following patch was just integrated into master:
commit ebf732b4a52874cf1579153d6f3d24e2b94e15dc
Author: Werner Zeh <werner.zeh(a)siemens.com>
Date: Wed Mar 2 17:55:31 2016 +0100
cbfstool: Use fixed width data types for e820entry struct.
In e820entry struct, the members are defined using
standard types. This can lead to different structure size
when compiling on 32 bit vs. 64 bit environment. This in turn
will affect the size of the struct linux_params.
Using the fixed width types resolves this issue and ensures
that the size of the structures will have the same length
on both 32 and 64 bit systems.
Change-Id: I1869ff2090365731e79b34950446f1791a083d0f
Signed-off-by: Werner Zeh <werner.zeh(a)siemens.com>
Reviewed-on: https://review.coreboot.org/13875
Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Tested-by: build bot (Jenkins)
See https://review.coreboot.org/13875 for details.
-gerrit
the following patch was just integrated into master:
commit bbf508914df2375efb38bedb0527b87eeac697c5
Author: Werner Zeh <werner.zeh(a)siemens.com>
Date: Wed Mar 2 17:45:53 2016 +0100
cbfstool: Initialize contents of linux_params to 0
When linux is used as payload, the parameters to the kernel are build
when cbfstool includes bzImage into the image. Since not all
parameters are used, the unused will stay uninitialized.
There is a chance, that the uninitialized parameters contain
random values. That in turn can lead to early kernel panic.
To avoid it, initialize all parameters with 0 at the beginning.
The ones that are used will be set up as needed and the rest
will contain 0 for sure. This way, kernel can deal with the
provided parameter list the right way.
Change-Id: Id081c24351ec80375255508378b5e1eba2a92e48
Signed-off-by: Werner Zeh <werner.zeh(a)siemens.com>
Reviewed-on: https://review.coreboot.org/13874
Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
See https://review.coreboot.org/13874 for details.
-gerrit
Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13877
-gerrit
commit 04532a1a0f342458a72b807b15b50701f42ecdd2
Author: Martin Roth <martinroth(a)google.com>
Date: Wed Mar 2 13:19:07 2016 -0700
lint-kconfig: pipe stderr to stdout to catch script errors
Because the perl error messages go to stderr, we were not catching these
on the build server. If the script has an issue, we want to know
immediately, so change the bash script that calls into the perl lint
tool to pipe these to stdout.
Change-Id: Ieeec9ccbd59177cfd1859a9738a4ee1fab803d28
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
util/lint/lint-stable-008-kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/util/lint/lint-stable-008-kconfig b/util/lint/lint-stable-008-kconfig
index 986fdc9..06e41b8 100755
--- a/util/lint/lint-stable-008-kconfig
+++ b/util/lint/lint-stable-008-kconfig
@@ -24,7 +24,7 @@ fi
# If coreboot is in a git repo, use git grep to check as it will ignore any
# files in the tree that aren't checked into git
if [ -n "$(command -v git)" ] && [ -e ".git" ]; then
- env perl util/lint/kconfig_lint --warnings_off
+ env perl util/lint/kconfig_lint --warnings_off 2>&1
else
- env perl util/lint/kconfig_lint --no_git_grep --warnings_off
+ env perl util/lint/kconfig_lint --no_git_grep --warnings_off 2>&1
fi