ARM: centralize common multi-platform kconfig options
authorRob Herring <robh@kernel.org>
Fri, 22 Nov 2013 15:29:37 +0000 (09:29 -0600)
committerSimon Horman <horms@verge.net.au>
Fri, 5 Dec 2014 00:22:19 +0000 (09:22 +0900)
Multi-platform requires various kconfig options to be selected, so
platforms don't need to select them individually.

Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
Acked-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
(cherry picked from commit ddb902cc34593ecb88c368f6e15db3cf829c56fe)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/mach-omap2/Kconfig
arch/arm/mach-tegra/Kconfig

30 files changed:
arch/arm/Kconfig
arch/arm/mach-bcm/Kconfig
arch/arm/mach-bcm2835/Kconfig
arch/arm/mach-berlin/Kconfig
arch/arm/mach-cns3xxx/Kconfig
arch/arm/mach-highbank/Kconfig
arch/arm/mach-hisi/Kconfig
arch/arm/mach-imx/Kconfig
arch/arm/mach-keystone/Kconfig
arch/arm/mach-moxart/Kconfig
arch/arm/mach-mvebu/Kconfig
arch/arm/mach-mxs/Kconfig
arch/arm/mach-nomadik/Kconfig
arch/arm/mach-nspire/Kconfig
arch/arm/mach-omap2/Kconfig
arch/arm/mach-picoxcell/Kconfig
arch/arm/mach-prima2/Kconfig
arch/arm/mach-rockchip/Kconfig
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-socfpga/Kconfig
arch/arm/mach-spear/Kconfig
arch/arm/mach-sti/Kconfig
arch/arm/mach-sunxi/Kconfig
arch/arm/mach-tegra/Kconfig
arch/arm/mach-u300/Kconfig
arch/arm/mach-ux500/Kconfig
arch/arm/mach-vexpress/Kconfig
arch/arm/mach-virt/Kconfig
arch/arm/mach-vt8500/Kconfig
arch/arm/mach-zynq/Kconfig

index 3d58483..f7717d4 100644 (file)
@@ -307,9 +307,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
index b1aa6a9..af4f2df 100644 (file)
@@ -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
index d1f9612..1c0decd 100644 (file)
@@ -4,10 +4,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
index 7a02d22..b346f59 100644 (file)
@@ -1,9 +1,7 @@
 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
 
@@ -21,7 +19,6 @@ config MACH_BERLIN_BG2
 config MACH_BERLIN_BG2CD
        bool "Marvell Armada 1500-mini (BG2CD)"
        select CACHE_L2X0
-       select CPU_V7
        select HAVE_ARM_TWD if SMP
 
 endmenu
index dbf0df8..e346688 100644 (file)
@@ -2,7 +2,6 @@ config ARCH_CNS3XXX
        bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6
        select ARM_GIC
        select CPU_V6K
-       select GENERIC_CLOCKEVENTS
        select MIGHT_HAVE_CACHE_L2X0
        select MIGHT_HAVE_PCI
        select PCI_DOMAINS if PCI
index 0aded64..59274a7 100644 (file)
@@ -5,7 +5,6 @@ config ARCH_HIGHBANK
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_HAS_OPP
        select ARCH_SUPPORTS_BIG_ENDIAN
-       select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_AMBA
        select ARM_ERRATA_764369 if SMP
        select ARM_ERRATA_775420
@@ -14,14 +13,9 @@ config ARCH_HIGHBANK
        select ARM_PSCI
        select ARM_TIMER_SP804
        select CACHE_L2X0
-       select COMMON_CLK
-       select CPU_V7
-       select GENERIC_CLOCKEVENTS
        select HAVE_ARM_SCU
        select HAVE_ARM_TWD if SMP
        select HAVE_SMP
        select MAILBOX
        select PL320_MBOX
-       select SPARSE_IRQ
-       select USE_OF
        select ZONE_DMA if ARM_LPAE
index 1abae5f..95492d7 100644 (file)
@@ -3,10 +3,7 @@ config ARCH_HI3xxx
        select ARM_AMBA
        select ARM_GIC
        select ARM_TIMER_SP804
-       select ARCH_WANT_OPTIONAL_GPIOLIB
        select CACHE_L2X0
-       select CLKSRC_OF
-       select GENERIC_CLOCKEVENTS
        select HAVE_ARM_SCU
        select HAVE_ARM_TWD if SMP
        select HAVE_SMP
index 33567aa..3dd2c60 100644 (file)
@@ -2,18 +2,12 @@ config ARCH_MXC
        bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
        select ARCH_REQUIRE_GPIOLIB
        select ARM_CPU_SUSPEND if PM
