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/include/console | |
parent | 8616442150f6a4777ccad9c5b29b8bbfa4be5067 (diff) | |
download | coreboot-513a1a81f778b9fddbb55a36a38b2dd855215327.tar.xz |
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/include/console')
-rw-r--r-- | src/include/console/cbmem_console.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/include/console/cbmem_console.h b/src/include/console/cbmem_console.h index a8519d28a9..e0e35b1cef 100644 --- a/src/include/console/cbmem_console.h +++ b/src/include/console/cbmem_console.h @@ -22,11 +22,8 @@ void cbmemc_init(void); void cbmemc_tx_byte(unsigned char data); #define __CBMEM_CONSOLE_ENABLE__ (IS_ENABLED(CONFIG_CONSOLE_CBMEM) && \ - (ENV_RAMSTAGE || ENV_VERSTAGE || ENV_POSTCAR || \ - (IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) && \ - (ENV_ROMSTAGE || \ - (ENV_BOOTBLOCK && IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE))))\ - )) + (ENV_RAMSTAGE || ENV_VERSTAGE || ENV_POSTCAR || ENV_ROMSTAGE || \ + (ENV_BOOTBLOCK && IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)))) #if __CBMEM_CONSOLE_ENABLE__ static inline void __cbmemc_init(void) { cbmemc_init(); } |