Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge tag 'kconfig-cleanup-for-3.15' into imx/soc

- Remove common kconfig options required by multi-platform builds out
of individual platforms as they are redundant.
- Make SMP, CACHE_L2X0 and GPIO config options user visible on
multi-platform builds as most platforms enable these options and all
platforms can run with them enabled.
- Make multi-platform v6 default to more optimal v6k rather than v6
- Remove the last bit of mach-virt and convert it to just a kconfig
option.

Conflicts:
	arch/arm/mach-omap2/Kconfig
Shawn Guo 11 years ago
parent
cfbf8d4857 4b8b5f25b7
commit
c1b2a174c3
33 changed files with 12 additions and 228 deletions
Split View Show Diff Stats
  1. 12 3
      arch/arm/Kconfig
  2. 0 1
      arch/arm/Makefile
  3. 0 5
      arch/arm/mach-bcm/Kconfig
  4. 0 4
      arch/arm/mach-bcm2835/Kconfig
  5. 0 4
      arch/arm/mach-berlin/Kconfig
  6. 0 3
      arch/arm/mach-cns3xxx/Kconfig
  7. 0 7
      arch/arm/mach-highbank/Kconfig
  8. 0 4
      arch/arm/mach-hisi/Kconfig
  9. 0 14
      arch/arm/mach-imx/Kconfig
  10. 0 4
      arch/arm/mach-keystone/Kconfig
  11. 0 5
      arch/arm/mach-moxart/Kconfig
  12. 0 6
      arch/arm/mach-mvebu/Kconfig
  13. 0 4
      arch/arm/mach-mxs/Kconfig
  14. 0 5
      arch/arm/mach-nomadik/Kconfig
  15. 0 5
      arch/arm/mach-nspire/Kconfig
  16. 0 17
      arch/arm/mach-omap2/Kconfig
  17. 0 5
      arch/arm/mach-picoxcell/Kconfig
  18. 0 6
      arch/arm/mach-prima2/Kconfig
  19. 0 3
      arch/arm/mach-rockchip/Kconfig
  20. 0 5
      arch/arm/mach-shmobile/Kconfig
  21. 0 7
      arch/arm/mach-socfpga/Kconfig
  22. 0 10
      arch/arm/mach-spear/Kconfig
  23. 0 4
      arch/arm/mach-sti/Kconfig
  24. 0 5
      arch/arm/mach-sunxi/Kconfig
  25. 0 8
      arch/arm/mach-tegra/Kconfig
  26. 0 6
      arch/arm/mach-u300/Kconfig
  27. 0 6
      arch/arm/mach-ux500/Kconfig
  28. 0 5
      arch/arm/mach-vexpress/Kconfig
  29. 0 10
      arch/arm/mach-virt/Kconfig
  30. 0 5
      arch/arm/mach-virt/Makefile
  31. 0 41
      arch/arm/mach-virt/virt.c
  32. 0 4
      arch/arm/mach-vt8500/Kconfig
  33. 0 7
      arch/arm/mach-zynq/Kconfig

+ 12 - 3
arch/arm/Kconfig
View File 

@@ -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
 
@@ -908,16 +910,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)
 
@@ -925,6 +929,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
 
@@ -1048,8 +1059,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"

+ 0 - 1
arch/arm/Makefile
View File 

@@ -199,7 +199,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

+ 0 - 5
arch/arm/mach-bcm/Kconfig
View 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

+ 0 - 4
arch/arm/mach-bcm2835/Kconfig
View File 

@@ -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

+ 0 - 4
arch/arm/mach-berlin/Kconfig
View 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
 
 
@@ -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

+ 0 - 3
arch/arm/mach-cns3xxx/Kconfig
View File 

@@ -1,9 +1,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
 
 	help

+ 0 - 7
arch/arm/mach-highbank/Kconfig
View 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,8 @@ 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

+ 0 - 4
arch/arm/mach-hisi/Kconfig
View File 

@@ -3,13 +3,9 @@ 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
 
 	select PINCTRL
 
 	select PINCTRL_SINGLE
 
 	help

+ 0 - 14
arch/arm/mach-imx/Kconfig
View File 

