diff options
| -rw-r--r-- | arch/arm/mach-bcm/Kconfig | 8 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 6 | ||||
| -rw-r--r-- | arch/arm/mach-qcom/Kconfig | 2 |
3 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index 49c914cd9c7a..9f19636fea2f 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig | |||
| @@ -11,7 +11,6 @@ menu "Broadcom SoC Selection" | |||
| 11 | 11 | ||
| 12 | config ARCH_BCM_MOBILE | 12 | config ARCH_BCM_MOBILE |
| 13 | bool "Broadcom Mobile SoC" if ARCH_MULTI_V7 | 13 | bool "Broadcom Mobile SoC" if ARCH_MULTI_V7 |
| 14 | depends on MMU | ||
| 15 | select ARCH_REQUIRE_GPIOLIB | 14 | select ARCH_REQUIRE_GPIOLIB |
| 16 | select ARM_ERRATA_754322 | 15 | select ARM_ERRATA_754322 |
| 17 | select ARM_ERRATA_764369 if SMP | 16 | select ARM_ERRATA_764369 if SMP |
| @@ -33,10 +32,7 @@ config ARCH_BCM2835 | |||
| 33 | select ARM_AMBA | 32 | select ARM_AMBA |
| 34 | select ARM_ERRATA_411920 | 33 | select ARM_ERRATA_411920 |
| 35 | select ARM_TIMER_SP804 | 34 | select ARM_TIMER_SP804 |
| 36 | select CLKDEV_LOOKUP | ||
| 37 | select CLKSRC_OF | 35 | select CLKSRC_OF |
| 38 | select CPU_V6 | ||
| 39 | select GENERIC_CLOCKEVENTS | ||
| 40 | select PINCTRL | 36 | select PINCTRL |
| 41 | select PINCTRL_BCM2835 | 37 | select PINCTRL_BCM2835 |
| 42 | help | 38 | help |
| @@ -45,14 +41,10 @@ config ARCH_BCM2835 | |||
| 45 | 41 | ||
| 46 | config ARCH_BCM_5301X | 42 | config ARCH_BCM_5301X |
| 47 | bool "Broadcom BCM470X / BCM5301X ARM SoC" if ARCH_MULTI_V7 | 43 | bool "Broadcom BCM470X / BCM5301X ARM SoC" if ARCH_MULTI_V7 |
| 48 | depends on MMU | ||
| 49 | select ARM_GIC | 44 | select ARM_GIC |
| 50 | select CACHE_L2X0 | 45 | select CACHE_L2X0 |
| 51 | select HAVE_ARM_SCU if SMP | 46 | select HAVE_ARM_SCU if SMP |
| 52 | select HAVE_ARM_TWD if SMP | 47 | select HAVE_ARM_TWD if SMP |
| 53 | select HAVE_SMP | ||
| 54 | select COMMON_CLK | ||
| 55 | select GENERIC_CLOCKEVENTS | ||
| 56 | select ARM_GLOBAL_TIMER | 48 | select ARM_GLOBAL_TIMER |
| 57 | select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK | 49 | select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK |
| 58 | select MIGHT_HAVE_PCI | 50 | select MIGHT_HAVE_PCI |
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index d6b0a772a6dd..199187e474ce 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig | |||
| @@ -3,7 +3,6 @@ config ARCH_MVEBU | |||
| 3 | select ARCH_SUPPORTS_BIG_ENDIAN | 3 | select ARCH_SUPPORTS_BIG_ENDIAN |
| 4 | select CLKSRC_MMIO | 4 | select CLKSRC_MMIO |
| 5 | select GENERIC_IRQ_CHIP | 5 | select GENERIC_IRQ_CHIP |
| 6 | select IRQ_DOMAIN | ||
| 7 | select PINCTRL | 6 | select PINCTRL |
| 8 | select PLAT_ORION | 7 | select PLAT_ORION |
| 9 | select SOC_BUS | 8 | select SOC_BUS |
| @@ -12,7 +11,6 @@ config ARCH_MVEBU | |||
| 12 | select ARCH_REQUIRE_GPIOLIB | 11 | select ARCH_REQUIRE_GPIOLIB |
| 13 | select MIGHT_HAVE_PCI | 12 | select MIGHT_HAVE_PCI |
| 14 | select PCI_QUIRKS if PCI | 13 | select PCI_QUIRKS if PCI |
| 15 | select OF_ADDRESS_PCI | ||
| 16 | 14 | ||
| 17 | if ARCH_MVEBU | 15 | if ARCH_MVEBU |
| 18 | 16 | ||
| @@ -39,7 +37,6 @@ config MACH_ARMADA_375 | |||
| 39 | select ARM_ERRATA_753970 | 37 | select ARM_ERRATA_753970 |
| 40 | select ARM_GIC | 38 | select ARM_GIC |
| 41 | select ARMADA_375_CLK | 39 | select ARMADA_375_CLK |
| 42 | select CPU_V7 | ||
| 43 | select HAVE_ARM_SCU | 40 | select HAVE_ARM_SCU |
| 44 | select HAVE_ARM_TWD if SMP | 41 | select HAVE_ARM_TWD if SMP |
| 45 | select HAVE_SMP | 42 | select HAVE_SMP |
| @@ -55,7 +52,6 @@ config MACH_ARMADA_38X | |||
| 55 | select ARM_ERRATA_753970 | 52 | select ARM_ERRATA_753970 |
| 56 | select ARM_GIC | 53 | select ARM_GIC |
| 57 | select ARMADA_38X_CLK | 54 | select ARMADA_38X_CLK |
| 58 | select CPU_V7 | ||
| 59 | select HAVE_ARM_SCU | 55 | select HAVE_ARM_SCU |
| 60 | select HAVE_ARM_TWD if SMP | 56 | select HAVE_ARM_TWD if SMP |
| 61 | select HAVE_SMP | 57 | select HAVE_SMP |
| @@ -93,13 +89,11 @@ config MACH_KIRKWOOD | |||
| 93 | select ARCH_REQUIRE_GPIOLIB | 89 | select ARCH_REQUIRE_GPIOLIB |
| 94 | select CPU_FEROCEON | 90 | select CPU_FEROCEON |
| 95 | select KIRKWOOD_CLK | 91 | select KIRKWOOD_CLK |
| 96 | select OF_IRQ | ||
| 97 | select ORION_IRQCHIP | 92 | select ORION_IRQCHIP |
| 98 | select ORION_TIMER | 93 | select ORION_TIMER |
| 99 | select PCI | 94 | select PCI |
| 100 | select PCI_QUIRKS | 95 | select PCI_QUIRKS |
| 101 | select PINCTRL_KIRKWOOD | 96 | select PINCTRL_KIRKWOOD |
| 102 | select USE_OF | ||
| 103 | help | 97 | help |
| 104 | Say 'Y' here if you want your kernel to support boards based | 98 | Say 'Y' here if you want your kernel to support boards based |
| 105 | on the Marvell Kirkwood device tree. | 99 | on the Marvell Kirkwood device tree. |
diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig index a028be234334..6aa22147cace 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig | |||
| @@ -3,8 +3,6 @@ config ARCH_QCOM | |||
| 3 | select ARCH_REQUIRE_GPIOLIB | 3 | select ARCH_REQUIRE_GPIOLIB |
| 4 | select ARM_GIC | 4 | select ARM_GIC |
| 5 | select CLKSRC_OF | 5 | select CLKSRC_OF |
| 6 | select GENERIC_CLOCKEVENTS | ||
| 7 | select HAVE_SMP | ||
| 8 | select QCOM_SCM if SMP | 6 | select QCOM_SCM if SMP |
| 9 | help | 7 | help |
| 10 | Support for Qualcomm's devicetree based systems. | 8 | Support for Qualcomm's devicetree based systems. |
