diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2013-05-16 10:57:15 -0700 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-07-10 20:09:42 +0200 |
| commit | 919c8044255f83c7f86023c561a20e1b2d05a2ce (patch) | |
| tree | 07c8976cb2ba9673f4d4ff46cf39ab1b10068c24 /src/arch/armv7/bootblock_simple.c | |
| parent | d3163abd4310011c4616e757662d1777188b4a22 (diff) | |
| download | coreboot-919c8044255f83c7f86023c561a20e1b2d05a2ce.tar.xz | |
ARMv7: Clean up console code
- Guard console_init() with CONFIG_EARLY_CONSOLE in bootblock
- Don't initialize console twice in the bootblock
- remove printk in memory init that would mess up the UART
- unconditionally run console_init() in romstage, as it is
also unconditionally run in the bootblock.
Change-Id: I8f0d60877433162367074d0e55e01f935fd81f8e
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Signed-off-by: Gabe Black <gabeblack@chromium.org>
Reviewed-on: http://review.coreboot.org/3647
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/arch/armv7/bootblock_simple.c')
| -rw-r--r-- | src/arch/armv7/bootblock_simple.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/arch/armv7/bootblock_simple.c b/src/arch/armv7/bootblock_simple.c index 46e9d411bc..5d0fe7ecaa 100644 --- a/src/arch/armv7/bootblock_simple.c +++ b/src/arch/armv7/bootblock_simple.c @@ -68,12 +68,12 @@ void main(void) bootblock_mainboard_init(); } +#ifdef CONFIG_EARLY_CONSOLE console_init(); - printk(BIOS_INFO, "hello from bootblock\n"); - printk(BIOS_INFO, "bootblock main(): loading romstage\n"); +#endif + entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, stage_name); - printk(BIOS_INFO, "bootblock main(): jumping to romstage\n"); if (entry) stage_exit(entry); hlt(); } |