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

Commit 61727630 authored by Rob Herring's avatar Rob Herring
Browse files

ARM: vexpress: convert to multi-platform 



Convert vexpress to multi-platform. This always enables vexpress DT and
makes it the default v7 platform.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
parent 387798b3

arch/arm/Kconfig

+1 −18
Original line number Diff line number Diff line
@@ -319,24 +319,6 @@ config ARCH_VERSATILE 
	help

	  This enables support for ARM Ltd Versatile board.



config ARCH_VEXPRESS

	bool "ARM Ltd. Versatile Express family"

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_AMBA

	select ARM_TIMER_SP804

	select CLKDEV_LOOKUP

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select HAVE_PATA_PLATFORM

	select ICST

	select NO_IOPORT

	select PLAT_VERSATILE

	select PLAT_VERSATILE_CLCD

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	help

	  This enables support for the ARM Ltd Versatile Express boards.



config ARCH_AT91

	bool "Atmel AT91"

	select ARCH_REQUIRE_GPIOLIB
@@ -1016,6 +998,7 @@ config ARCH_MULTI_V6 
config ARCH_MULTI_V7

	bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)"

	select CPU_V7

	select ARCH_VEXPRESS

	default y

	select ARCH_MULTI_V6_V7

arch/arm/mach-vexpress/Kconfig

+32 −32
Original line number Diff line number Diff line 
menu "Versatile Express platform type"

	depends on ARCH_VEXPRESS



config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA

	bool "Enable A5 and A9 only errata work-arounds"

	default y

	select ARM_ERRATA_720789

	select ARM_ERRATA_751472

	select PL310_ERRATA_753970 if CACHE_PL310

	help

	  Provides common dependencies for Versatile Express platforms

	  based on Cortex-A5 and Cortex-A9 processors. In order to

	  build a working kernel, you must also enable relevant core

	  tile support or Flattened Device Tree based support options.



config ARCH_VEXPRESS_CA9X4

	bool "Versatile Express Cortex-A9x4 tile"

	select ARM_GIC

	select CPU_V7

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0



config ARCH_VEXPRESS_DT

	bool "Device Tree support for Versatile Express platforms"

config ARCH_VEXPRESS

	bool "ARM Ltd. Versatile Express family" if ARCH_MULTI_V7

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_AMBA

	select ARM_GIC

	select ARM_PATCH_PHYS_VIRT

	select AUTO_ZRELADDR

	select ARM_TIMER_SP804

	select CLKDEV_LOOKUP

	select COMMON_CLK

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select HAVE_PATA_PLATFORM

	select HAVE_SMP

	select ICST

	select MIGHT_HAVE_CACHE_L2X0

	select USE_OF

	select NO_IOPORT

	select PLAT_VERSATILE

	select PLAT_VERSATILE_CLCD

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	help

	  New Versatile Express platforms require Flattened Device Tree to

	  be passed to the kernel.



	  This option enables support for systems using Cortex processor based

	  ARM core and logic (FPGA) tiles on the Versatile Express motherboard,

	  for example:
@@ -48,7 +33,22 @@ config ARCH_VEXPRESS_DT 
	  platforms. The traditional (ATAGs) boot method is not usable on

	  these boards with this option.



	  If your bootloader supports Flattened Device Tree based booting,

	  say Y here.

menu "Versatile Express platform type"

	depends on ARCH_VEXPRESS



config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA

	bool "Enable A5 and A9 only errata work-arounds"

	default y

	select ARM_ERRATA_720789

	select ARM_ERRATA_751472

	select PL310_ERRATA_753970 if CACHE_PL310

	help

	  Provides common dependencies for Versatile Express platforms

	  based on Cortex-A5 and Cortex-A9 processors. In order to

	  build a working kernel, you must also enable relevant core

	  tile support or Flattened Device Tree based support options.



config ARCH_VEXPRESS_CA9X4

	bool "Versatile Express Cortex-A9x4 tile"



endmenu

arch/arm/mach-vexpress/Makefile

+2 −0
Original line number Diff line number Diff line 
#

# Makefile for the linux kernel.

#

ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \

	-I$(srctree)/arch/arm/plat-versatile/include



obj-y					:= v2m.o

obj-$(CONFIG_ARCH_VEXPRESS_CA9X4)	+= ct-ca9x4.o

arch/arm/mach-vexpress/Makefile.boot

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
# Those numbers are used only by the non-DT V2P-CA9 platform

# The DT-enabled ones require CONFIG_AUTO_ZRELADDR=y

   zreladdr-y	+= 0x60008000

params_phys-y	:= 0x60000100

initrd_phys-y	:= 0x60800000

arch/arm/mach-vexpress/include/mach/timex.h

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

 *  arch/arm/mach-vexpress/include/mach/timex.h

 *

 *  RealView architecture timex specifications

 *

 *  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 CLOCK_TICK_RATE		(50000000 / 16)