diff options
| author | Sonic Zhang <sonic.zhang@analog.com> | 2013-03-13 19:06:16 +0800 |
|---|---|---|
| committer | Sonic Zhang <sonic.zhang@analog.com> | 2013-05-13 16:26:27 +0800 |
| commit | 50aadcc560560f7365bb6373d4db1375522c4fe3 (patch) | |
| tree | b0e04751dcaaeb59e03d00229a0cd7052a595e41 /arch/blackfin/cpu/serial.h | |
| parent | d4d4f903773e0e5540baa00157585de25a542ba6 (diff) | |
| download | u-boot-imx-50aadcc560560f7365bb6373d4db1375522c4fe3.zip u-boot-imx-50aadcc560560f7365bb6373d4db1375522c4fe3.tar.gz u-boot-imx-50aadcc560560f7365bb6373d4db1375522c4fe3.tar.bz2 | |
blackfin: Enable early print via the generic serial API.
Remove blackfin specific implementation of the generic serial API when
early print macro is defined.
In BFIN_BOOT_BYPASS mode, don't call generic serial_puts, because
early print in bypass mode is running before code binary is relocated
to the link address.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Diffstat (limited to 'arch/blackfin/cpu/serial.h')
| -rw-r--r-- | arch/blackfin/cpu/serial.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/blackfin/cpu/serial.h b/arch/blackfin/cpu/serial.h index d67fd81..87a337d 100644 --- a/arch/blackfin/cpu/serial.h +++ b/arch/blackfin/cpu/serial.h @@ -78,16 +78,16 @@ static inline void serial_early_puts(const char *s) #else .macro serial_early_init -#if defined(CONFIG_DEBUG_EARLY_SERIAL) && defined(BFIN_BOOT_BYPASS) - call _serial_initialize; +#if defined(CONFIG_DEBUG_EARLY_SERIAL) && !defined(CONFIG_UART_MEM) + call __serial_early_init; #endif .endm .macro serial_early_set_baud -#if defined(CONFIG_DEBUG_EARLY_SERIAL) && defined(BFIN_BOOT_BYPASS) +#if defined(CONFIG_DEBUG_EARLY_SERIAL) && !defined(CONFIG_UART_MEM) R0.L = LO(CONFIG_BAUDRATE); R0.H = HI(CONFIG_BAUDRATE); - call _serial_set_baud; + call __serial_early_set_baud; #endif .endm @@ -121,7 +121,7 @@ static inline void serial_early_puts(const char *s) R0.L = 7b; \ R0.H = 7b; \ update_serial_early_string_addr \ - call _serial_puts; + call _uart_early_puts; #else # define serial_early_puts(str) #endif |