Commit a65b5f4c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'cleanup/kconfig' into next/drivers 



This resolves a conflict between the new sti reset
controller driver and the Kconfig cleanup.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9ad2a24f 4b8b5f25

arch/arm/Kconfig

+12 −3
Original line number Diff line number Diff line
@@ -306,9 +306,11 @@ choice 
config ARCH_MULTIPLATFORM

	bool "Allow multiple platforms to be selected"

	depends on MMU

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_PATCH_PHYS_VIRT

	select AUTO_ZRELADDR

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

	select USE_OF
@@ -907,16 +909,18 @@ config ARCH_MULTI_V4_V5 
config ARCH_MULTI_V6

	bool "ARMv6 based platforms (ARM11)"

	select ARCH_MULTI_V6_V7

	select CPU_V6

	select CPU_V6K



config ARCH_MULTI_V7

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

	default y

	select ARCH_MULTI_V6_V7

	select CPU_V7

	select HAVE_SMP



config ARCH_MULTI_V6_V7

	bool

	select MIGHT_HAVE_CACHE_L2X0



config ARCH_MULTI_CPU_AUTO

	def_bool !(ARCH_MULTI_V4 || ARCH_MULTI_V4T || ARCH_MULTI_V6_V7)
@@ -924,6 +928,13 @@ config ARCH_MULTI_CPU_AUTO 


endmenu



config ARCH_VIRT

	bool "Dummy Virtual Machine" if ARCH_MULTI_V7

	select ARM_AMBA

	select ARM_GIC

	select ARM_PSCI

	select HAVE_ARM_ARCH_TIMER



#

# This is sorted alphabetically by mach-* pathname.  However, plat-*

# Kconfigs may be included either alphabetically (according to the
@@ -1049,8 +1060,6 @@ source "arch/arm/mach-versatile/Kconfig" 
source "arch/arm/mach-vexpress/Kconfig"

source "arch/arm/plat-versatile/Kconfig"



source "arch/arm/mach-virt/Kconfig"



source "arch/arm/mach-vt8500/Kconfig"



source "arch/arm/mach-w90x900/Kconfig"

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ machine-$(CONFIG_ARCH_U300) += u300 
machine-$(CONFIG_ARCH_U8500)		+= ux500

machine-$(CONFIG_ARCH_VERSATILE)	+= versatile

machine-$(CONFIG_ARCH_VEXPRESS)		+= vexpress

machine-$(CONFIG_ARCH_VIRT)		+= virt

machine-$(CONFIG_ARCH_VT8500)		+= vt8500

machine-$(CONFIG_ARCH_W90X900)		+= w90x900

machine-$(CONFIG_ARCH_ZYNQ)		+= zynq

arch/arm/mach-bcm/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -16,12 +16,7 @@ config ARCH_BCM_MOBILE 
	select ARM_ERRATA_754322

	select ARM_ERRATA_764369 if SMP

	select ARM_GIC

	select CPU_V7

	select CLKSRC_OF

	select GENERIC_CLOCKEVENTS

	select GENERIC_TIME

	select GPIO_BCM_KONA

	select SPARSE_IRQ

	select TICK_ONESHOT

	select CACHE_L2X0

	select HAVE_ARM_ARCH_TIMER

arch/arm/mach-bcm2835/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -4,10 +4,6 @@ config ARCH_BCM2835 
	select ARM_AMBA

	select ARM_ERRATA_411920

	select ARM_TIMER_SP804

	select CLKDEV_LOOKUP

	select CLKSRC_OF

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select PINCTRL

	select PINCTRL_BCM2835

	help

arch/arm/mach-berlin/Kconfig

+0 −4
Original line number Diff line number Diff line 
config ARCH_BERLIN

	bool "Marvell Berlin SoCs" if ARCH_MULTI_V7

	select ARM_GIC

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select COMMON_CLK

	select DW_APB_ICTL

	select DW_APB_TIMER_OF
@@ -16,12 +14,10 @@ config MACH_BERLIN_BG2 
	select CACHE_L2X0

	select CPU_PJ4B

	select HAVE_ARM_TWD if SMP

	select HAVE_SMP



config MACH_BERLIN_BG2CD

	bool "Marvell Armada 1500-mini (BG2CD)"

	select CACHE_L2X0

	select CPU_V7

	select HAVE_ARM_TWD if SMP



endmenu