leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

davinci: support different UART bases for zImage uncompress

Browse Source 
The davinci pre-kernel boot code assumes that all platforms use the
same UART base address for the console.  That assumption is not longer
valid with some newer SoCs so determine the console UART base address
from the machine number passed in from bootloader.

Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
This commit is contained in:
Mark A. Greer 2009-02-18 14:00:36 -07:00 committed by Kevin Hilman
parent ce8ccaf0ef
commit 27428e39da
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm/mach-davinci/include/mach/uncompress.h
View File

@ -13,11 +13,24 @@
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
#include <mach/serial.h> #include <mach/serial.h>
#include <asm/mach-types.h>
extern unsigned int __machine_arch_type;
static u32 *uart;
static u32 *get_uart_base(void)
{
/* Add logic here for new platforms, using __macine_arch_type */
return (u32 *)DAVINCI_UART0_BASE;
}
/* PORT_16C550A, in polled non-fifo mode */ /* PORT_16C550A, in polled non-fifo mode */
static void putc(char c) static void putc(char c)
{ {
volatile u32 *uart = (volatile void *) DAVINCI_UART0_BASE; if (!uart)
uart = get_uart_base();
while (!(uart[UART_LSR] & UART_LSR_THRE)) while (!(uart[UART_LSR] & UART_LSR_THRE))
barrier(); barrier();
@ -26,7 +39,9 @@ static void putc(char c)
static inline void flush(void) static inline void flush(void)
{ {
volatile u32 *uart = (volatile void *) DAVINCI_UART0_BASE; if (!uart)
uart = get_uart_base();
while (!(uart[UART_LSR] & UART_LSR_THRE)) while (!(uart[UART_LSR] & UART_LSR_THRE))
barrier(); barrier();
} }