diff mbox

[U-Boot,v2] pm9261: init serial console before relocation

Message ID 1323464347-15888-1-git-send-email-dimov@ronetix.at
State Accepted
Delegated to: Anatolij Gustschin
Headers show

Commit Message

Asen Dimov Dec. 9, 2011, 8:59 p.m. UTC
The early messages can be seen on the debug console.

Signed-off-by: Asen Chavdarov Dimov <dimov@ronetix.at>
---
Change since v1
	- rebased over master

 board/ronetix/pm9261/pm9261.c |   17 ++++++++++++-----
 include/configs/pm9261.h      |    1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

Comments

Anatolij Gustschin Dec. 12, 2011, 9:44 a.m. UTC | #1
On Fri,  9 Dec 2011 22:59:07 +0200
Asen Chavdarov Dimov <dimov@ronetix.at> wrote:

> The early messages can be seen on the debug console.
> 
> Signed-off-by: Asen Chavdarov Dimov <dimov@ronetix.at>
> ---
> Change since v1
> 	- rebased over master
> 
>  board/ronetix/pm9261/pm9261.c |   17 ++++++++++++-----
>  include/configs/pm9261.h      |    1 +
>  2 files changed, 13 insertions(+), 5 deletions(-)

Applied to u-boot-staging/agust@denx.de. Thanks!

Anatolij
diff mbox

Patch

diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c
index c6b582d..79a3216 100644
--- a/board/ronetix/pm9261/pm9261.c
+++ b/board/ronetix/pm9261/pm9261.c
@@ -237,21 +237,28 @@  void lcd_show_board_info(void)
 
 #endif /* CONFIG_LCD */
 
-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 some PIOs */
 	writel(1 << ATMEL_ID_PIOA |
 		1 << ATMEL_ID_PIOC,
 		&pmc->pcer);
 
+	at91_seriald_hw_init();
+
+	return 0;
+}
+
+int board_init(void)
+{
+	/* arch number of PM9261-Board */
+	gd->bd->bi_arch_number = MACH_TYPE_PM9261;
+
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
-	at91_seriald_hw_init();
 #ifdef CONFIG_CMD_NAND
 	pm9261_nand_hw_init();
 #endif
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 9fbf9af..1e80316 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -161,6 +161,7 @@ 
 #define CONFIG_INITRD_TAG	1
 
 #undef CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_BOARD_EARLY_INIT_F
 
 /*
  * Hardware drivers