David Imhoff (dimhoff_devel(a)xs4all.nl) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10126
-gerrit
commit d93bd263b66d83fff4e22826e465aae8fac326df
Author: David Imhoff <dimhoff_devel(a)xs4all.nl>
Date: Wed May 6 21:42:37 2015 +0200
intel/fsp_baytrail: Fix logging of ISPEnable option
Before this fix the value of PcdEnableSdio was printed as the MIPI/ISP
configuration option.
TEST=Built and booted on Minnowboard Max
Change-Id: Ia9b02d520f4e615f90b45935456b9d97c5d00f11
Signed-off-by: David Imhoff <dimhoff_devel(a)xs4all.nl>
---
src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
index eb068ba..5bfcfd5 100644
--- a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
+++ b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
@@ -168,14 +168,14 @@ static void ConfigureDefaultUpdData(FSP_INFO_HEADER *FspInfo, UPD_DATA_REGION *U
if (FspInfo->ImageRevision >= FSP_GOLD3_REV_ID) {
UpdData->ISPEnable = dev->enabled;
} else {
- /* Gold2 and earlier FSP: ISPEnable is the filed */
+ /* Gold2 and earlier FSP: ISPEnable is the field */
/* next to PcdGttSize in UPD_DATA_REGION struct */
*(&(UpdData->PcdGttSize)+sizeof(UINT8)) = dev->enabled;
printk (FSP_INFO_LEVEL,
"Baytrail Gold2 or earlier FSP, adjust ISPEnable offset.\n");
}
printk(FSP_INFO_LEVEL, "MIPI/ISP:\t\t%s\n",
- UpdData->PcdEnableSdio?"Enabled":"Disabled");
+ dev->enabled?"Enabled":"Disabled");
break;
case EMMC_DEV_FUNC: /* EMMC 4.1*/
if ((dev->enabled) &&
David Imhoff (dimhoff_devel(a)xs4all.nl) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10100
-gerrit
commit f48b5927221b7a0f13a04699679ee67fd25e6f06
Author: David Imhoff <dimhoff_devel(a)xs4all.nl>
Date: Tue May 5 12:45:54 2015 +0200
fsp platforms: Notify FSP after PCI device init
Notify FSP of the EnumInitPhaseAfterPciEnumeration stage after PCI
device initialization. As described in fsp-architecture-spec.pdf, April
2014, Par 6.8.3. This fixes shutdown issues on Minnowboard Max.
TEST=Built and booted on Minnowboard Max. Verified power LED off after
Linux power off.
Change-Id: Ia6508c07aa53ba436bb5899a48ecd64a117524e5
Signed-off-by: David Imhoff <dimhoff_devel(a)xs4all.nl>
---
src/drivers/intel/fsp1_0/fsp_util.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/drivers/intel/fsp1_0/fsp_util.c b/src/drivers/intel/fsp1_0/fsp_util.c
index 3147b67..93e25a9 100644
--- a/src/drivers/intel/fsp1_0/fsp_util.c
+++ b/src/drivers/intel/fsp1_0/fsp_util.c
@@ -343,7 +343,7 @@ static void fsp_finalize(void *unused)
}
/* Set up for the ramstage FSP calls */
-BOOT_STATE_INIT_ENTRY(BS_DEV_ENUMERATE, BS_ON_EXIT, fsp_after_pci_enum, NULL);
+BOOT_STATE_INIT_ENTRY(BS_POST_DEVICE, BS_ON_EXIT, fsp_after_pci_enum, NULL);
BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_BOOT, BS_ON_ENTRY, fsp_finalize, NULL);
/* Update the MRC/fast boot cache as part of the late table writing stage */
Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10125
-gerrit
commit e517ab6c965c3db7fd17331cda062ce05f1ea260
Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Date: Wed May 6 11:51:25 2015 -0700
checkpatch: fix tree recognition
With the recent rename of documentation -> Documentation, the
checkpatch.pl script broke. Fix the tree check, and change the
user visible output of "kernel" to coreboot.
Change-Id: I34f538d4436e468b1c91eb36aa2f60a2a3308111
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
util/lint/checkpatch.pl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/util/lint/checkpatch.pl b/util/lint/checkpatch.pl
index c0d3d96..2f1f56c 100755
--- a/util/lint/checkpatch.pl
+++ b/util/lint/checkpatch.pl
@@ -57,7 +57,7 @@ Version: $V
Options:
-q, --quiet quiet
- --no-tree run without a kernel tree
+ --no-tree run without a coreboot tree
--no-signoff do not check for 'Signed-off-by' line
--patch treat FILE as patchfile (default)
--emacs emacs compile window format
@@ -69,7 +69,7 @@ Options:
--max-line-length=n set the maximum line length, if exceeded, warn
--min-conf-desc-length=n set the min description length, if shorter, warn
--show-types show the message "types" in the output
- --root=PATH PATH to the kernel tree root
+ --root=PATH PATH to the coreboot tree root
--no-summary suppress the per-file summary
--mailback only produce a report in case of warnings/errors
--summary-file include the filename in summary
@@ -233,7 +233,7 @@ if ($tree) {
}
if (!defined $root) {
- print "Must be run from the top-level dir. of a kernel tree\n";
+ print "Must be run from the top-level dir. of a coreboot tree\n";
exit(2);
}
}
@@ -700,7 +700,7 @@ sub top_of_kernel_tree {
my @tree_check = (
"COPYING", "README", "Makefile", "Makefile.inc",
- "src", "documentation", "util", "payloads",
+ "src", "Documentation", "util", "payloads",
);
foreach my $check (@tree_check) {
Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9805
-gerrit
commit f779e8bb3d95052e14505edbe8adfe8d0cfad5cb
Author: Stefan Reinauer <reinauer(a)chromium.org>
Date: Sun Apr 19 12:48:25 2015 -0700
kbuild: Use wildcard for driver subdirectories
Change-Id: Id1685c0b28ec8e3ab972a671af6f2de6f321c645
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
Makefile.inc | 2 +-
src/drivers/Makefile.inc | 44 -------------------------------------------
src/drivers/pc80/Makefile.inc | 4 ++++
src/drivers/uart/Makefile.inc | 4 ++++
4 files changed, 9 insertions(+), 45 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc
index b24429c..06c3302 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -55,7 +55,7 @@ PHONY+= clean-abuild coreboot lint lint-stable build-dirs
subdirs-y := src/lib src/console src/device
subdirs-y += src/ec/acpi $(wildcard src/ec/*/*) $(wildcard src/southbridge/*/*)
subdirs-y += $(wildcard src/soc/*/*) $(wildcard src/northbridge/*/*)
-subdirs-y += src/superio src/drivers src/cpu src/vendorcode
+subdirs-y += src/superio $(wildcard src/drivers/*) src/cpu src/vendorcode
subdirs-y += util/cbfstool util/sconfig util/nvramtool util/broadcom
subdirs-y += $(wildcard src/arch/*)
subdirs-y += src/mainboard/$(MAINBOARDDIR)
diff --git a/src/drivers/Makefile.inc b/src/drivers/Makefile.inc
deleted file mode 100644
index 11ec920..0000000
--- a/src/drivers/Makefile.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2010 coresystems GmbH
-##
-## 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
-## the Free Software Foundation; version 2 of the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-subdirs-y += ams
-subdirs-y += ati
-subdirs-y += dec
-subdirs-y += emulation
-subdirs-y += generic
-subdirs-y += gic
-subdirs-y += i2c
-subdirs-y += intel
-subdirs-y += lenovo
-subdirs-y += maxim
-subdirs-y += net
-subdirs-y += parade
-subdirs-y += sil
-subdirs-y += trident
-subdirs-y += xgi
-subdirs-$(CONFIG_DRIVERS_UART) += uart
-subdirs-y += usb
-subdirs-y += ics
-subdirs-y += spi
-subdirs-y += ti
-subdirs-y += ipmi
-subdirs-y += elog
-subdirs-y += xpowers
-subdirs-$(CONFIG_ARCH_X86) += pc80
-subdirs-y += ricoh/rce822
diff --git a/src/drivers/pc80/Makefile.inc b/src/drivers/pc80/Makefile.inc
index be8e8ea..0788cc7 100644
--- a/src/drivers/pc80/Makefile.inc
+++ b/src/drivers/pc80/Makefile.inc
@@ -1,3 +1,5 @@
+ifeq ($(CONFIG_ARCH_X86),y)
+
romstage-$(CONFIG_DRIVERS_MC146818) += mc146818rtc.c
ramstage-$(CONFIG_DRIVERS_MC146818) += mc146818rtc.c
ramstage-y += isa-dma.c
@@ -18,3 +20,5 @@ cmos.default-file = $(CONFIG_CMOS_DEFAULT_FILE):nvramtool
cmos.default-type = 0xaa
smm-$(CONFIG_DRIVERS_MC146818) += mc146818rtc.c
+
+endif
diff --git a/src/drivers/uart/Makefile.inc b/src/drivers/uart/Makefile.inc
index c4feb9a..1a809e0 100644
--- a/src/drivers/uart/Makefile.inc
+++ b/src/drivers/uart/Makefile.inc
@@ -1,3 +1,5 @@
+ifeq ($(CONFIG_DRIVERS_UART),y)
+
romstage-y += util.c
ramstage-y += util.c
bootblock-y += util.c
@@ -28,3 +30,5 @@ bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += pl011.c
romstage-y += pl011.c
ramstage-y += pl011.c
endif
+
+endif
Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10124
-gerrit
commit f9b38581680b1b3e8df9a60bdda74c7ebe1b2b2e
Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Date: Wed May 6 11:15:38 2015 -0700
MAINTAINERS: Add lint scripts
Change-Id: I54fea74897010718cf495ffb51667c9cb15869b9
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
MAINTAINERS | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 76e4c4c..b054f4d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -134,6 +134,11 @@ ATI MACH64 Driver
S: Orphan
F: drivers/ati/mach64
+LINT SCRIPTS
+M: Patrick Georgi <patrick(a)georgi-clan.de>
+S: Supported
+F: util/lint/
+
THE REST
M: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
L: coreboot(a)coreboot.org
Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10123
-gerrit
commit 9440888cfa455244e6ba8608ed7d585d6f19621b
Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Date: Wed May 6 11:10:18 2015 -0700
checkpatch: fine tune checks
Fine tune the following two checks:
- Check for incorrect file permissions
This one had a linux path hard coded, so it would choke on
some commits unnecessarily.
- FILE_PATH_CHANGES seems to not be working correctly. It will
choke on added / deleted files even if the MAINTAINERS file
is touched. Hence, switch from WARN to CHK (as WARN currently
blocks commits as well)
Change-Id: I9fccfbd75e94f420de45cf8b58071e3198065cf3
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
util/lint/checkpatch.pl | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/util/lint/checkpatch.pl b/util/lint/checkpatch.pl
index c0d3d96..92c356d 100755
--- a/util/lint/checkpatch.pl
+++ b/util/lint/checkpatch.pl
@@ -2069,7 +2069,8 @@ sub process {
# Check for incorrect file permissions
if ($line =~ /^new (file )?mode.*[7531]\d{0,2}$/) {
my $permhere = $here . "FILE: $realfile\n";
- if ($realfile !~ m@scripts/@ &&
+ if ($realfile !~ m@util/lint/@ &&
+ $realfile !~ m@util/scripts/@ &&
$realfile !~ /\.(py|pl|awk|sh)$/) {
ERROR("EXECUTE_PERMISSIONS",
"do not set execute permissions for source files\n" . $permhere);
@@ -2194,7 +2195,7 @@ sub process {
($line =~ /\{\s*([\w\/\.\-]*)\s*\=\>\s*([\w\/\.\-]*)\s*\}/ &&
(defined($1) || defined($2))))) {
$reported_maintainer_file = 1;
- WARN("FILE_PATH_CHANGES",
+ CHK("FILE_PATH_CHANGES",
"added, moved or deleted file(s), does MAINTAINERS need updating?\n" . $herecurr);
}
Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8419
-gerrit
commit 40434b4aca8ad29bb2237f472a76abd91fd3c0ba
Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Date: Wed Feb 11 01:53:42 2015 +0100
lint/gitconfig: Enable checkpatch.pl checking of commits
This patch enables running the checkpatch script on the code portion
of each commit as part of the pre-commit hook. At this point there
is no checking of the commit message in place (e.g. for typos)
Change-Id: I7cdf0692cf372986e411f4aba4691417b73c7511
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
util/gitconfig/pre-commit | 3 ++-
util/lint/lint-006-checkpatch | 23 +++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/util/gitconfig/pre-commit b/util/gitconfig/pre-commit
index ccf78d3..70cd6ea 100755
--- a/util/gitconfig/pre-commit
+++ b/util/gitconfig/pre-commit
@@ -1,2 +1,3 @@
#!/bin/sh
-exec %MAKE% lint-stable
+%MAKE% lint-stable
+git diff --cached | util/lint/checkpatch.pl --no-signoff -q -
diff --git a/util/lint/lint-006-checkpatch b/util/lint/lint-006-checkpatch
new file mode 100755
index 0000000..9d9d96e
--- /dev/null
+++ b/util/lint/lint-006-checkpatch
@@ -0,0 +1,23 @@
+#!/bin/sh
+# This file is part of the coreboot project.
+#
+# Copyright 2015 Google Inc.
+#
+# 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
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# DESCR: Checkpatch on all .c and .h files in the tree
+
+LC_ALL=C export LC_ALL
+util/lint/checkpatch.pl --show-types --file $( git ls-files \*.[ch] | \
+ grep -v ^payloads/libpayload/util/kconfig | \
+ grep -v ^payloads/libpayload/curses/PDCurses-3.4 | \
+ grep -v ^payloads/coreinfo/util/kconfig | \
+ grep -v ^util/kconfig \
+ )
the following patch was just integrated into master:
commit c6e1f8aa12c73635fa4889b6c29b9f91bf4a23d5
Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Date: Tue Apr 28 13:42:55 2015 -0700
Add MAINTAINERS file
Add a Linux style MAINTAINERS file and the get_maintainer.pl
script from the Linux kernel source (adapted to work in the
coreboot source tree)
Change-Id: I983e30c20c371d238cfa7c0a074587b731387c63
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Reviewed-on: http://review.coreboot.org/10021
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
Tested-by: build bot (Jenkins)
See http://review.coreboot.org/10021 for details.
-gerrit
the following patch was just integrated into master:
commit 0ff13d97d1a58a1c7e98d81d5c85c6d689b8fb93
Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Date: Tue May 5 16:52:10 2015 -0700
Drop lbtdump, like it's 2007
We have discussed dropping lbtdump since 2007, since it was obsoleted
by lxbios (nowadays aka nvramtool) back then.
http://www.coreboot.org/pipermail/coreboot/2007-August/024188.html
Well, it's only eight years later.
Change-Id: I5242118cd3763d1b8c4bdc6f023cf93ae1b5b85d
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Reviewed-on: http://review.coreboot.org/10121
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
See http://review.coreboot.org/10121 for details.
-gerrit