From f8bf5a10c599ef071998bbc3f16e9e3d7fcdb6eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Fri, 11 Oct 2013 22:08:02 +0300 Subject: Revert "CBMEM: Always have early initialisation" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit de1fe7f655c549e8dce5b34218221890fa5ccc34. While things appeared to work, there were actually invalid references to CAR storage after CAR was torn down on boards without EARLY_CBMEM_INIT. It was discussed use of CAR_GLOBAL should be restricted to boards that handle CAR migration properly. Change-Id: I9969d2ea79c334a7f95a0dbb7c78065720e6ccae Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/3968 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/Kconfig | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/Kconfig') diff --git a/src/Kconfig b/src/Kconfig index 1c35fb3188..4af80027cd 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -170,9 +170,19 @@ config INCLUDE_CONFIG_FILE config 0x8d740 raw 3324 (empty) 0x8e480 null 3610440 +config EARLY_CBMEM_INIT + bool + default n + help + Make coreboot initialize the CBMEM structures while running in ROM + stage. This is useful when the ROM stage wants to communicate + some, for instance, execution timestamps. It needs support in + romstage.c and should be enabled by the board's Kconfig. + config DYNAMIC_CBMEM bool "The CBMEM space is dynamically grown." default n + select EARLY_CBMEM_INIT help Instead of reserving a static amount of CBMEM space the CBMEM area grows dynamically. CBMEM can be used both in romstage (after @@ -180,7 +190,7 @@ config DYNAMIC_CBMEM config COLLECT_TIMESTAMPS bool "Create a table of timestamps collected during boot" - default n + 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. -- cgit v1.2.3