Commit 86fff036 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'realview-multiplatform-tag' of... 

Merge tag 'realview-multiplatform-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/multiplatform

Pull "Multiplatform support for the RealView" from Linus Walleij:

Here is the result of my application of the second part of Arnds
patchset, actually enabling multiplatform and getting the RealView
off the ground as a multiplatform target.

It is dependent on an outstanding patch to the irqchips tree bumping
the number of GICs to 2 for the RealView platform. I cannot say I will
be sleepless if these go in side by side: each branch will compile but
will not boot until both trees have been pulled hurting bisectability a
bit.

- Tested on the ARM PB11MPCore
- Tested with boardfile boot
- Tested with DeviceTree boot

* tag 'realview-multiplatform-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: realview: select apropriate targets
  ARM: realview: clean up header files
  ARM: realview: make all header files local
  ARM: no longer make CPU targets visible separately
  ARM: integrator: use explicit core module options
  ARM: realview: enable multiplatform
parents d0b6342d 93b2d7b1

arch/arm/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -345,20 +345,6 @@ config ARM_SINGLE_ARMV7M 
	select SPARSE_IRQ

	select USE_OF



config ARCH_REALVIEW

	bool "ARM Ltd. RealView family"

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_AMBA

	select ARM_TIMER_SP804

	select COMMON_CLK

	select COMMON_CLK_VERSATILE

	select GENERIC_CLOCKEVENTS

	select GPIO_PL061 if GPIOLIB

	select ICST

	select PLAT_VERSATILE

	select PLAT_VERSATILE_SCHED_CLOCK

	help

	  This enables support for ARM Ltd RealView boards.



config ARCH_CLPS711X

	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"

arch/arm/configs/realview-smp_defconfig

+9 −0
Original line number Diff line number Diff line
@@ -8,10 +8,19 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_MULTI_V6=y

CONFIG_ARCH_REALVIEW=y

CONFIG_REALVIEW_DT=y

CONFIG_MACH_REALVIEW_EB=y

CONFIG_REALVIEW_EB_ARM1136=y

CONFIG_REALVIEW_EB_ARM1176=y

CONFIG_REALVIEW_EB_A9MP=y

CONFIG_REALVIEW_EB_ARM11MP=y

CONFIG_REALVIEW_EB_ARM11MP_REVB=y

CONFIG_MACH_REALVIEW_PB11MP=y

CONFIG_MACH_REALVIEW_PB1176=y

CONFIG_MACH_REALVIEW_PBA8=y

CONFIG_MACH_REALVIEW_PBX=y

CONFIG_SMP=y

CONFIG_HOTPLUG_CPU=y

CONFIG_AEABI=y

arch/arm/configs/realview_defconfig

+8 −0
Original line number Diff line number Diff line
@@ -8,11 +8,19 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_MULTI_V6=y

CONFIG_ARCH_REALVIEW=y

CONFIG_REALVIEW_DT=y

CONFIG_MACH_REALVIEW_EB=y

CONFIG_REALVIEW_EB_ARM1136=y

CONFIG_REALVIEW_EB_ARM1176=y

CONFIG_REALVIEW_EB_A9MP=y

CONFIG_REALVIEW_EB_ARM11MP=y

CONFIG_REALVIEW_EB_ARM11MP_REVB=y

CONFIG_MACH_REALVIEW_PB11MP=y

CONFIG_MACH_REALVIEW_PB1176=y

CONFIG_MACH_REALVIEW_PBA8=y

CONFIG_MACH_REALVIEW_PBX=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

arch/arm/mach-integrator/Kconfig

+115 −17
Original line number Diff line number Diff line 
config ARCH_INTEGRATOR

menuconfig 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
@@ -23,8 +23,6 @@ config ARCH_INTEGRATOR 


if ARCH_INTEGRATOR



menu "Integrator Options"



config ARCH_INTEGRATOR_AP

	bool "Support Integrator/AP and Integrator/PP2 platforms"

	select CLKSRC_MMIO
@@ -36,19 +34,6 @@ config ARCH_INTEGRATOR_AP 
	  Include support for the ARM(R) Integrator/AP and

	  Integrator/PP2 platforms.



config ARCH_INTEGRATOR_CP

	bool "Support Integrator/CP platform"

	select ARCH_CINTEGRATOR

	select ARM_TIMER_SP804

	select SERIAL_AMBA_PL011 if TTY

	select SERIAL_AMBA_PL011_CONSOLE if TTY

	select SOC_BUS

	help

	  Include support for the ARM(R) Integrator CP platform.



config ARCH_CINTEGRATOR

	bool



config INTEGRATOR_IMPD1

	bool "Include support for Integrator/IM-PD1"

	depends on ARCH_INTEGRATOR_AP
