From a29da136de345f074d0c64f1c3b38eef30116b32 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 8 Dec 2015 14:44:18 -0600 Subject: [PATCH] ARM: versatile: convert to multi-platform Now that all the prerequisites are in place, we can enable Versatile boards for multi-platform kernels. Signed-off-by: Rob Herring Cc: Russell King Cc: Linus Walleij Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 22 +-------- arch/arm/configs/versatile_defconfig | 2 +- arch/arm/mach-versatile/Kconfig | 16 +++++++ arch/arm/mach-versatile/Makefile.boot | 4 -- .../mach-versatile/include/mach/uncompress.h | 45 ------------------- 5 files changed, 19 insertions(+), 70 deletions(-) create mode 100644 arch/arm/mach-versatile/Kconfig delete mode 100644 arch/arm/mach-versatile/Makefile.boot delete mode 100644 arch/arm/mach-versatile/include/mach/uncompress.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 34e2162213cb..99414545fe23 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -362,26 +362,6 @@ config ARCH_REALVIEW help This enables support for ARM Ltd RealView boards. -config ARCH_VERSATILE - bool "ARM Ltd. Versatile family" - select ARCH_WANT_OPTIONAL_GPIOLIB - select ARM_AMBA - select ARM_TIMER_SP804 - select ARM_VIC - select CLKSRC_VERSATILE - select COMMON_CLK - select COMMON_CLK_VERSATILE - select CPU_ARM926T - select GENERIC_CLOCKEVENTS - select ICST - select PLAT_VERSATILE - select MIGHT_HAVE_PCI - select SPARSE_IRQ - select USE_OF - select VERSATILE_FPGA_IRQ - help - This enables support for ARM Ltd Versatile board. - config ARCH_CLPS711X bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" select ARCH_REQUIRE_GPIOLIB @@ -929,6 +909,8 @@ source "arch/arm/mach-uniphier/Kconfig" source "arch/arm/mach-ux500/Kconfig" +source "arch/arm/mach-versatile/Kconfig" + source "arch/arm/mach-vexpress/Kconfig" source "arch/arm/plat-versatile/Kconfig" diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig index ea49d37564da..01f402ddb1e7 100644 --- a/arch/arm/configs/versatile_defconfig +++ b/arch/arm/configs/versatile_defconfig @@ -6,8 +6,8 @@ CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y +# CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_VERSATILE=y -CONFIG_MACH_VERSATILE_AB=y CONFIG_AEABI=y CONFIG_OABI_COMPAT=y CONFIG_ZBOOT_ROM_TEXT=0x0 diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig new file mode 100644 index 000000000000..e40f777ccf7d --- /dev/null +++ b/arch/arm/mach-versatile/Kconfig @@ -0,0 +1,16 @@ +config ARCH_VERSATILE + bool "ARM Ltd. Versatile family" + depends on ARCH_MULTI_V5 + select ARM_AMBA + select ARM_TIMER_SP804 + select ARM_VIC + select CLKSRC_VERSATILE + select COMMON_CLK_VERSATILE + select CPU_ARM926T + select ICST + select MIGHT_HAVE_PCI + select PLAT_VERSATILE + select VERSATILE_FPGA_IRQ + help + This enables support for ARM Ltd Versatile board. + diff --git a/arch/arm/mach-versatile/Makefile.boot b/arch/arm/mach-versatile/Makefile.boot deleted file mode 100644 index ff0a4b5b0a82..000000000000 --- a/arch/arm/mach-versatile/Makefile.boot +++ /dev/null @@ -1,4 +0,0 @@ - zreladdr-y += 0x00008000 -params_phys-y := 0x00000100 -initrd_phys-y := 0x00800000 - diff --git a/arch/arm/mach-versatile/include/mach/uncompress.h b/arch/arm/mach-versatile/include/mach/uncompress.h deleted file mode 100644 index 986e3d303f3c..000000000000 --- a/arch/arm/mach-versatile/include/mach/uncompress.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * arch/arm/mach-versatile/include/mach/uncompress.h - * - * Copyright (C) 2003 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 *)0x101F1000) -#define AMBA_UART_LCRH (*(volatile unsigned char *)0x101F102C) -#define AMBA_UART_CR (*(volatile unsigned char *)0x101F1030) -#define AMBA_UART_FR (*(volatile unsigned char *)0x101F1018) - -/* - * This does not append a newline - */ -static inline 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() -- 2.39.5