@@ -2,18 +2,11 @@ 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
 
 
@@ -121,7 +114,6 @@ config SOC_IMX31
 
 config SOC_IMX35
 
 	bool
 
 	select ARCH_MXC_IOMUX_V3
 
-	select CPU_V6K
 
 	select HAVE_EPIT
 
 	select MXC_AVIC
 
 	select SMP_ON_UP if SMP
 
@@ -132,7 +124,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,14 +783,12 @@ 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
 
 	select HAVE_IMX_GPC
 
 	select HAVE_IMX_MMDC
 
 	select HAVE_IMX_SRC
 
-	select HAVE_SMP
 
 	select MFD_SYSCON
 
 	select MIGHT_HAVE_PCI
 
 	select PCI_DOMAINS if PCI
 
@@ -817,7 +806,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 +821,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

+ 0 - 4
arch/arm/mach-keystone/Kconfig
View File 

@@ -1,13 +1,9 @@
 
 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

+ 0 - 5
arch/arm/mach-moxart/Kconfig
View 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

+ 0 - 6
arch/arm/mach-mvebu/Kconfig
View 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
 
@@ -24,7 +19,6 @@ menu "Marvell SOC with device tree"
 
 config MACH_ARMADA_370_XP
 
 	bool
 
 	select ARMADA_370_XP_TIMER
 
-	select HAVE_SMP
 
 	select CACHE_L2X0
 
 	select CPU_PJ4B

+ 0 - 4
arch/arm/mach-mxs/Kconfig
View 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

+ 0 - 5
arch/arm/mach-nomadik/Kconfig
View 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

+ 0 - 5
arch/arm/mach-nspire/Kconfig
View 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

+ 0 - 17
arch/arm/mach-omap2/Kconfig
View 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
 
@@ -33,10 +30,8 @@ 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
 
 	select OMAP_INTERCONNECT
 
 	select PL310_ERRATA_588369
 
 	select PL310_ERRATA_727915
 
@@ -53,10 +48,8 @@ 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
 
 	select HAVE_ARM_ARCH_TIMER
 
 	select ARM_ERRATA_798181 if SMP
 
 
@@ -66,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
 
 
@@ -86,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
 
@@ -98,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

+ 0 - 5
arch/arm/mach-picoxcell/Kconfig
View File 

@@ -1,12 +1,7 @@
 
 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

+ 0 - 6
arch/arm/mach-prima2/Kconfig
View File 

@@ -1,9 +1,7 @@
 
 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
 
 	select PINCTRL
 
 	select PINCTRL_SIRF
 
@@ -17,7 +15,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 +22,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,9 +31,7 @@ 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
 
 	help
 
           Support for CSR SiRFSoC ARM Cortex A9 Platform

+ 0 - 3
arch/arm/mach-rockchip/Kconfig
View File 

@@ -6,9 +6,6 @@ config ARCH_ROCKCHIP
 
 	select ARM_GIC
 
 	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

+ 0 - 5
arch/arm/mach-shmobile/Kconfig
View File 

@@ -5,18 +5,13 @@ 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
 
 	select ARM_GIC
 
-	select MIGHT_HAVE_CACHE_L2X0
 
 	select MIGHT_HAVE_PCI
 
 	select NO_IOPORT
 
 	select PINCTRL
 
 	select ARCH_REQUIRE_GPIOLIB
 
-	select CLKDEV_LOOKUP
 
 
 if ARCH_SHMOBILE_MULTI

+ 0 - 7
arch/arm/mach-socfpga/Kconfig
View File 

@@ -1,17 +1,10 @@
 
 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

+ 0 - 10
arch/arm/mach-spear/Kconfig
View 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,10 @@ 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 +44,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 +75,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"

+ 0 - 4
arch/arm/mach-sti/Kconfig
View File 

@@ -1,14 +1,10 @@
 
 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
 
 	select PINCTRL_ST
 
 	select MFD_SYSCON
 
-	select MIGHT_HAVE_CACHE_L2X0
 
-	select HAVE_SMP
 
 	select HAVE_ARM_SCU if SMP
 
 	select ARCH_REQUIRE_GPIOLIB
 
 	select ARM_ERRATA_754322

