summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-13 00:02:54 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:51 -0700
commit41651cab97143e3385057279a2633e2812f328ba (patch)
tree0d41209b414afe9563bd7a891096a3a97b529fb6 /common
parent425101e115946f29287c51b2ea2c3527978645aa (diff)
downloadu-boot-imx-41651cab97143e3385057279a2633e2812f328ba.zip
u-boot-imx-41651cab97143e3385057279a2633e2812f328ba.tar.gz
u-boot-imx-41651cab97143e3385057279a2633e2812f328ba.tar.bz2
serial: bfin: Flip the jtag serial console to CONFIG_SERIAL_MULTI
Rework the emulation of serial console via JTAG from simple ad-hoc implementation of serial port routines to CONFIG_SERIAL_MULTI and enable CONFIG_SERIAL_MULTI unconditionally for blackfin. In order for the JTAG serial console to take precedence over all other serial ports available in system, implement override for default_serial_console call returning this JTAG serial console. This brings in a bit of a growth of size, but eventually will allow us to unconditionally enable CONFIG_SERIAL_MULTI throughout the whole U-Boot and maintain only one serial subsystem. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Tom Rini <trini@ti.com> Cc: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'common')
-rw-r--r--common/serial.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/serial.c b/common/serial.c
index 545f9e7..dca2dc9 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -47,6 +47,7 @@ serial_initfunc(s3c24xx_serial_initialize);
serial_initfunc(s5p_serial_initialize);
serial_initfunc(zynq_serial_initalize);
serial_initfunc(bfin_serial_initialize);
+serial_initfunc(bfin_jtag_initialize);
serial_initfunc(mpc512x_serial_initialize);
serial_initfunc(uartlite_serial_initialize);
@@ -74,6 +75,7 @@ void serial_initialize(void)
s5p_serial_initialize();
mpc512x_serial_initialize();
bfin_serial_initialize();
+ bfin_jtag_initialize();
uartlite_serial_initialize();
zynq_serial_initalize();
serial_assign(default_serial_console()->name);