diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2018-06-03 12:29:50 +0300 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2018-12-22 11:48:37 +0000 |
commit | 513a1a81f778b9fddbb55a36a38b2dd855215327 (patch) | |
tree | dd63ac840d855d65222f988e8dc1d8e5fa136df7 /src/lib/imd_cbmem.c | |
parent | 8616442150f6a4777ccad9c5b29b8bbfa4be5067 (diff) |
arch/x86 cbmem: Drop tests for LATE_CBMEM_INIT
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 <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/26827
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/lib/imd_cbmem.c')
-rw-r--r-- | src/lib/imd_cbmem.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c index a7a513f05c..d6eed28860 100644 --- a/src/lib/imd_cbmem.c +++ b/src/lib/imd_cbmem.c @@ -64,7 +64,7 @@ static inline const struct imd_entry *cbmem_to_imd(const struct cbmem_entry *e) } /* These are the different situations to handle: - * CONFIG_EARLY_CBMEM_INIT: + * * In ramstage cbmem_initialize() attempts a recovery of the * cbmem region set up by romstage. It uses cbmem_top() as the * starting point of recovery. @@ -116,11 +116,8 @@ void __weak cbmem_top_init(void) static void cbmem_top_init_once(void) { /* Call one-time hook on expected cbmem init during boot. This sequence - assumes first init call is in romstage for early cbmem init and - ramstage for late cbmem init. */ - if (IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) && !ENV_ROMSTAGE) - return; - if (IS_ENABLED(CONFIG_LATE_CBMEM_INIT) && !ENV_RAMSTAGE) + assumes first init call is in romstage. */ + if (!ENV_ROMSTAGE) return; cbmem_top_init(); |