diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2008-10-11 21:52:17 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-01-28 13:26:15 -0500 |
| commit | 7633903bff432ec7b27905dce7396958553f2be6 (patch) | |
| tree | fb60bb8385e615bcc2ab0d528d4476e1f73f7edc | |
| parent | 36ea8e9ad1107af12d244bba8c73e85b9f655e45 (diff) | |
| download | u-boot-7633903bff432ec7b27905dce7396958553f2be6.tar.gz u-boot-7633903bff432ec7b27905dce7396958553f2be6.tar.bz2 u-boot-7633903bff432ec7b27905dce7396958553f2be6.zip | |
Blackfin: allow serial console to be disabled
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>
| -rw-r--r-- | cpu/blackfin/serial.c | 4 | ||||
| -rw-r--r-- | cpu/blackfin/serial.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/cpu/blackfin/serial.c b/cpu/blackfin/serial.c index 0d6f377c05..42534bd9b9 100644 --- a/cpu/blackfin/serial.c +++ b/cpu/blackfin/serial.c @@ -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 diff --git a/cpu/blackfin/serial.h b/cpu/blackfin/serial.h index 90fceecb8e..f671096768 100644 --- a/cpu/blackfin/serial.h +++ b/cpu/blackfin/serial.h @@ -14,6 +14,10 @@ #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 |