From 513a1a81f778b9fddbb55a36a38b2dd855215327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sun, 3 Jun 2018 12:29:50 +0300 Subject: arch/x86 cbmem: Drop tests for LATE_CBMEM_INIT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove all cases in code where we tested for EARLY_CBMEM_INIT or LATE_CBMEM_INIT being set. This also removes all references to LATE_CBMEM_INIT in comments. Change-Id: I4e47fb5c8a947d268f4840cfb9c0d3596fb9ab39 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/26827 Reviewed-by: Nico Huber Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/lib/hardwaremain.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/lib/hardwaremain.c') diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c index e6cf67f064..e4d5aec990 100644 --- a/src/lib/hardwaremain.c +++ b/src/lib/hardwaremain.c @@ -458,12 +458,10 @@ void main(void) post_code(POST_CONSOLE_READY); /* - * CBMEM needs to be recovered in the EARLY_CBMEM_INIT case because - * timestamps, APCI, etc rely on the cbmem infrastructure being - * around. Explicitly recover it. + * CBMEM needs to be recovered because timestamps, APCI, etc rely on + * the cbmem infrastructure being around. Explicitly recover it. */ - if (IS_ENABLED(CONFIG_EARLY_CBMEM_INIT)) - cbmem_initialize(); + cbmem_initialize(); /* Record current time, try to locate timestamps in CBMEM. */ timestamp_init(timestamp_get()); -- cgit v1.2.3