ARM: integrator: make the Integrator multiplatform

This converts the ARM Integrator reference designs to be fully
multiplatform. V4T, V5 and V6 multiplatform builds become
possible after this patch.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

2 files changed, 18 insertions, 48 deletions

diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index c455e974bbfe..aa7eb272e602 100644
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -1,3 +1,21 @@
+config ARCH_INTEGRATOR
+        bool "ARM Ltd. Integrator family" if (ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6)
+        select ARM_AMBA
+        select ARM_PATCH_PHYS_VIRT if MMU
+        select AUTO_ZRELADDR
+        select COMMON_CLK
+        select COMMON_CLK_VERSATILE
+        select GENERIC_CLOCKEVENTS
+        select HAVE_TCM
+        select ICST
+        select MULTI_IRQ_HANDLER
+        select PLAT_VERSATILE
+        select SPARSE_IRQ
+        select USE_OF
+        select VERSATILE_FPGA_IRQ
+        help
+          Support for ARM's Integrator platform.
+
 if ARCH_INTEGRATOR
 
 menu "Integrator Options"
diff --git a/arch/arm/mach-integrator/include/mach/uncompress.h b/arch/arm/mach-integrator/include/mach/uncompress.h
deleted file mode 100644
index 8f3cc9954c16..000000000000
--- a/arch/arm/mach-integrator/include/mach/uncompress.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  arch/arm/mach-integrator/include/mach/uncompress.h
- *
- *  Copyright (C) 1999 ARM Limited
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#define AMBA_UART_DR    (*(volatile unsigned char *)0x16000000)
-#define AMBA_UART_LCRH  (*(volatile unsigned char *)0x16000008)
-#define AMBA_UART_LCRM  (*(volatile unsigned char *)0x1600000c)
-#define AMBA_UART_LCRL  (*(volatile unsigned char *)0x16000010)
-#define AMBA_UART_CR    (*(volatile unsigned char *)0x16000014)
-#define AMBA_UART_FR    (*(volatile unsigned char *)0x16000018)
-
-/*
- * This does not append a newline
- */
-static void putc(int c)
-{
-        while (AMBA_UART_FR & (1 << 5))
-                barrier();
-
-        AMBA_UART_DR = c;
-}
-
-static inline void flush(void)
-{
-        while (AMBA_UART_FR & (1 << 3))
-                barrier();
-}
-
-/*
- * nothing to do
- */
-#define arch_decomp_setup()