@@ -63,6 +48,119 @@ config INTEGRATOR_IMPD1 
	  To compile this driver as a module, choose M here: the

	  module will be called impd1.



endmenu

config INTEGRATOR_CM7TDMI

	bool "Integrator/CM7TDMI core module"

	depends on ARCH_INTEGRATOR_AP

	depends on ARCH_MULTI_V4 && !MMU

	select CPU_ARM7TDMI



config INTEGRATOR_CM720T

	bool "Integrator/CM720T core module"

	depends on ARCH_INTEGRATOR_AP

	depends on ARCH_MULTI_V4T

	select CPU_ARM720T



config INTEGRATOR_CM740T

	bool "Integrator/CM740T core module"

	depends on ARCH_INTEGRATOR_AP

	depends on ARCH_MULTI_V4T && !MMU

	select CPU_ARM740T



config INTEGRATOR_CM920T

	bool "Integrator/CM920T core module"

	depends on ARCH_INTEGRATOR_AP

	depends on ARCH_MULTI_V4T

	select CPU_ARM920T



config INTEGRATOR_CM922T_XA10

	bool "Integrator/CM922T-XA10 core module"

	depends on ARCH_MULTI_V4T

	depends on ARCH_INTEGRATOR_AP

	select CPU_ARM922T



config INTEGRATOR_CM926EJS

	bool "Integrator/CM926EJ-S core module"

	depends on ARCH_INTEGRATOR_AP

	depends on ARCH_MULTI_V5

	select CPU_ARM926T



config INTEGRATOR_CM940T

	bool "Integrator/CM940T core module"

	depends on ARCH_INTEGRATOR_AP

	depends on ARCH_MULTI_V4T && !MMU

	select CPU_ARM940T



config INTEGRATOR_CM946ES

	bool "Integrator/CM946E-S core module"

	depends on ARCH_INTEGRATOR_AP

	depends on ARCH_MULTI_V5 && !MMU

	select CPU_ARM946E



config INTEGRATOR_CM966ES

	bool "Integrator/CM966E-S core module"

	depends on ARCH_INTEGRATOR_AP

	depends on BROKEN # no kernel support



config INTEGRATOR_CM10200E_REV0

	bool "Integrator/CM10200E rev.0 core module"

	depends on ARCH_INTEGRATOR_AP && n

	depends on ARCH_MULTI_V5

	select CPU_ARM1020



config INTEGRATOR_CM10200E

	bool "Integrator/CM10200E core module"

	depends on ARCH_INTEGRATOR_AP && n

	depends on ARCH_MULTI_V5

	select CPU_ARM1020E



config INTEGRATOR_CM10220E

	bool "Integrator/CM10220E core module"

	depends on ARCH_INTEGRATOR_AP

	depends on ARCH_MULTI_V5

	select CPU_ARM1022



config INTEGRATOR_CM1026EJS

	bool "Integrator/CM1026EJ-S core module"

	depends on ARCH_INTEGRATOR_AP

	depends on ARCH_MULTI_V5

	select CPU_ARM1026



config INTEGRATOR_CM1136JFS

	bool "Integrator/CM1136JF-S core module"

	depends on ARCH_INTEGRATOR_AP

	depends on ARCH_MULTI_V6

	select CPU_V6



config ARCH_INTEGRATOR_CP

	bool "Support Integrator/CP platform"

	depends on (!MMU || ARCH_MULTI_V5 || ARCH_MULTI_V6)

	select ARM_TIMER_SP804

	select SERIAL_AMBA_PL011 if TTY

	select SERIAL_AMBA_PL011_CONSOLE if TTY

	select SOC_BUS

	help

	  Include support for the ARM(R) Integrator CP platform.



config INTEGRATOR_CT7T

	bool "Integrator/CT7TD (ARM7TDMI) core tile"

	depends on ARCH_INTEGRATOR_CP

	depends on ARCH_MULTI_V4T && !MMU

	select CPU_ARM7TDMI



config INTEGRATOR_CT926

	bool "Integrator/CT926 (ARM926EJ-S) core tile"

	depends on ARCH_INTEGRATOR_CP

	depends on ARCH_MULTI_V5

	select CPU_ARM926T



config INTEGRATOR_CTB36

	bool "Integrator/CTB36 (ARM1136JF-S) core tile"

	depends on ARCH_INTEGRATOR_CP

	depends on ARCH_MULTI_V6

	select CPU_V6



config ARCH_CINTEGRATOR

	depends on ARCH_INTEGRATOR_CP

	def_bool y



endif

arch/arm/mach-realview/Kconfig

+43 −12
Original line number Diff line number Diff line 
menu "RealView platform type"

	depends on ARCH_REALVIEW