-       select ARM_PATCH_PHYS_VIRT
        select CLKSRC_MMIO
-       select COMMON_CLK
        select GENERIC_ALLOCATOR
-       select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP
        select MIGHT_HAVE_CACHE_L2X0 if ARCH_MULTI_V6_V7
-       select MULTI_IRQ_HANDLER
        select PINCTRL
        select SOC_BUS
-       select SPARSE_IRQ
-       select USE_OF
        help
          Support for Freescale MXC/iMX-based family of processors
 
@@ -132,7 +126,6 @@ config SOC_IMX5
        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
        select ARCH_MXC_IOMUX_V3
-       select CPU_V7
        select MXC_TZIC
 
 config SOC_IMX51
@@ -792,7 +785,6 @@ config SOC_IMX6Q
        select ARM_ERRATA_764369 if SMP
        select ARM_ERRATA_775420
        select ARM_GIC
-       select CPU_V7
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select HAVE_IMX_ANATOP
@@ -817,7 +809,6 @@ config SOC_IMX6SL
        select ARM_ERRATA_754322
        select ARM_ERRATA_775420
        select ARM_GIC
-       select CPU_V7
        select HAVE_IMX_ANATOP
        select HAVE_IMX_GPC
        select HAVE_IMX_MMDC
@@ -833,9 +824,7 @@ config SOC_IMX6SL
 
 config SOC_VF610
        bool "Vybrid Family VF610 support"
-       select CPU_V7
        select ARM_GIC
-       select CLKSRC_OF
        select PINCTRL_VF610
        select VF_PIT_TIMER
        select PL310_ERRATA_588369 if CACHE_PL310
index 90a708f..00ed744 100644 (file)
@@ -1,13 +1,10 @@
 config ARCH_KEYSTONE
        bool "Texas Instruments Keystone Devices"
        depends on ARCH_MULTI_V7
-       select CPU_V7
        select ARM_GIC
        select HAVE_ARM_ARCH_TIMER
        select HAVE_SMP
        select CLKSRC_MMIO
-       select GENERIC_CLOCKEVENTS
-       select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_ERRATA_798181 if SMP
        select COMMON_CLK_KEYSTONE
        select ARCH_SUPPORTS_BIG_ENDIAN
index 3795ae2..95a6a4b 100644 (file)
@@ -2,14 +2,9 @@ config ARCH_MOXART
        bool "MOXA ART SoC" if ARCH_MULTI_V4T
        select CPU_FA526
        select ARM_DMA_MEM_BUFFERABLE
-       select USE_OF
-       select CLKSRC_OF
        select CLKSRC_MMIO
-       select HAVE_CLK
-       select COMMON_CLK
        select GENERIC_IRQ_CHIP
        select ARCH_REQUIRE_GPIOLIB
-       select GENERIC_CLOCKEVENTS
        select PHYLIB if NETDEVICES
        help
          Say Y here if you want to run your kernel on hardware with a
index 5e269d7..d581e84 100644 (file)
@@ -2,15 +2,10 @@ config ARCH_MVEBU
        bool "Marvell SOCs with Device Tree support" if ARCH_MULTI_V7
        select ARCH_SUPPORTS_BIG_ENDIAN
        select CLKSRC_MMIO
-       select COMMON_CLK
-       select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP
        select IRQ_DOMAIN
-       select MULTI_IRQ_HANDLER
        select PINCTRL
        select PLAT_ORION
-       select SPARSE_IRQ
-       select CLKDEV_LOOKUP
        select MVEBU_MBUS
        select ZONE_DMA if ARM_LPAE
        select ARCH_REQUIRE_GPIOLIB
index 8cde9e0..8479413 100644 (file)
@@ -16,11 +16,7 @@ config ARCH_MXS
        bool "Freescale MXS (i.MX23, i.MX28) support"
        depends on ARCH_MULTI_V5
        select ARCH_REQUIRE_GPIOLIB
-       select CLKDEV_LOOKUP
        select CLKSRC_MMIO
-       select CLKSRC_OF
-       select GENERIC_CLOCKEVENTS
-       select HAVE_CLK_PREPARE
        select PINCTRL
        select SOC_BUS
        select SOC_IMX23
index 4d42da4..486d301 100644 (file)
@@ -6,16 +6,11 @@ config ARCH_NOMADIK
        select ARM_VIC
        select CLKSRC_NOMADIK_MTU
        select CLKSRC_NOMADIK_MTU_SCHED_CLOCK
-       select CLKSRC_OF
-       select COMMON_CLK
        select CPU_ARM926T
