]> git.sur5r.net Git - u-boot/commitdiff
Blackfin: allow serial console to be disabled
authorMike Frysinger <vapier@gentoo.org>
Sun, 12 Oct 2008 01:52:17 +0000 (21:52 -0400)
committerMike Frysinger <vapier@gentoo.org>
Wed, 28 Jan 2009 18:26:15 +0000 (13:26 -0500)
Some devices have no UART device pulled out, so allow people to disable the
driver completely in favor of other methods (like JTAG-console).

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
cpu/blackfin/serial.c
cpu/blackfin/serial.h

index 0d6f377c058328ca8e875a5a3ee406a1c380c680..42534bd9b9c575a8f49d2ef22ebf297bf9317a01 100644 (file)
@@ -29,6 +29,8 @@
 #include <asm/blackfin.h>
 #include <asm/mach-common/bits/uart.h>
 
+#ifdef CONFIG_UART_CONSOLE
+
 #if defined(UART_LSR) && (CONFIG_UART_CONSOLE != 0)
 # error CONFIG_UART_CONSOLE must be 0 on parts with only one UART
 #endif
@@ -170,3 +172,5 @@ void serial_puts(const char *s)
        while (*s)
                serial_putc(*s++);
 }
+
+#endif
index 90fceecb8e92f15a15079f5f32521f7020afd424..f671096768b6b0bffce7ff5984335bb2b85da4c0 100644 (file)
 #include <asm/blackfin.h>
 #include <asm/mach-common/bits/uart.h>
 
+#ifndef CONFIG_UART_CONSOLE
+# define CONFIG_UART_CONSOLE 0
+#endif
+
 #ifdef CONFIG_DEBUG_EARLY_SERIAL
 # define BFIN_DEBUG_EARLY_SERIAL 1
 #else