Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10712
-gerrit
commit d213a033d1f7615463fc8d8532ed4ffaad0749db
Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Date: Mon Jun 29 14:28:25 2015 -0700
libpayload: Makefile: Use variables defined for Kconfig
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Change-Id: Ia451e8250307ad1944cb0429bdfee4bdf18c706b
---
payloads/libpayload/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index dd538dd..1c3cd8d 100644
--- a/payloads/libpayload/Makefile
+++ b/payloads/libpayload/Makefile
@@ -45,7 +45,7 @@ endif
export top := $(CURDIR)
export src := src
-export srck := $(top)/../../util/kconfig
+export srck := $(abspath $(top)/../../util/kconfig)
export obj ?= build
export objutil ?= $(obj)/util
export objk := $(objutil)/lp_kconfig
@@ -92,7 +92,7 @@ all: real-all
# This include must come _before_ the pattern rules below!
# Order _does_ matter for pattern rules.
-include ../../util/kconfig/Makefile
+include $(srck)/Makefile
include $(HAVE_DOTCONFIG)
Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10709
-gerrit
commit 7980b83bbcc833267ea55f6b379ac1d730285c41
Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Date: Mon Jun 29 14:44:37 2015 -0700
Makefile: Use variables defined for Kconfig
Change-Id: I72df5fef187e12d1c3c2409449dc9d9b7b80a5e2
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index aa9ccf9..85a10c0 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ all: real-all
# This include must come _before_ the pattern rules below!
# Order _does_ matter for pattern rules.
-include util/kconfig/Makefile
+include $(srck)/Makefile
# Three cases where we don't need fully populated $(obj) lists:
# 1. when no .config exists
@@ -248,7 +248,7 @@ printall:
endif
ifndef NOMKDIR
-$(shell mkdir -p $(KCONFIG_SPLITCONFIG) $(objutil)/kconfig/lxdialog $(additional-dirs) $(alldirs))
+$(shell mkdir -p $(KCONFIG_SPLITCONFIG) $(objk)/lxdialog $(additional-dirs) $(alldirs))
endif
cscope:
the following patch was just integrated into master:
commit 9bca4ba07887b75e638a6f579cda25286504d7e5
Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Date: Fri Jun 26 17:34:56 2015 -0700
vboot2: Enable VBOOT_DYNAMIC_WORK_BUFFER on x86
Change-Id: Iaadbd52d948000d1ed46865b83bdb0f4926ca429
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Reviewed-on: http://review.coreboot.org/10677
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
See http://review.coreboot.org/10677 for details.
-gerrit
the following patch was just integrated into master:
commit aabfe05bff804053cbd921961919df267bc4e39a
Author: Patrick Georgi <pgeorgi(a)chromium.org>
Date: Mon Jun 29 22:24:34 2015 +0200
vboot2: consolidate vboot2 buffer initialization
Instead of calling the init function to clear out vboot2 data structures in
multiple places, move the function and call close to verstage_main().
Change-Id: If42e18a8e4581f22f7a7aced70ccbe3188bb0cd5
Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org>
Reviewed-on: http://review.coreboot.org/10701
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
See http://review.coreboot.org/10701 for details.
-gerrit
Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10708
-gerrit
commit bef3d62d4f3268355aeab2774754cba38f7dc138
Author: Patrick Georgi <pgeorgi(a)chromium.org>
Date: Mon Jun 29 23:11:21 2015 +0200
lib: add delay.c to bootblock if I2C_TPM driver is enabled
Change-Id: I752fcc3b8687e4f861c3977322ebb6439f14fac4
Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org>
---
src/lib/Makefile.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 76c8fd3..bda7586 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -30,6 +30,7 @@ bootblock-$(CONFIG_GENERIC_UDELAY) += timer.c
bootblock-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
bootblock-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
+bootblock-$(CONFIG_I2C_TPM) += delay.c
bootblock-y += memchr.c
bootblock-y += memcmp.c
bootblock-y += mem_pool.c