summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsen Dimov <dimov@ronetix.at>2011-12-09 10:56:55 +0000
committerAnatolij Gustschin <agust@denx.de>2011-12-12 10:28:30 +0100
commit52b2601696638dcc7b1041fac587605691ec5d82 (patch)
tree3b9f082c63786d30c0c27d2b3c4b54eccdbf5f17
parentd798a9b5d50527713adc6309206a8d9f287593fb (diff)
downloadtalos-obmc-uboot-52b2601696638dcc7b1041fac587605691ec5d82.tar.gz
talos-obmc-uboot-52b2601696638dcc7b1041fac587605691ec5d82.zip
pm9263: init serial console before relocation
The early messages can be seen on the debug console. Signed-off-by: Asen Chavdarov Dimov <dimov@ronetix.at>
-rw-r--r--board/ronetix/pm9263/pm9263.c22
-rw-r--r--include/configs/pm9263.h1
2 files changed, 15 insertions, 8 deletions
diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c
index 59cca87a9b..1266114aee 100644
--- a/board/ronetix/pm9263/pm9263.c
+++ b/board/ronetix/pm9263/pm9263.c
@@ -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
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 374be27396..32c596241a 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -172,6 +172,7 @@
#undef CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_USER_LOWLEVEL_INIT 1
+#define CONFIG_BOARD_EARLY_INIT_F
/*
* Hardware drivers
OpenPOWER on IntegriCloud