pm9261: init serial console before relocation

PATCH New Asen Chavdarov Dimov 2 participants 8 messages Sep 15, 2011 – Dec 12, 2011

lore

Share & tools

lore

Asen Chavdarov Dimov

author

2011-09-15 17:19 UTC #0 lore raw

PATCH 1/1 pm9261: 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/pm9261/pm9261.c |   14 +++++++++-----
 include/configs/pm9261.h      |    1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

board/ronetix/pm9261/pm9261.c +9 -5

index 871b94a..e36391b 100644
@@ -237,24 +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

include/configs/pm9261.h +1 -0

index 3a8b095..1d7abe7 100644
@@ -158,6 +158,7 @@
 #define CONFIG_INITRD_TAG	1
 
 #undef CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_BOARD_EARLY_INIT_F
 
 /*
  * Hardware drivers

Signature · 1 line

1.7.4.4

Asen Chavdarov Dimov

author

2011-09-15 17:19 UTC #1 lore raw

PATCH 1/1 pm9g45: 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/pm9g45/pm9g45.c |   14 +++++++++-----
 include/configs/pm9g45.h      |    1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

board/ronetix/pm9g45/pm9g45.c +9 -5

index f3374a4..08617ce 100644
@@ -127,24 +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

include/configs/pm9g45.h +1 -0

index 672f663..e38fe93 100644
@@ -54,6 +54,7 @@
 #define CONFIG_INITRD_TAG	1
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_BOARD_EARLY_INIT_F
 
 /*
  * Hardware drivers

Signature · 1 line

1.7.4.4

Anatolij Gustschin

2011-12-06 22:06 UTC #2 lore raw

PATCH 1/1 pm9g45: init serial console before relocation

Quoted 7 lines · On Thu, 15 Sep 2011 20:19:47 +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/pm9g45/pm9g45.c |   14 +++++++++-----
 include/configs/pm9g45.h      |    1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

This patch needs rebasing. Please resubmit. Thanks!

Anatolij

Asen Chavdarov Dimov

author

2011-12-09 21:00 UTC #3 lore raw

PATCH v2 1/1 pm9g45: 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/pm9g45/pm9g45.c |   16 +++++++++++-----
 include/configs/pm9g45.h      |    1 +
 2 files changed, 12 insertions(+), 5 deletions(-)

board/ronetix/pm9g45/pm9g45.c +11 -5

index d29d076..b5a11f2 100644
@@ -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

include/configs/pm9g45.h +1 -0

index 5b08d91..eec9153 100644
@@ -57,6 +57,7 @@
 #define CONFIG_INITRD_TAG	1
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_BOARD_EARLY_INIT_F
 
 /*
  * Hardware drivers

Signature · 1 line

1.7.4.4

Anatolij Gustschin

2011-12-12 09:45 UTC #4 lore raw

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

Quoted 10 lines · On Fri, 9 Dec 2011 23:00:07 +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/pm9g45/pm9g45.c |   16 +++++++++++-----
 include/configs/pm9g45.h      |    1 +
 2 files changed, 12 insertions(+), 5 deletions(-)

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

Anatolij

Anatolij Gustschin

2011-12-06 22:06 UTC #5 lore raw

PATCH 1/1 pm9261: init serial console before relocation

In reply to Asen Chavdarov Dimov

Quoted 7 lines · On Thu, 15 Sep 2011 20:19:46 +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/pm9261/pm9261.c |   14 +++++++++-----
 include/configs/pm9261.h      |    1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

This patch needs rebasing, too. Please resubmit. Thanks!

Anatolij

Asen Chavdarov Dimov

author

2011-12-09 20:59 UTC #6 lore raw

PATCH v2 1/1 pm9261: 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/pm9261/pm9261.c |   17 ++++++++++++-----
 include/configs/pm9261.h      |    1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

board/ronetix/pm9261/pm9261.c +12 -5

index c6b582d..79a3216 100644
@@ -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

include/configs/pm9261.h +1 -0

index 9fbf9af..1e80316 100644
@@ -161,6 +161,7 @@
 #define CONFIG_INITRD_TAG	1
 
 #undef CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_BOARD_EARLY_INIT_F
 
 /*
  * Hardware drivers

Signature · 1 line

1.7.4.4

Anatolij Gustschin

2011-12-12 09:44 UTC #7 lore raw

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

Quoted 10 lines · On Fri, 9 Dec 2011 22:59:07 +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/pm9261/pm9261.c |   17 ++++++++++++-----
 include/configs/pm9261.h      |    1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

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

Anatolij