+ 0 - 5
arch/arm/mach-sunxi/Kconfig
View File 

@@ -5,14 +5,9 @@ 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

+ 0 - 8
arch/arm/mach-tegra/Kconfig
View File 

@@ -5,24 +5,16 @@ 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
 
-	select MIGHT_HAVE_CACHE_L2X0
 
 	select MIGHT_HAVE_PCI
 
 	select PINCTRL
 
 	select ARCH_HAS_RESET_CONTROLLER
 
 	select RESET_CONTROLLER
 
 	select SOC_BUS
 
-	select SPARSE_IRQ
 
 	select USB_ARCH_HAS_EHCI if USB_SUPPORT
 
 	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.

+ 0 - 6
arch/arm/mach-u300/Kconfig
View 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.

+ 0 - 6
arch/arm/mach-ux500/Kconfig
View File 

@@ -11,13 +11,8 @@ 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
 
-	select MIGHT_HAVE_CACHE_L2X0
 
 	select PINCTRL
 
 	select PINCTRL_ABX500
 
 	select PINCTRL_NOMADIK
 
@@ -76,7 +71,6 @@ config UX500_AUTO_PLATFORM
 
 config MACH_UX500_DT
 
 	bool "Generic U8500 support using device tree"
 
 	depends on MACH_MOP500
 
-	select USE_OF
 
 
 endmenu

+ 0 - 5
arch/arm/mach-vexpress/Kconfig
View File 

@@ -5,16 +5,11 @@ 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
 
-	select HAVE_SMP
 
 	select ICST
 
-	select MIGHT_HAVE_CACHE_L2X0
 
 	select NO_IOPORT
 
 	select PLAT_VERSATILE
 
 	select PLAT_VERSATILE_CLCD

+ 0 - 10
arch/arm/mach-virt/Kconfig
View File 

@@ -1,10 +0,0 @@
 
-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

+ 0 - 5
arch/arm/mach-virt/Makefile
View File 

@@ -1,5 +0,0 @@
 
-#
 
-# Makefile for the linux kernel.
 
-#
 
-
 
-obj-y					:= virt.o

+ 0 - 41
arch/arm/mach-virt/virt.c
View File 

@@ -1,41 +0,0 @@
 
-/*
 
- * Dummy Virtual Machine - does what it says on the tin.
 
- *
 
- * Copyright (C) 2012 ARM Ltd
 
- * Authors: Will Deacon <will.deacon@arm.com>,
 
- *          Marc Zyngier <marc.zyngier@arm.com>
 
- *
 
- * This program is free software; you can redistribute it and/or modify
 
- * it under the terms of the GNU General Public License version 2 as
 
- * published by the Free Software Foundation.
 
- *
 
- * This program is distributed in the hope that it will be useful,
 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
- * GNU General Public License for more details.
 
- *
 
- * You should have received a copy of the GNU General Public License
 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
- */
 
-
 
-#include <linux/of_irq.h>
 
-#include <linux/of_platform.h>
 
-#include <linux/smp.h>
 
-
 
-#include <asm/mach/arch.h>
 
-
 
-static void __init virt_init(void)
 
-{
 
-	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
-}
 
-
 
-static const char *virt_dt_match[] = {
 
-	"linux,dummy-virt",
 
-	"xen,xenvm",
 
-	NULL
 
-};
 
-
 
-DT_MACHINE_START(VIRT, "Dummy Virtual Machine")
 
-	.init_machine	= virt_init,
 
-	.dt_compat	= virt_dt_match,
 
-MACHINE_END

+ 0 - 4
arch/arm/mach-vt8500/Kconfig
View 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
 
@@ -21,7 +19,6 @@ config ARCH_WM8750
 
 	bool "WonderMedia WM8750"
 
 	depends on ARCH_MULTI_V6
 
 	select ARCH_VT8500
 
-	select CPU_V6
 
 	help
 
 	  Support for WonderMedia WM8750 System-on-Chip.
 
 
@@ -29,6 +26,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.

+ 0 - 7
arch/arm/mach-zynq/Kconfig
View File 

@@ -2,16 +2,9 @@ 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