Martin Roth (gaumless(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8427
-gerrit
commit eb137eb27df6c68ddc52c10b6f7633b5598056b0
Author: Martin Roth <gaumless(a)gmail.com>
Date: Thu Feb 12 19:34:11 2015 -0700
Only update submodules if the source is in a git repo
This change just adds a check to verify that the build is happening
inside a git repo and that git is a valid command before trying
to update the submodules.
Use 'command -v' instead of 'which' to stay portable.
Change-Id: Idfa27645c3dbfd684f90002ecb01626d71eacc8f
Signed-off-by: Martin Roth <gaumless(a)gmail.com>
---
Makefile.inc | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc
index a60df87..b8ab4be 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -19,7 +19,7 @@
#######################################################################
# misleadingly named, this is the coreboot version
-export KERNELVERSION := $(shell if [ -d "$(top)/.git" -a -f "`which git`" ]; \
+export KERNELVERSION := $(shell if [ -d "$(top)/.git" -a -f "$(command -v git)" ]; \
then git describe --dirty --always || git describe; \
else echo 4.0$(KERNELREVISION); fi)
@@ -139,12 +139,14 @@ ifeq ($(CONFIG_COVERAGE),y)
ramstage-c-ccopts+=-fprofile-arcs -ftest-coverage
endif
-# try to fetch non-optional submodules
-forgetthis:=$(shell git submodule update --init)
+# try to fetch non-optional submodules if the source is under git
+forgetthis:=$(shell if [ -d "$(top)/.git" -a -f "$(command -v git)" ]; \
+ then git submodule update --init; fi)
ifeq ($(CONFIG_USE_BLOBS),y)
# this is necessary because 3rdparty is update=none, and so is ignored
# unless explicitly requested and enabled through --checkout
-forgetthis:=$(shell git submodule update --init --checkout 3rdparty)
+forgetthis:=$(shell if [ -d "$(top)/.git" -a -f "$(command -v git)" ]; \
+ then git submodule update --init --checkout 3rdparty; fi)
endif
bootblock-c-ccopts:=-D__BOOT_BLOCK__ -D__PRE_RAM__
Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8601
-gerrit
commit 14af2f71ed47814f0c2dc4105196a39b56c9df06
Author: Patrick Georgi <pgeorgi(a)google.com>
Date: Wed Mar 4 15:03:05 2015 +0100
build system: Only setup git hooks if we're in a git checkout
A bit crude test, but before we would have _created_ .git
and confused later git presence tests.
Change-Id: Iec882d0e38ce1bd227cae8c1e541fb21be085290
Signed-off-by: Patrick Georgi <pgeorgi(a)google.com>
---
Makefile.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile.inc b/Makefile.inc
index 951cfee..eb8b601 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -436,6 +436,7 @@ lint lint-stable:
rm -f $$LINTLOG
gitconfig:
+ [ -d .git ]
mkdir -p .git/hooks
for hook in commit-msg pre-commit ; do \
if [ util/gitconfig/$$hook -nt .git/hooks/$$hook -o \
Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8600
-gerrit
commit 67912d1047a56e09d15fec86a714c91f23057f6f
Author: Patrick Georgi <pgeorgi(a)google.com>
Date: Wed Mar 4 15:02:03 2015 +0100
build system: Only test for git once
And then use the variable to decide what to do.
Change-Id: I48a801ecdbf774c4a8b64d7efaf9cf0ef2c2d438
Signed-off-by: Patrick Georgi <pgeorgi(a)google.com>
---
Makefile.inc | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc
index b8ab4be..951cfee 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -17,11 +17,13 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
+GIT:=$(shell [ -d "$(top)/.git" ] && command -v git)
+
#######################################################################
# misleadingly named, this is the coreboot version
-export KERNELVERSION := $(shell if [ -d "$(top)/.git" -a -f "$(command -v git)" ]; \
- then git describe --dirty --always || git describe; \
- else echo 4.0$(KERNELREVISION); fi)
+export KERNELVERSION := $(strip $(if $(GIT),\
+ $(shell git describe --dirty --always || git describe),\
+ 4.0$(KERNELREVISION)))
#######################################################################
# Test for coreboot toolchain (except when explicitely not requested)
@@ -140,13 +142,11 @@ ramstage-c-ccopts+=-fprofile-arcs -ftest-coverage
endif
# try to fetch non-optional submodules if the source is under git
-forgetthis:=$(shell if [ -d "$(top)/.git" -a -f "$(command -v git)" ]; \
- then git submodule update --init; fi)
+forgetthis:=$(if $(GIT),$(shell git submodule update --init))
ifeq ($(CONFIG_USE_BLOBS),y)
# this is necessary because 3rdparty is update=none, and so is ignored
# unless explicitly requested and enabled through --checkout
-forgetthis:=$(shell if [ -d "$(top)/.git" -a -f "$(command -v git)" ]; \
- then git submodule update --init --checkout 3rdparty; fi)
+forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty))
endif
bootblock-c-ccopts:=-D__BOOT_BLOCK__ -D__PRE_RAM__
Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8599
-gerrit
commit 055f13e77b69be0e434e779fde1ae00808036c70
Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
Date: Tue Mar 3 22:37:44 2015 -0600
drivers/pc80: Do not initialize PS2 keyboard by default
The most common payloads do not need this set, so optimize for the
common case.
Change-Id: I2e5b68d74e9b91b41bbbcffc17d31d5c1bb38fd4
Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
---
src/drivers/pc80/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/drivers/pc80/Kconfig b/src/drivers/pc80/Kconfig
index f8ac5c5..fd56b6a 100644
--- a/src/drivers/pc80/Kconfig
+++ b/src/drivers/pc80/Kconfig
@@ -2,7 +2,7 @@
# reliably support PS/2 init themselves.
config DRIVERS_PS2_KEYBOARD
bool "PS/2 keyboard init"
- default y
+ default n
help
Enable this option to initialize PS/2 keyboards found connected
to the PS/2 port.
the following patch was just integrated into master:
commit a89accd74ff6b9bdb8d27a0b7d5da9e7e5bd68c9
Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com>
Date: Fri Feb 20 11:54:09 2015 -0600
cpu/amd/model_10xxx: Documentation update
Change-Id: Ic29009be42ef77261a3b535327cf5c12761023c1
Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com>
Reviewed-on: http://review.coreboot.org/8497
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
Reviewed-by: Nicolas Reinecke <nr(a)das-labor.org>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
See http://review.coreboot.org/8497 for details.
-gerrit
the following patch was just integrated into master:
commit ead8751367867b798cea0709628c8eda780f20c8
Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com>
Date: Fri Feb 20 12:47:52 2015 -0600
cpu/amd/model_10xxx: Refactor model detection to reduce code duplication
Moved mctGetLogicalCPUID() to a separate file and made it available in
both romstage and ramstage.
Change-Id: I959c1caa8f796947b627a7b379c37d7307e2898e
Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com>
Reviewed-on: http://review.coreboot.org/8499
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
Reviewed-by: Nicolas Reinecke <nr(a)das-labor.org>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
See http://review.coreboot.org/8499 for details.
-gerrit
Marc Jones (marc.jones(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8597
-gerrit
commit b2d52bd0c8161d0a18ede7e87bea187e49a76179
Author: Furquan Shaikh <furquan(a)google.com>
Date: Fri Jul 18 10:25:54 2014 -0700
coreboot memrange: Changes to memrange lib
1) Add check for zero size in memrange.
2) Add public memrange_init_empty function to allow initializing only the
memrange structure without filling in device resources
BUG=None
BRANCH=None
TEST=Compiles and runs succesfully for rush MMU memranges.
Original-Change-Id: I8e4d864cbc9a770cd208f8a9f83f509dc7ace894
Original-Signed-off-by: Furquan Shaikh <furquan(a)google.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/208957
Original-Tested-by: Furquan Shaikh <furquan(a)chromium.org>
Original-Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Original-Commit-Queue: Furquan Shaikh <furquan(a)chromium.org>
(cherry picked from commit 5c42301c2a51a1a2a29ef58012f210d03bd37f94)
Signed-off-by: Marc Jones <marc.jones(a)se-eng.com>
Change-Id: I8d63abb15efda74270ef6fa3c0df55c05659595d
---
src/include/memrange.h | 3 +++
src/lib/memrange.c | 10 +++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/include/memrange.h b/src/include/memrange.h
index ba85bef..048c287 100644
--- a/src/include/memrange.h
+++ b/src/include/memrange.h
@@ -75,6 +75,9 @@ static inline void range_entry_update_tag(struct range_entry *r,
#define memranges_each_entry(r, ranges) \
for (r = (ranges)->entries; r != NULL; r = r->next)
+/* Initialize memranges structure */
+void memranges_init_empty(struct memranges *ranges);
+
/* Initialize and fill a memranges structure according to the
* mask and match type for all memory resources. Tag each entry with the
* specified type. */
diff --git a/src/lib/memrange.c b/src/lib/memrange.c
index a85bc01..d2ffa26 100644
--- a/src/lib/memrange.c
+++ b/src/lib/memrange.c
@@ -228,6 +228,9 @@ static void do_action(struct memranges *ranges,
resource_t end;
resource_t begin;
+ if (size == 0)
+ return;
+
/* The addresses are aligned to 4096 bytes: the begin address is
* aligned down while the end address is aligned up to be conservative
* about the full range covered. */
@@ -290,11 +293,16 @@ void memranges_add_resources(struct memranges *ranges,
memranges_add_resources_filter(ranges, mask, match, tag, NULL);
}
+void memranges_init_empty(struct memranges *ranges)
+{
+ ranges->entries = NULL;
+}
+
void memranges_init(struct memranges *ranges,
unsigned long mask, unsigned long match,
unsigned long tag)
{
- ranges->entries = NULL;
+ memranges_init_empty(ranges);
memranges_add_resources(ranges, mask, match, tag);
}