menuconfig ARCH_REALVIEW

	bool "ARM Ltd. RealView family" if ARCH_MULTI_V5 || ARCH_MULTI_V6 || ARCH_MULTI_V7

	select ARM_AMBA

	select ARM_TIMER_SP804

	select COMMON_CLK_VERSATILE

	select GPIO_PL061 if GPIOLIB

	select ICST

	select PLAT_VERSATILE

	select PLAT_VERSATILE_SCHED_CLOCK

	help

	  This enables support for ARM Ltd RealView boards.



if ARCH_REALVIEW



config REALVIEW_DT

	bool "Support RealView(R) Device Tree based boot"
@@ -7,6 +18,7 @@ config REALVIEW_DT 
	select CLK_SP810

	select HAVE_SMP

	select ICST

	select MACH_REALVIEW_EB if ARCH_MULTI_V5

	select MFD_SYSCON

	select POWER_RESET

	select POWER_RESET_VERSATILE
@@ -21,14 +33,32 @@ config REALVIEW_DT 
config MACH_REALVIEW_EB

	bool "Support RealView(R) Emulation Baseboard"

	select ARM_GIC

	select CPU_ARM926T if ARCH_MULTI_V5

	help

	  Include support for the ARM(R) RealView(R) Emulation Baseboard

	  platform.

	  platform. On an ARMv5 kernel, this will include support for

	  the ARM926EJ-S core tile, while on an ARMv6/v7 kernel, at least

	  one of the ARM1136, ARM1176, ARM11MPCore or Cortex-A9MPCore

	  core tile options should be enabled.



config REALVIEW_EB_ARM1136

	bool "Support ARM1136J(F)-S Tile"

	depends on MACH_REALVIEW_EB && ARCH_MULTI_V6

	select CPU_V6

	help

	  Enable support for the ARM1136 tile fitted to the

	  Realview(R) Emulation Baseboard platform.



config REALVIEW_EB_ARM1176

	bool "Support ARM1176JZ(F)-S Tile"

	depends on MACH_REALVIEW_EB && ARCH_MULTI_V6

	help

	  Enable support for the ARM1176 tile fitted to the

	  Realview(R) Emulation Baseboard platform.



config REALVIEW_EB_A9MP

	bool "Support Multicore Cortex-A9 Tile"

	depends on MACH_REALVIEW_EB

	select CPU_V7

	depends on MACH_REALVIEW_EB && ARCH_MULTI_V7

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_SMP
@@ -39,8 +69,7 @@ config REALVIEW_EB_A9MP 


config REALVIEW_EB_ARM11MP

	bool "Support ARM11MPCore Tile"

	depends on MACH_REALVIEW_EB

	select CPU_V6K

	depends on MACH_REALVIEW_EB && ARCH_MULTI_V6

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_SMP
@@ -51,7 +80,7 @@ config REALVIEW_EB_ARM11MP 


config REALVIEW_EB_ARM11MP_REVB

	bool "Support ARM11MPCore RevB Tile"

	depends on REALVIEW_EB_ARM11MP

	depends on REALVIEW_EB_ARM11MP && ARCH_MULTI_V6

	help

	  Enable support for the ARM11MPCore Revision B tile on the

	  Realview(R) Emulation Baseboard platform. Since there are device
@@ -60,8 +89,8 @@ config REALVIEW_EB_ARM11MP_REVB 


config MACH_REALVIEW_PB11MP

	bool "Support RealView(R) Platform Baseboard for ARM11MPCore"

	depends on ARCH_MULTI_V6

	select ARM_GIC

	select CPU_V6K

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_PATA_PLATFORM
@@ -75,6 +104,7 @@ config MACH_REALVIEW_PB11MP 
# ARMv6 CPU without K extensions, but does have the new exclusive ops

config MACH_REALVIEW_PB1176

	bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S"

	depends on ARCH_MULTI_V6

	select ARM_GIC

	select CPU_V6

	select HAVE_TCM
@@ -94,8 +124,8 @@ config REALVIEW_PB1176_SECURE_FLASH 


config MACH_REALVIEW_PBA8

	bool "Support RealView(R) Platform Baseboard for Cortex(tm)-A8 platform"

	depends on ARCH_MULTI_V7

	select ARM_GIC

	select CPU_V7

	select HAVE_PATA_PLATFORM

	help

	  Include support for the ARM(R) RealView Platform Baseboard for
@@ -103,7 +133,8 @@ config MACH_REALVIEW_PBA8 
	  support for PCI-E and Compact Flash.



config MACH_REALVIEW_PBX

	bool "Support RealView(R) Platform Baseboard Explore"

	bool "Support RealView(R) Platform Baseboard Explore for Cortex-A9"

	depends on ARCH_MULTI_V7

	select ARM_GIC

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP
@@ -127,4 +158,4 @@ config REALVIEW_HIGH_PHYS_OFFSET 
	  offset. On the PBX board, disabling this option allows 1GB of

	  RAM to be used with HIGHMEM.



endmenu
 
endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE