Commit 7379d96b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'versatile/multiplatform' into next/multiplatform 



Merge "ARM Versatile multi-platform support" from Rob Herring:

Arnd lit a fire under me to dust this off and get it merged. So here it
is. The main change from prior version is I merged all the code to a
single file. It's a bigger patch than I'd like, but I don't think trying
to do it in multiple steps is worth it.

This is dependent on some solution for the default platform choice on
!MMU builds (allnoconfig) as it can't be Versatile after this series.
Arnd has some ideas on how to address that.

This is tested under QEMU. Linus previously tested this on actual h/w
and had a problem with the display identification which needs
investigation or agreement to worry about it if and when someone
actually cares.

* versatile/multiplatform:
  ARM: versatile: convert to multi-platform
  ARM: versatile: merge mach code into a single file
  ARM: versatile: switch to DT only booting and remove legacy code
  ARM: versatile: add DT based PCI detection

Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parents ee5d8742 a29da136

arch/arm/Kconfig

+0 −17
Original line number Diff line number Diff line
@@ -362,23 +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 CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select HAVE_MACH_CLKDEV

	select ICST

	select PLAT_VERSATILE

	select PLAT_VERSATILE_CLOCK

	select PLAT_VERSATILE_SCHED_CLOCK

	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

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

+12 −29
Original line number Diff line number Diff line 
menu "Versatile platform type"

	depends on ARCH_VERSATILE



config ARCH_VERSATILE_PB

	bool "Support Versatile Platform Baseboard for ARM926EJ-S"

	default y

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

	  Include support for the ARM(R) Versatile Platform Baseboard

	  for the ARM926EJ-S.



config MACH_VERSATILE_AB

	bool "Support Versatile Application Baseboard for ARM926EJ-S"

	select CPU_ARM926T

	help

	  Include support for the ARM(R) Versatile Application Baseboard

	  for the ARM926EJ-S.



config MACH_VERSATILE_DT

	bool "Support Versatile platform from device tree"

	select CPU_ARM926T

	select USE_OF

	help

	  Include support for the ARM(R) Versatile/PB platform,

	  using the device tree for discovery



config MACH_VERSATILE_AUTO

	def_bool y

	depends on !ARCH_VERSATILE_PB && !MACH_VERSATILE_AB

	select MACH_VERSATILE_DT

	  This enables support for ARM Ltd Versatile board.

endmenu

arch/arm/mach-versatile/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -2,8 +2,4 @@ 
# Makefile for the linux kernel.

#



obj-y					:= core.o

obj-$(CONFIG_ARCH_VERSATILE_PB)		+= versatile_pb.o

obj-$(CONFIG_MACH_VERSATILE_AB)		+= versatile_ab.o

obj-$(CONFIG_MACH_VERSATILE_DT)		+= versatile_dt.o

obj-$(CONFIG_PCI)			+= pci.o
 
obj-y					:= versatile_dt.o

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE