diff options
author | Gabe Black <gabeblack@google.com> | 2013-06-06 00:21:20 -0700 |
---|---|---|
committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-07-10 21:47:52 +0200 |
commit | fbb11cf97937c345a42a45737fc7a95ee7ee3e7e (patch) | |
tree | 48b392d3c49c67470b6633d27821b31d3094832f /src/include/console | |
parent | c2c4f84644bf6f20b0a3b5dffb7edb6a47f02023 (diff) |
ARM: Separate the early console (romstage) from the bootblock console.
It might be that you want an early console in romstage before RAM is up, but
you can't or don't want to support the console all the way back in the
bootblock. By making the console in those two different environments
configurable seperately that becomes possible.
On the 5250 console output as early as the bootblock works, but on the 5420 it
only starts working in the ROM stage after clocks have been initialized.
Change-Id: I68ae3fcb4d828fa8a328a30001c23c81a4423bb8
Signed-off-by: Gabe Black <gabeblack@chromium.org>
Reviewed-on: http://review.coreboot.org/3671
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/include/console')
-rw-r--r-- | src/include/console/console.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/include/console/console.h b/src/include/console/console.h index 9112f35c9b..2f5f18ef50 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -77,7 +77,8 @@ void mainboard_post(u8 value); void __attribute__ ((noreturn)) die(const char *msg); int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3))); -#if defined(__PRE_RAM__) && !CONFIG_EARLY_CONSOLE +#if defined(__BOOT_BLOCK__) && !CONFIG_BOOTBLOCK_CONSOLE || \ + (defined(__PRE_RAM__) && !defined(__BOOT_BLOCK__)) && !CONFIG_EARLY_CONSOLE static inline void printk(int LEVEL, const char *fmt, ...); static inline void printk(int LEVEL, const char *fmt, ...) { |