-       select GENERIC_CLOCKEVENTS
        select MIGHT_HAVE_CACHE_L2X0
        select PINCTRL
        select PINCTRL_NOMADIK
        select PINCTRL_STN8815
-       select SPARSE_IRQ
-       select USE_OF
        help
          Support for the Nomadik platform by ST-Ericsson
 
index 59d8f0a..bc41f26 100644 (file)
@@ -3,14 +3,9 @@ config ARCH_NSPIRE
        depends on ARCH_MULTI_V4_V5
        depends on MMU
        select CPU_ARM926T
-       select COMMON_CLK
-       select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP
-       select SPARSE_IRQ
        select ARM_AMBA
        select ARM_VIC
        select ARM_TIMER_SP804
-       select USE_OF
-       select CLKSRC_OF
        help
          This enables support for systems using the TI-NSPIRE CPU
index 6fb91fb..d54bddb 100644 (file)
@@ -6,7 +6,6 @@ config ARCH_OMAP2
        depends on ARCH_MULTI_V6
        select ARCH_OMAP2PLUS
        select CPU_V6
-       select MULTI_IRQ_HANDLER
        select SOC_HAS_OMAP2_SDRC
 
 config ARCH_OMAP3
@@ -15,8 +14,6 @@ config ARCH_OMAP3
        select ARCH_OMAP2PLUS
        select ARCH_HAS_OPP
        select ARM_CPU_SUSPEND if PM
-       select CPU_V7
-       select MULTI_IRQ_HANDLER
        select OMAP_INTERCONNECT
        select PM_OPP if PM
        select PM_RUNTIME if CPU_IDLE
@@ -32,7 +29,6 @@ config ARCH_OMAP4
        select ARM_ERRATA_720789
        select ARM_GIC
        select CACHE_L2X0
-       select CPU_V7
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select HAVE_SMP
@@ -51,7 +47,6 @@ config SOC_OMAP5
        select ARCH_HAS_OPP
        select ARM_CPU_SUSPEND if PM
        select ARM_GIC
-       select CPU_V7
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select HAVE_SMP
@@ -64,16 +59,12 @@ config SOC_AM33XX
        select ARCH_OMAP2PLUS
        select ARCH_HAS_OPP
        select ARM_CPU_SUSPEND if PM
-       select CPU_V7
-       select MULTI_IRQ_HANDLER
 
 config SOC_AM43XX
        bool "TI AM43x"
        depends on ARCH_MULTI_V7
-       select CPU_V7
        select ARCH_OMAP2PLUS
        select ARCH_HAS_OPP
-       select MULTI_IRQ_HANDLER
        select ARM_GIC
        select MACH_OMAP_GENERIC
 
@@ -84,8 +75,6 @@ config SOC_DRA7XX
        select ARCH_HAS_OPP
        select ARM_CPU_SUSPEND if PM
        select ARM_GIC
-       select CPU_V7
-       select HAVE_SMP
        select HAVE_ARM_ARCH_TIMER
 
 config ARCH_OMAP2PLUS
@@ -96,17 +85,13 @@ config ARCH_OMAP2PLUS
        select ARCH_OMAP
        select ARCH_REQUIRE_GPIOLIB
        select CLKSRC_MMIO
-       select COMMON_CLK
-       select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP
        select MACH_OMAP_GENERIC
        select OMAP_DM_TIMER
        select PINCTRL
        select PROC_DEVICETREE if PROC_FS
        select SOC_BUS
-       select SPARSE_IRQ
        select TI_PRIV_EDMA
-       select USE_OF
        help
          Systems based on OMAP2, OMAP3, OMAP4 or OMAP5
 
index b1022f4..c88ff74 100644 (file)
@@ -1,12 +1,8 @@
 config ARCH_PICOXCELL
        bool "Picochip PicoXcell" if ARCH_MULTI_V6
        select ARCH_REQUIRE_GPIOLIB
-       select ARM_PATCH_PHYS_VIRT
        select ARM_VIC
        select CPU_V6K
        select DW_APB_TIMER_OF
-       select GENERIC_CLOCKEVENTS
        select HAVE_TCM
        select NO_IOPORT
-       select SPARSE_IRQ
-       select USE_OF
index 6988b11..16c2d90 100644 (file)
@@ -1,7 +1,6 @@
 config ARCH_SIRF
        bool "CSR SiRF" if ARCH_MULTI_V7
        select ARCH_REQUIRE_GPIOLIB
-       select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP
        select MIGHT_HAVE_CACHE_L2X0
        select NO_IOPORT
