summaryrefslogtreecommitdiff
path: root/arch/blackfin/lib/board.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-08-02 21:46:53 +0200
committerWolfgang Denk <wd@denx.de>2011-08-02 21:46:53 +0200
commit1902692aa0b2dcbb9351172be03c57d1e82447e4 (patch)
treef6250202aaa6e98a7beaa08841a55b9e2d54d670 /arch/blackfin/lib/board.c
parentcc4e6d25561b1aaa8501fa6017a0d17fd4f92ed6 (diff)
parentd8940a654435dfa48013229edf53bd3e353e97c1 (diff)
downloadu-boot-imx-1902692aa0b2dcbb9351172be03c57d1e82447e4.zip
u-boot-imx-1902692aa0b2dcbb9351172be03c57d1e82447e4.tar.gz
u-boot-imx-1902692aa0b2dcbb9351172be03c57d1e82447e4.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
* 'master' of git://git.denx.de/u-boot-blackfin: Blackfin: jtag-console: fix timer usage Blackfin: switch to common display_options() Blackfin: serial: move early debug strings into .rodata section Blackfin: adi boards: also set stderr to nc with helper Blackfin: update anomaly lists to latest public info Blackfin: serial: convert to bfin_{read,write} helpers Blackfin: split out async setup Blackfin: adi boards: enable pretty flash progress output Blackfin: drop unused dma.h header from start code Blackfin: portmux: allow header to be included in assembly files Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: enable mmc_spi support Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update network settings Blackfin: sync MMR read/write helpers with Linux Blackfin: gpio: optimize free path a little Blackfin: post: setup default CONFIG_SYS_POST_WORD_ADDR Blackfin: uart: fix printf warning Blackfin: add init.elf helper code Blackfin: dont reset SWRST on newer bf526 parts Blackfin: adi boards: enable multi serial support by default Blackfin: uart: add multiple serial support Blackfin: uart: move debug buffers into local bss
Diffstat (limited to 'arch/blackfin/lib/board.c')
-rw-r--r--arch/blackfin/lib/board.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c
index 7c33893..bfdb586 100644
--- a/arch/blackfin/lib/board.c
+++ b/arch/blackfin/lib/board.c
@@ -12,6 +12,7 @@
#include <common.h>
#include <command.h>
#include <stdio_dev.h>
+#include <serial.h>
#include <environment.h>
#include <malloc.h>
#include <mmc.h>
@@ -49,7 +50,7 @@ static inline void serial_early_puts(const char *s)
static int display_banner(void)
{
- printf("\n\n%s\n\n", version_string);
+ display_options();
printf("CPU: ADSP %s "
"(Detected Rev: 0.%d) "
"(%s boot)\n",
@@ -262,6 +263,9 @@ void board_init_f(ulong bootflag)
init_baudrate();
serial_early_puts("Serial init\n");
serial_init();
+#ifdef CONFIG_SERIAL_MULTI
+ serial_initialize();
+#endif
serial_early_puts("Console init flash\n");
console_init_f();
serial_early_puts("End of early debugging\n");