From 919c8044255f83c7f86023c561a20e1b2d05a2ce Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Thu, 16 May 2013 10:57:15 -0700 Subject: 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 Signed-off-by: Gabe Black Reviewed-on: http://review.coreboot.org/3647 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/arch/armv7/bootblock_simple.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/arch') 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(); } -- cgit v1.2.3