@@ -17,7 +16,6 @@ menu "CSR SiRF atlas6/primaII/Marco/Polo Specific Features"
 config ARCH_ATLAS6
        bool "CSR SiRFSoC ATLAS6 ARM Cortex A9 Platform"
        default y
-       select CPU_V7
        select SIRF_IRQ
        help
           Support for CSR SiRFSoC ARM Cortex A9 Platform
@@ -25,7 +23,6 @@ config ARCH_ATLAS6
 config ARCH_PRIMA2
        bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
        default y
-       select CPU_V7
        select SIRF_IRQ
        select ZONE_DMA
        help
@@ -35,7 +32,6 @@ config ARCH_MARCO
        bool "CSR SiRFSoC MARCO ARM Cortex A9 Platform"
        default y
        select ARM_GIC
-       select CPU_V7
        select HAVE_ARM_SCU if SMP
        select HAVE_SMP
        select SMP_ON_UP if SMP
index cf073de..2a695bc 100644 (file)
@@ -7,8 +7,6 @@ config ARCH_ROCKCHIP
        select CACHE_L2X0
        select HAVE_ARM_TWD if SMP
        select HAVE_SMP
-       select COMMON_CLK
-       select GENERIC_CLOCKEVENTS
        select DW_APB_TIMER_OF
        select ARM_GLOBAL_TIMER
        select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
index 5e3fb95..30bfa25 100644 (file)
@@ -5,8 +5,6 @@ config ARCH_SHMOBILE_MULTI
        bool "Renesas ARM SoCs" if ARCH_MULTI_V7
        depends on MMU
        select ARCH_SHMOBILE
-       select CPU_V7
-       select GENERIC_CLOCKEVENTS
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select HAVE_SMP
@@ -16,7 +14,6 @@ config ARCH_SHMOBILE_MULTI
        select NO_IOPORT
        select PINCTRL
        select ARCH_REQUIRE_GPIOLIB
-       select CLKDEV_LOOKUP
 
 if ARCH_SHMOBILE_MULTI
 
index aee77f0..2249137 100644 (file)
@@ -1,17 +1,11 @@
 config ARCH_SOCFPGA
        bool "Altera SOCFPGA family" if ARCH_MULTI_V7
-       select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_AMBA
        select ARM_GIC
        select CACHE_L2X0
-       select COMMON_CLK
-       select CPU_V7
        select DW_APB_TIMER_OF
-       select GENERIC_CLOCKEVENTS
        select GPIO_PL061 if GPIOLIB
        select HAVE_ARM_SCU
        select HAVE_ARM_TWD if SMP
        select HAVE_SMP
        select MFD_SYSCON
-       select SPARSE_IRQ
-       select USE_OF
index ac1710e..a7a28ea 100644 (file)
@@ -8,8 +8,6 @@ menuconfig PLAT_SPEAR
        select ARCH_REQUIRE_GPIOLIB
        select ARM_AMBA
        select CLKSRC_MMIO
-       select COMMON_CLK
-       select GENERIC_CLOCKEVENTS
 
 if PLAT_SPEAR
 
@@ -18,14 +16,12 @@ config ARCH_SPEAR13XX
        depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE
        select ARCH_HAS_CPUFREQ
        select ARM_GIC
-       select CPU_V7
        select GPIO_SPEAR_SPICS
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0
        select PINCTRL
-       select USE_OF
        help
          Supports for ARM's SPEAR13XX family
 
@@ -50,9 +46,7 @@ config ARCH_SPEAR3XX
        depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
        depends on !ARCH_SPEAR13XX
        select ARM_VIC
-       select CPU_ARM926T
        select PINCTRL
-       select USE_OF
        help
          Supports for ARM's SPEAR3XX family
 
@@ -83,14 +77,12 @@ config ARCH_SPEAR6XX
        depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
        depends on !ARCH_SPEAR13XX
        select ARM_VIC
-       select CPU_ARM926T
        help
          Supports for ARM's SPEAR6XX family
 
 config MACH_SPEAR600
        def_bool y
        depends on ARCH_SPEAR6XX
-       select USE_OF
        help
          Supports ST SPEAr600 boards configured via the device-treesource "arch/arm/mach-spear6xx/Kconfig"
 
index d71654b..9c6dda8 100644 (file)
@@ -1,7 +1,5 @@
 menuconfig ARCH_STI
        bool "STMicroelectronics Consumer Electronics SOCs with Device Trees" if ARCH_MULTI_V7
-       select GENERIC_CLOCKEVENTS
-       select CLKDEV_LOOKUP
        select ARM_GIC
        select ARM_GLOBAL_TIMER
        select PINCTRL
