diff options
Diffstat (limited to 'src/console')
| -rw-r--r-- | src/console/Kconfig | 1 | ||||
| -rw-r--r-- | src/console/init.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/console/Kconfig b/src/console/Kconfig index 8efe2e4799..84eb9f971d 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -2,6 +2,7 @@ menu "Console" config NO_BOOTBLOCK_CONSOLE bool + depends on SEPARATE_ROMSTAGE config BOOTBLOCK_CONSOLE bool "Enable early (bootblock) console output." diff --git a/src/console/init.c b/src/console/init.c index 8918dcff6d..3b89326c7f 100644 --- a/src/console/init.c +++ b/src/console/init.c @@ -9,7 +9,7 @@ #include <option.h> #include <version.h> -#define FIRST_CONSOLE (ENV_BOOTBLOCK || (CONFIG(NO_BOOTBLOCK_CONSOLE) && ENV_ROMSTAGE)) +#define FIRST_CONSOLE (ENV_BOOTBLOCK || (CONFIG(NO_BOOTBLOCK_CONSOLE) && ENV_SEPARATE_ROMSTAGE)) static int console_inited; static int console_loglevel; @@ -53,7 +53,7 @@ void console_init(void) if (CONFIG(DEBUG_CONSOLE_INIT)) console_inited = 1; - if (CONFIG(EARLY_PCI_BRIDGE) && (ENV_BOOTBLOCK || ENV_ROMSTAGE)) + if (CONFIG(EARLY_PCI_BRIDGE) && (ENV_BOOTBLOCK || ENV_SEPARATE_ROMSTAGE)) pci_early_bridge_init(); console_hw_init(); |