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

Commit 5fe0163a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'cleanup/kconfig' into next/soc 



Bring in the cleanup branch due to conflicts in new additions. Should really
have been the base before the other branch, but this way works too.

* cleanup/kconfig:
  ARM: qcom: clean-up unneeded kconfig selects
  ARM: bcm: clean-up unneeded kconfig selects
  ARM: mvebu: clean-up unneeded kconfig selects

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5df22a61 e7062b10

arch/arm/mach-bcm/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ menu "Broadcom SoC Selection" 


config ARCH_BCM_MOBILE

	bool "Broadcom Mobile SoC" if ARCH_MULTI_V7

	depends on MMU

	select ARCH_REQUIRE_GPIOLIB

	select ARM_ERRATA_754322

	select ARM_ERRATA_764369 if SMP
@@ -33,10 +32,7 @@ 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
@@ -45,14 +41,10 @@ config ARCH_BCM2835 


config ARCH_BCM_5301X

	bool "Broadcom BCM470X / BCM5301X ARM SoC" if ARCH_MULTI_V7

	depends on MMU

	select ARM_GIC

	select CACHE_L2X0

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_SMP

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select ARM_GLOBAL_TIMER

	select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK

	select MIGHT_HAVE_PCI

arch/arm/mach-mvebu/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ config ARCH_MVEBU 
	select ARCH_SUPPORTS_BIG_ENDIAN

	select CLKSRC_MMIO

	select GENERIC_IRQ_CHIP

	select IRQ_DOMAIN

	select PINCTRL

	select PLAT_ORION

	select SOC_BUS
@@ -12,7 +11,6 @@ config ARCH_MVEBU 
	select ARCH_REQUIRE_GPIOLIB

	select MIGHT_HAVE_PCI

	select PCI_QUIRKS if PCI

	select OF_ADDRESS_PCI



if ARCH_MVEBU
@@ -39,7 +37,6 @@ config MACH_ARMADA_375 
	select ARM_ERRATA_753970

	select ARM_GIC

	select ARMADA_375_CLK

	select CPU_V7

	select HAVE_ARM_SCU

	select HAVE_ARM_TWD if SMP

	select HAVE_SMP
@@ -55,7 +52,6 @@ config MACH_ARMADA_38X 
	select ARM_ERRATA_753970

	select ARM_GIC

	select ARMADA_38X_CLK

	select CPU_V7

	select HAVE_ARM_SCU

	select HAVE_ARM_TWD if SMP

	select HAVE_SMP
@@ -93,13 +89,11 @@ config MACH_KIRKWOOD 
	select ARCH_REQUIRE_GPIOLIB

	select CPU_FEROCEON

	select KIRKWOOD_CLK

	select OF_IRQ

	select ORION_IRQCHIP

	select ORION_TIMER

	select PCI

	select PCI_QUIRKS

	select PINCTRL_KIRKWOOD

	select USE_OF

	help

	  Say 'Y' here if you want your kernel to support boards based

	  on the Marvell Kirkwood device tree.

arch/arm/mach-qcom/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ config ARCH_QCOM 
	select ARCH_REQUIRE_GPIOLIB

	select ARM_GIC

	select CLKSRC_OF

	select GENERIC_CLOCKEVENTS

	select HAVE_SMP

	select QCOM_SCM if SMP

	help

	  Support for Qualcomm's devicetree based systems.