Skip to contentSkip to conversation

pm9263: init serial console before relocation

PATCH New Asen Chavdarov Dimov 2 participants 4 messages Sep 13, 2011 – Dec 12, 2011

lore
Share & tools
lore

Asen Chavdarov Dimov

author
#0 lore raw

PATCH 1/1 pm9263: init serial console before relocation

The early messages can be seen on the debug console.

Signed-off-by Asen Chavdarov Dimov <[email protected]>
---
 board/ronetix/pm9263/pm9263.c |   19 +++++++++++--------
 include/configs/pm9263.h      |    1 +
 2 files changed, 12 insertions(+), 8 deletions(-)
board/ronetix/pm9263/pm9263.c +11 -8
index cfc9847..e102a11 100644
@@ -337,25 +337,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();
-
-	writel((1 << ATMEL_ID_PIOA) |
-		(1 << ATMEL_ID_PIOCDE) |
-		(1 << ATMEL_ID_PIOB),
+	/* Enable clocks for all PIOs */
+	writel((1 << ATMEL_ID_PIOA) | (1 << ATMEL_ID_PIOB) |
+		(1 << ATMEL_ID_PIOCDE),
 		&pmc->pcer);
 
+	at91_seriald_hw_init();
+
+	return 0;
+}
+
+int board_init(void)
+{
 	/* arch number of AT91SAM9263EK-Board */
 	gd->bd->bi_arch_number = MACH_TYPE_PM9263;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
-	at91_seriald_hw_init();
 #ifdef CONFIG_CMD_NAND
 	pm9263_nand_hw_init();
 #endif
include/configs/pm9263.h +1 -0
index f1bd389..9d94bbd 100644
@@ -169,6 +169,7 @@
 
 #undef CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_USER_LOWLEVEL_INIT	1
+#define CONFIG_BOARD_EARLY_INIT_F
 
 /*
  * Hardware drivers
Signature · 1 line
1.7.4.4
#1 lore raw

PATCH 1/1 pm9263: init serial console before relocation

Hi,

Quoted 7 lines · On Tue, 13 Sep 2011 15:21:00 +0300 Asen Chavdarov Dimov <[email protected]>…

The early messages can be seen on the debug console.

Signed-off-by Asen Chavdarov Dimov <[email protected]>
---
 board/ronetix/pm9263/pm9263.c |   19 +++++++++++--------
 include/configs/pm9263.h      |    1 +
 2 files changed, 12 insertions(+), 8 deletions(-)

This patch doesn't apply. Please rebase and resubmit. Thanks!

Anatolij

author
#2 lore raw

PATCH v2 1/1 pm9263: init serial console before relocation

The early messages can be seen on the debug console.

Signed-off-by Asen Chavdarov Dimov <[email protected]>

---
Change since v1
- rebased over master

 board/ronetix/pm9263/pm9263.c |   22 ++++++++++++++--------
 include/configs/pm9263.h      |    1 +
 2 files changed, 15 insertions(+), 8 deletions(-)
board/ronetix/pm9263/pm9263.c +14 -8
index 59cca87..1266114 100644
@@ -336,22 +336,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();
-
-	writel((1 << ATMEL_ID_PIOA) |
-		(1 << ATMEL_ID_PIOCDE) |
-		(1 << ATMEL_ID_PIOB),
+	/* Enable clocks for all PIOs */
+	writel((1 << ATMEL_ID_PIOA) | (1 << ATMEL_ID_PIOB) |
+		(1 << ATMEL_ID_PIOCDE),
 		&pmc->pcer);
 
+	at91_seriald_hw_init();
+
+	return 0;
+}
+
+int board_init(void)
+{
+	/* arch number of AT91SAM9263EK-Board */
+	gd->bd->bi_arch_number = MACH_TYPE_PM9263;
+
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
-	at91_seriald_hw_init();
 #ifdef CONFIG_CMD_NAND
 	pm9263_nand_hw_init();
 #endif
include/configs/pm9263.h +1 -0
index 374be27..32c5962 100644
@@ -172,6 +172,7 @@
 
 #undef CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_USER_LOWLEVEL_INIT	1
+#define CONFIG_BOARD_EARLY_INIT_F
 
 /*
  * Hardware drivers
Signature · 1 line
1.7.4.4
#3 lore raw

PATCH v2 1/1 pm9263: init serial console before relocation

Quoted 10 lines · On Fri, 9 Dec 2011 22:56:55 +0200 Asen Chavdarov Dimov <[email protected]>…

The early messages can be seen on the debug console.

Signed-off-by Asen Chavdarov Dimov <[email protected]>

---
Change since v1
- rebased over master

 board/ronetix/pm9263/pm9263.c |   22 ++++++++++++++--------
 include/configs/pm9263.h      |    1 +
 2 files changed, 15 insertions(+), 8 deletions(-)

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

Anatolij