From c4df21490179ae95ef13b92ce7980992ffb1e5f8 Mon Sep 17 00:00:00 2001 From: Asen Dimov Date: Fri, 9 Dec 2011 11:00:07 +0000 Subject: [PATCH] pm9g45: init serial console before relocation The early messages can be seen on the debug console. Signed-off-by: Asen Chavdarov Dimov --- board/ronetix/pm9g45/pm9g45.c | 16 +++++++++++----- include/configs/pm9g45.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c index d29d0763ac..b5a11f2303 100644 --- a/board/ronetix/pm9g45/pm9g45.c +++ b/board/ronetix/pm9g45/pm9g45.c @@ -127,22 +127,28 @@ static void pm9g45_macb_hw_init(void) } #endif -int board_init(void) +int board_early_init_f(void) { struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; - /* Enable Ctrlc */ - console_init_f(); - + /* Enable clocks for all PIOs */ writel((1 << ATMEL_ID_PIOA) | (1 << ATMEL_ID_PIOB) | (1 << ATMEL_ID_PIOC) | (1 << ATMEL_ID_PIODE), &pmc->pcer); + at91_seriald_hw_init(); + + return 0; +} + +int board_init(void) +{ + /* arch number of AT91SAM9M10G45EK-Board */ + gd->bd->bi_arch_number = MACH_TYPE_PM9G45; /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - at91_seriald_hw_init(); #ifdef CONFIG_CMD_NAND pm9g45_nand_hw_init(); #endif diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 5b08d91097..eec9153300 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -57,6 +57,7 @@ #define CONFIG_INITRD_TAG 1 #define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_BOARD_EARLY_INIT_F /* * Hardware drivers -- 2.30.2