diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:23:44 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:23:44 +0100 |
| commit | 94314a40bcc537c396012e37cf887572f0d82aef (patch) | |
| tree | 489b42e181317730713f8800ac2889039b0faae3 /arch/arm/mach-davinci/include/mach/uncompress.h | |
| parent | 929f58aeeb46f964d9468ce1addd993f5d92b11d (diff) | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
| download | blackbird-op-linux-94314a40bcc537c396012e37cf887572f0d82aef.tar.gz blackbird-op-linux-94314a40bcc537c396012e37cf887572f0d82aef.zip | |
Merge branch 'dt/gic' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-davinci/include/mach/uncompress.h')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/uncompress.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/include/mach/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h index 78d80683cdc2..9dc7cf9664fe 100644 --- a/arch/arm/mach-davinci/include/mach/uncompress.h +++ b/arch/arm/mach-davinci/include/mach/uncompress.h @@ -43,7 +43,12 @@ static inline void flush(void) static inline void set_uart_info(u32 phys, void * __iomem virt) { - u32 *uart_info = (u32 *)(DAVINCI_UART_INFO); + /* + * Get address of some.bss variable and round it down + * a la CONFIG_AUTO_ZRELADDR. + */ + u32 ram_start = (u32)&uart & 0xf8000000; + u32 *uart_info = (u32 *)(ram_start + DAVINCI_UART_INFO_OFS); uart = (u32 *)phys; uart_info[0] = phys; |
