Aaron Durbin (adurbin@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2895
-gerrit
commit 3a73b5de23b9c67bc21bb42b30d1aa63d7b27a0c Author: Aaron Durbin adurbin@chromium.org Date: Sat Mar 23 00:00:54 2013 -0500
dynamic cbmem: fix memconsole and timestamps
There are assumptions that COLLECT_TIMESTAMPS and CONSOLE_CBMEM rely on EARLY_CBMEM_INIT. This isn't true in the face of DYNAMIC_CBMEM as it provides the same properties as EARLY_CBMEM_INIT. Therefore, allow one to select COLLECT_TIMESTAMPS and CONSOLE_CBMEM when DYNAMIC_CBMEM is selected. Lastly, don't hard code the cbmem implementation when COLLECT_TIMESTAMPS is selected.
Change-Id: I053ebb385ad54a90a202da9d70b9d87ecc963656 Signed-off-by: Aaron Durbin adurbin@chromium.org --- src/Kconfig | 2 +- src/console/Kconfig | 2 +- src/lib/Makefile.inc | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig index 18b5bad..c3cc6bf 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -189,7 +189,7 @@ config DYNAMIC_CBMEM
config COLLECT_TIMESTAMPS bool "Create a table of timestamps collected during boot" - depends on EARLY_CBMEM_INIT + depends on (EARLY_CBMEM_INIT || DYNAMIC_CBMEM) help Make coreboot create a table of timer-ID/timer-value pairs to allow measuring time spent at different phases of the boot process. diff --git a/src/console/Kconfig b/src/console/Kconfig index 7fbed4a..d2cff57 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -219,7 +219,7 @@ config CONSOLE_NE2K_IO_PORT boundary, qemu needs broader align)
config CONSOLE_CBMEM - depends on EARLY_CBMEM_INIT + depends on (EARLY_CBMEM_INIT || DYNAMIC_CBMEM) bool "Send console output to a CBMEM buffer" default n help diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index e8ed4f4..9d3588e 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -47,7 +47,8 @@ romstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c romstage-$(CONFIG_USBDEBUG) += usbdebug.c -romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c cbmem.c +romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c +romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c romstage-y += compute_ip_checksum.c romstage-y += memmove.c romstage-$(CONFIG_ARCH_X86) += gcc.c