diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-09-04 23:21:12 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-09-04 23:21:12 +0200 |
commit | 6342fa00b20fa01e93c8c6886376ea27ee9a7a73 (patch) | |
tree | 176dd71f8a1c8d285c488659944961993dc2aff3 /board/taskit | |
parent | e62b008fe341030f4a80a09b66952bba65027b70 (diff) | |
parent | 7d899c14cc1842004e5f94a376082e7b6cf5988d (diff) | |
download | u-boot-imx-6342fa00b20fa01e93c8c6886376ea27ee9a7a73.zip u-boot-imx-6342fa00b20fa01e93c8c6886376ea27ee9a7a73.tar.gz u-boot-imx-6342fa00b20fa01e93c8c6886376ea27ee9a7a73.tar.bz2 |
Merge remote-tracking branch 'u-boot-atmel/master' into m
Diffstat (limited to 'board/taskit')
-rw-r--r-- | board/taskit/stamp9g20/stamp9g20.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/board/taskit/stamp9g20/stamp9g20.c b/board/taskit/stamp9g20/stamp9g20.c index 5e07bf8..06df0af 100644 --- a/board/taskit/stamp9g20/stamp9g20.c +++ b/board/taskit/stamp9g20/stamp9g20.c @@ -159,15 +159,28 @@ int board_early_init_f(void) return 0; } -int board_init(void) +int board_postclk_init(void) { - /* Adress of boot parameters */ - gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; + /* + * Initialize the serial interface here, because be need a running + * timer to set PC9 to high and wait for some time to enable the + * level converter of the RS232 interface on the PortuxG20 board. + */ - /* Enable the serial interface */ +#ifdef CONFIG_PORTUXG20 at91_set_gpio_output(AT91_PIN_PC9, 1); + mdelay(1); +#endif at91_seriald_hw_init(); + return 0; +} + +int board_init(void) +{ + /* Adress of boot parameters */ + gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; + stamp9G20_nand_hw_init(); #ifdef CONFIG_MACB stamp9G20_macb_hw_init(); |