diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-03-14 17:32:59 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-14 17:34:57 +0100 |
commit | 15bc1fe67f66644c8093cc2d3304217d1c7de797 (patch) | |
tree | bf7cce158e34650f8563d2f35f2ec70cafe58e78 /arch/arm/mach-cns3xxx/include/mach/uncompress.h | |
parent | 29c9b7be7574c486534a79c45982ede00f6a25a9 (diff) | |
download | op-kernel-dev-15bc1fe67f66644c8093cc2d3304217d1c7de797.zip op-kernel-dev-15bc1fe67f66644c8093cc2d3304217d1c7de797.tar.gz |
ARM: cns3xxx: enable multiplatform support
This moves the cns3xxx configuration option inside of ARCH_MULTIPLATFORM,
since there is no reason for not doing it now. We can then also remove
the three header files that become obsolete.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-cns3xxx/include/mach/uncompress.h')
-rw-r--r-- | arch/arm/mach-cns3xxx/include/mach/uncompress.h | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/arch/arm/mach-cns3xxx/include/mach/uncompress.h b/arch/arm/mach-cns3xxx/include/mach/uncompress.h deleted file mode 100644 index e2c642c1c..0000000 --- a/arch/arm/mach-cns3xxx/include/mach/uncompress.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2003 ARM Limited - * Copyright 2008 Cavium Networks - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, Version 2, as - * published by the Free Software Foundation. - */ - -#include <asm/mach-types.h> -#include "cns3xxx.h" - -#define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00)) -#define AMBA_UART_LCRH(base) (*(volatile unsigned char *)((base) + 0x2c)) -#define AMBA_UART_CR(base) (*(volatile unsigned char *)((base) + 0x30)) -#define AMBA_UART_FR(base) (*(volatile unsigned char *)((base) + 0x18)) - -/* - * Return the UART base address - */ -static inline unsigned long get_uart_base(void) -{ - if (machine_is_cns3420vb()) - return CNS3XXX_UART0_BASE; - else - return 0; -} - -/* - * This does not append a newline - */ -static inline void putc(int c) -{ - unsigned long base = get_uart_base(); - - while (AMBA_UART_FR(base) & (1 << 5)) - barrier(); - - AMBA_UART_DR(base) = c; -} - -static inline void flush(void) -{ - unsigned long base = get_uart_base(); - - while (AMBA_UART_FR(base) & (1 << 3)) - barrier(); -} - -/* - * nothing to do - */ -#define arch_decomp_setup() |