cbmem console: make verstage first class citizen
The conditions in cbmem console for supporting verstage were implicitly utilizing CONFIG_BOOTBLOCK_CONSOLE to handle the cbmem console enablement. Fix it so verstage is a first class citizen for deciding actions pertaining to cbmem console. BUG=chrome-os-partner:44827 BRANCH=None TEST=Built and booted glados using verstage. cbmem console shows verstage output. Change-Id: Iba79efd1c1d4056f1a105a5e10ffc95f3e69b597 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/11820 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
committed by
Aaron Durbin
parent
b5a20b29b7
commit
079fb3fc29
@ -26,8 +26,10 @@ void cbmemc_init(void);
|
||||
void cbmemc_tx_byte(unsigned char data);
|
||||
|
||||
#define __CBMEM_CONSOLE_ENABLE__ CONFIG_CONSOLE_CBMEM && \
|
||||
(ENV_RAMSTAGE || (IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) && \
|
||||
(ENV_ROMSTAGE || (ENV_BOOTBLOCK && CONFIG_BOOTBLOCK_CONSOLE))))
|
||||
(ENV_RAMSTAGE || ENV_VERSTAGE || \
|
||||
(IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) && \
|
||||
(ENV_ROMSTAGE || (ENV_BOOTBLOCK && CONFIG_BOOTBLOCK_CONSOLE)))\
|
||||
)
|
||||
|
||||
#if __CBMEM_CONSOLE_ENABLE__
|
||||
static inline void __cbmemc_init(void) { cbmemc_init(); }
|
||||
|
Reference in New Issue
Block a user