[U-Boot] [PATCH] pm9261: init serial console before relocation
The early messages can be seen on the debug console.
Signed-off-by: Asen Chavdarov Dimov dimov@ronetix.at --- board/ronetix/pm9261/pm9261.c | 14 +++++++++----- include/configs/pm9261.h | 1 + 2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c index 871b94a..e36391b 100644 --- a/board/ronetix/pm9261/pm9261.c +++ b/board/ronetix/pm9261/pm9261.c @@ -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 diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 3a8b095..1d7abe7 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -158,6 +158,7 @@ #define CONFIG_INITRD_TAG 1
#undef CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_BOARD_EARLY_INIT_F
/* * Hardware drivers
The early messages can be seen on the debug console.
Signed-off-by: Asen Chavdarov Dimov dimov@ronetix.at --- board/ronetix/pm9g45/pm9g45.c | 14 +++++++++----- include/configs/pm9g45.h | 1 + 2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c index f3374a4..08617ce 100644 --- a/board/ronetix/pm9g45/pm9g45.c +++ b/board/ronetix/pm9g45/pm9g45.c @@ -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 diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 672f663..e38fe93 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -54,6 +54,7 @@ #define CONFIG_INITRD_TAG 1
#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_BOARD_EARLY_INIT_F
/* * Hardware drivers
On Thu, 15 Sep 2011 20:19:47 +0300 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
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
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/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 d29d076..b5a11f2 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 5b08d91..eec9153 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
On Fri, 9 Dec 2011 23:00: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/pm9g45/pm9g45.c | 16 +++++++++++----- include/configs/pm9g45.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-)
Applied to u-boot-staging/agust@denx.de. Thanks!
Anatolij
On Thu, 15 Sep 2011 20:19:46 +0300 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
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
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(-)
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
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
participants (2)
-
Anatolij Gustschin -
Asen Chavdarov Dimov