index b9d6cad..201ef9b 100644 (file)
@@ -5,14 +5,10 @@ config ARCH_SUNXI
        select ARM_GIC
        select ARM_PSCI
        select CLKSRC_MMIO
-       select CLKSRC_OF
-       select COMMON_CLK
-       select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP
        select HAVE_SMP
        select PINCTRL
        select PINCTRL_SUNXI
        select RESET_CONTROLLER
-       select SPARSE_IRQ
        select SUN4I_TIMER
        select SUN5I_HSTIMER
index 4926bd1..b3a1dab 100644 (file)
@@ -5,10 +5,6 @@ config ARCH_TEGRA
        select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
        select ARM_GIC
        select CLKSRC_MMIO
-       select CLKSRC_OF
-       select COMMON_CLK
-       select CPU_V7
-       select GENERIC_CLOCKEVENTS
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select HAVE_SMP
@@ -18,10 +14,8 @@ config ARCH_TEGRA
        select ARCH_HAS_RESET_CONTROLLER
        select RESET_CONTROLLER
        select SOC_BUS
-       select SPARSE_IRQ
        select USB_ULPI if USB_PHY
        select USB_ULPI_VIEWPORT if USB_PHY
-       select USE_OF
        help
          This enables support for NVIDIA Tegra based systems.
 
index 8e23071..e3a96d7 100644 (file)
@@ -3,20 +3,14 @@ config ARCH_U300
        depends on MMU
        select ARCH_REQUIRE_GPIOLIB
        select ARM_AMBA
-       select ARM_PATCH_PHYS_VIRT
        select ARM_VIC
        select CLKSRC_MMIO
-       select CLKSRC_OF
-       select COMMON_CLK
        select CPU_ARM926T
-       select GENERIC_CLOCKEVENTS
        select HAVE_TCM
        select PINCTRL
        select PINCTRL_COH901
        select PINCTRL_U300
-       select SPARSE_IRQ
        select MFD_SYSCON
-       select USE_OF
        help
          Support for ST-Ericsson U300 series mobile platforms.
 
index 0034d2c..5d71c82 100644 (file)
@@ -11,9 +11,6 @@ config ARCH_U8500
        select ARM_GIC
        select CACHE_L2X0
        select CLKSRC_NOMADIK_MTU
-       select COMMON_CLK
-       select CPU_V7
-       select GENERIC_CLOCKEVENTS
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select HAVE_SMP
@@ -76,7 +73,6 @@ config UX500_AUTO_PLATFORM
 config MACH_UX500_DT
        bool "Generic U8500 support using device tree"
        depends on MACH_MOP500
-       select USE_OF
 
 endmenu
 
index 4a70be4..fa29222 100644 (file)
@@ -5,10 +5,7 @@ config ARCH_VEXPRESS
        select ARM_AMBA
        select ARM_GIC
        select ARM_TIMER_SP804
-       select COMMON_CLK
        select COMMON_CLK_VERSATILE
-       select CPU_V7
-       select GENERIC_CLOCKEVENTS
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select HAVE_PATA_PLATFORM
index 081d469..eaad072 100644 (file)
@@ -1,10 +1,6 @@
 config ARCH_VIRT
        bool "Dummy Virtual Machine" if ARCH_MULTI_V7
-       select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_GIC
        select HAVE_ARM_ARCH_TIMER
        select ARM_PSCI
        select HAVE_SMP
-       select CPU_V7
-       select SPARSE_IRQ
-       select USE_OF
index 927be93..c581ed2 100644 (file)
@@ -3,8 +3,6 @@ config ARCH_VT8500
        select ARCH_HAS_CPUFREQ
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
-       select CLKSRC_OF
-       select GENERIC_CLOCKEVENTS
        select VT8500_TIMER
        select PINCTRL
        help
@@ -29,6 +27,5 @@ config ARCH_WM8850
        bool "WonderMedia WM8850"
        depends on ARCH_MULTI_V7
        select ARCH_VT8500
-       select CPU_V7
        help
          Support for WonderMedia WM8850 System-on-Chip.
index 6b04260..85d1805 100644 (file)
@@ -2,16 +2,11 @@ config ARCH_ZYNQ
        bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7
        select ARM_AMBA
        select ARM_GIC
-       select COMMON_CLK
-       select CPU_V7
-       select GENERIC_CLOCKEVENTS
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select ICST
        select MIGHT_HAVE_CACHE_L2X0
-       select USE_OF
        select HAVE_SMP
-       select SPARSE_IRQ
        select CADENCE_TTC_TIMER
        select ARM_GLOBAL_TIMER
        help