[coreboot-gerrit] New patch to review for coreboot: 51a5f17 Exynos5420: Clean up console code

[Gabe Black (gabeblack@chromium.org)]

Gabe Black (gabeblack at chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3656

-gerrit

commit 51a5f17ab5c936bcb402de73ed7e0491e7d37d62
Author: Stefan Reinauer <reinauer at chromium.org>
Date:   Mon May 20 12:29:37 2013 -0700

    Exynos5420: Clean up console code
    
     - 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: I983d011c6ca602445f447d17799c1b2a33e8bd1d
    Signed-off-by: Stefan Reinauer <reinauer at chromium.org>
    Signed-off-by: Gabe Black <gabeblack at chromium.org>
---
 src/cpu/samsung/exynos5420/bootblock.c | 3 ---
 src/mainboard/google/pit/memory.c      | 1 -
 src/mainboard/google/pit/romstage.c    | 5 +++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/cpu/samsung/exynos5420/bootblock.c b/src/cpu/samsung/exynos5420/bootblock.c
index f523428..d3d737e 100644
--- a/src/cpu/samsung/exynos5420/bootblock.c
+++ b/src/cpu/samsung/exynos5420/bootblock.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <console/console.h>
 #include "clk.h"
 #include "wakeup.h"
 
@@ -38,6 +37,4 @@ void bootblock_cpu_init(void)
 	 * (ex, SPI, SD/MMC, or eMMC) now; but for Exynos platform, that is
 	 * already handled by iROM so there's no need to setup again.
 	 */
-
-	console_init();
 }
diff --git a/src/mainboard/google/pit/memory.c b/src/mainboard/google/pit/memory.c
index e420fe0..68c2bd6 100644
--- a/src/mainboard/google/pit/memory.c
+++ b/src/mainboard/google/pit/memory.c
@@ -490,7 +490,6 @@ static int board_get_config(void)
 	id1 = gpio_read_mvl3(BOARD_ID1_GPIO);
 	if (id0 < 0 || id1 < 0)
 		return -1;
-	printk(BIOS_DEBUG, "%s: id0: %u, id1: %u\n", __func__, id0, id1);
 
 	for (i = 0; i < ARRAY_SIZE(id_map); i++) {
 		if (id0 == id_map[i].id0 && id1 == id_map[i].id1) {
diff --git a/src/mainboard/google/pit/romstage.c b/src/mainboard/google/pit/romstage.c
index 08f19f5..4cc2e4b 100644
--- a/src/mainboard/google/pit/romstage.c
+++ b/src/mainboard/google/pit/romstage.c
@@ -129,7 +129,7 @@ static void setup_gpio(void)
 
 static void setup_memory(struct mem_timings *mem, int is_resume)
 {
-	printk(BIOS_SPEW, "man: 0x%x type: 0x%x, div: 0x%x, mhz: 0x%x\n",
+	printk(BIOS_SPEW, "man: 0x%x type: 0x%x, div: 0x%x, mhz: %d\n",
 	       mem->mem_manuf,
 	       mem->mem_type,
 	       mem->mpll_mdiv,
@@ -168,8 +168,9 @@ void main(void)
 	 * to re-initialize serial console drivers again. */
 	mem = setup_clock();
 
+	console_init();
+
 	if (!is_resume) {
-		console_init();
 		setup_power();
 	}