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/cbmem_common.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/cbmem_common.c')
-rw-r--r-- | src/lib/cbmem_common.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/lib/cbmem_common.c b/src/lib/cbmem_common.c index e3bec17bd6..ba4660920d 100644 --- a/src/lib/cbmem_common.c +++ b/src/lib/cbmem_common.c @@ -17,9 +17,6 @@ #include <bootstate.h> #include <rules.h> #include <symbols.h> -#if IS_ENABLED(CONFIG_ARCH_X86) && !IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) -#include <arch/acpi.h> -#endif void cbmem_run_init_hooks(int is_recovery) { @@ -40,16 +37,3 @@ void cbmem_run_init_hooks(int is_recovery) void __weak cbmem_fail_resume(void) { } - -#if ENV_RAMSTAGE && !IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) -static void init_cbmem_post_device(void *unused) -{ - if (acpi_is_wakeup()) - cbmem_initialize(); - else - cbmem_initialize_empty(); -} - -BOOT_STATE_INIT_ENTRY(BS_POST_DEVICE, BS_ON_ENTRY, - init_cbmem_post_device, NULL); -#endif |