Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a29da136 authored by Rob Herring's avatar Rob Herring Committed by Arnd Bergmann
Browse files

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: default avatarRob Herring <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent a7096789

arch/arm/Kconfig

+2 −20
Original line number Diff line number Diff line
@@ -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"

arch/arm/configs/versatile_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-versatile/Kconfig

0 → 100644
+16 −0
Original line number Diff line number Diff line 
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.

arch/arm/mach-versatile/Makefile.boot

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
   zreladdr-y	+= 0x00008000

params_phys-y	:= 0x00000100

initrd_phys-y	:= 0x00800000

arch/arm/mach-versatile/include/mach/uncompress.h

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
/*

 *  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()