dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable

This commit is contained in:
Russell King 2011-12-19 21:54:35 +00:00
parent 215e83d971 a2075a7aff
commit df0bcfe0f8
9 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arch/arm/Kconfig
View File

@ -340,10 +340,12 @@ config ARCH_HIGHBANK
select ARM_AMBA select ARM_AMBA
select ARM_GIC select ARM_GIC
select ARM_TIMER_SP804 select ARM_TIMER_SP804
select CACHE_L2X0
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select CPU_V7 select CPU_V7
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU select HAVE_ARM_SCU
select HAVE_SMP
select USE_OF select USE_OF
help help
Support for the Calxeda Highbank SoC based boards. Support for the Calxeda Highbank SoC based boards.
@ -361,6 +363,7 @@ config ARCH_CNS3XXX
select CPU_V6K select CPU_V6K
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select ARM_GIC select ARM_GIC
select MIGHT_HAVE_CACHE_L2X0
select MIGHT_HAVE_PCI select MIGHT_HAVE_PCI
select PCI_DOMAINS if PCI select PCI_DOMAINS if PCI
help help
@ -381,6 +384,7 @@ config ARCH_PRIMA2
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select MIGHT_HAVE_CACHE_L2X0
select USE_OF select USE_OF
select ZONE_DMA select ZONE_DMA
help help
@ -633,6 +637,8 @@ config ARCH_TEGRA
select GENERIC_GPIO select GENERIC_GPIO
select HAVE_CLK select HAVE_CLK
select HAVE_SCHED_CLOCK select HAVE_SCHED_CLOCK
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
select ARCH_HAS_CPUFREQ select ARCH_HAS_CPUFREQ
help help
This enables support for NVIDIA Tegra based systems (Tegra APX, This enables support for NVIDIA Tegra based systems (Tegra APX,
@ -702,7 +708,9 @@ config ARCH_SHMOBILE
select HAVE_CLK select HAVE_CLK
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select HAVE_MACH_CLKDEV select HAVE_MACH_CLKDEV
select HAVE_SMP
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select MIGHT_HAVE_CACHE_L2X0
select NO_IOPORT select NO_IOPORT
select SPARSE_IRQ select SPARSE_IRQ
select MULTI_IRQ_HANDLER select MULTI_IRQ_HANDLER
@ -904,6 +912,8 @@ config ARCH_U8500
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select ARCH_HAS_CPUFREQ select ARCH_HAS_CPUFREQ
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
help help
Support for ST-Ericsson's Ux500 architecture Support for ST-Ericsson's Ux500 architecture
@ -914,6 +924,7 @@ config ARCH_NOMADIK
select CPU_ARM926T select CPU_ARM926T
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select MIGHT_HAVE_CACHE_L2X0
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
help help
Support for the Nomadik platform by ST-Ericsson Support for the Nomadik platform by ST-Ericsson
@ -973,6 +984,7 @@ config ARCH_ZYNQ
select ARM_GIC select ARM_GIC
select ARM_AMBA select ARM_AMBA
select ICST select ICST
select MIGHT_HAVE_CACHE_L2X0
select USE_OF select USE_OF
help help
Support for Xilinx Zynq ARM Cortex A9 Platform Support for Xilinx Zynq ARM Cortex A9 Platform
@ -1434,14 +1446,20 @@ menu "Kernel Features"
source "kernel/time/Kconfig" source "kernel/time/Kconfig"
config HAVE_SMP
bool
help
This option should be selected by machines which have an SMP-
capable CPU.
The only effect of this option is to make the SMP-related
options available to the user for configuration.
config SMP config SMP
bool "Symmetric Multi-Processing" bool "Symmetric Multi-Processing"
depends on CPU_V6K || CPU_V7 depends on CPU_V6K || CPU_V7
depends on GENERIC_CLOCKEVENTS depends on GENERIC_CLOCKEVENTS
depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \ depends on HAVE_SMP
MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK || SOC_IMX6Q
depends on MMU depends on MMU
select USE_GENERIC_SMP_HELPERS select USE_GENERIC_SMP_HELPERS
select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP

2
arch/arm/mach-exynos/Kconfig
View File

@ -17,6 +17,8 @@ choice
config ARCH_EXYNOS4 config ARCH_EXYNOS4
bool "SAMSUNG EXYNOS4" bool "SAMSUNG EXYNOS4"
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
help help
Samsung EXYNOS4 SoCs based systems Samsung EXYNOS4 SoCs based systems

2
arch/arm/mach-imx/Kconfig
View File

@ -596,12 +596,12 @@ comment "i.MX6 family:"
config SOC_IMX6Q config SOC_IMX6Q
bool "i.MX6 Quad support" bool "i.MX6 Quad support"
select ARM_GIC select ARM_GIC
select CACHE_L2X0
select CPU_V7 select CPU_V7
select HAVE_ARM_SCU select HAVE_ARM_SCU
select HAVE_IMX_GPC select HAVE_IMX_GPC
select HAVE_IMX_MMDC select HAVE_IMX_MMDC
select HAVE_IMX_SRC select HAVE_IMX_SRC
select HAVE_SMP
select USE_OF select USE_OF
help help

1
arch/arm/mach-msm/Kconfig
View File

@ -67,6 +67,7 @@ config MSM_SOC_REV_A
bool bool
config ARCH_MSM_SCORPIONMP config ARCH_MSM_SCORPIONMP
bool bool
select HAVE_SMP
config ARCH_MSM_ARM11 config ARCH_MSM_ARM11
bool bool

2
arch/arm/mach-omap2/Kconfig
View File

@ -43,8 +43,10 @@ config ARCH_OMAP4
bool "TI OMAP4" bool "TI OMAP4"
default y default y
depends on ARCH_OMAP2PLUS depends on ARCH_OMAP2PLUS
select CACHE_L2X0
select CPU_V7 select CPU_V7
select ARM_GIC select ARM_GIC
select HAVE_SMP
select LOCAL_TIMERS if SMP select LOCAL_TIMERS if SMP
select PL310_ERRATA_588369 select PL310_ERRATA_588369
select PL310_ERRATA_727915 select PL310_ERRATA_727915

9
arch/arm/mach-realview/Kconfig
View File

@ -12,6 +12,8 @@ config REALVIEW_EB_A9MP
bool "Support Multicore Cortex-A9 Tile" bool "Support Multicore Cortex-A9 Tile"
depends on MACH_REALVIEW_EB depends on MACH_REALVIEW_EB
select CPU_V7 select CPU_V7
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
help help
Enable support for the Cortex-A9MPCore tile fitted to the Enable support for the Cortex-A9MPCore tile fitted to the
Realview(R) Emulation Baseboard platform. Realview(R) Emulation Baseboard platform.
@ -21,6 +23,8 @@ config REALVIEW_EB_ARM11MP
depends on MACH_REALVIEW_EB depends on MACH_REALVIEW_EB
select CPU_V6K select CPU_V6K
select ARCH_HAS_BARRIERS if SMP select ARCH_HAS_BARRIERS if SMP
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
help help
Enable support for the ARM11MPCore tile fitted to the Realview(R) Enable support for the ARM11MPCore tile fitted to the Realview(R)
Emulation Baseboard platform. Emulation Baseboard platform.
@ -39,6 +43,8 @@ config MACH_REALVIEW_PB11MP
select CPU_V6K select CPU_V6K
select ARM_GIC select ARM_GIC
select HAVE_PATA_PLATFORM select HAVE_PATA_PLATFORM
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
select ARCH_HAS_BARRIERS if SMP select ARCH_HAS_BARRIERS if SMP
help help
Include support for the ARM(R) RealView(R) Platform Baseboard for Include support for the ARM(R) RealView(R) Platform Baseboard for
@ -51,6 +57,7 @@ config MACH_REALVIEW_PB1176
select CPU_V6 select CPU_V6
select ARM_GIC select ARM_GIC
select HAVE_TCM select HAVE_TCM
select MIGHT_HAVE_CACHE_L2X0
help help
Include support for the ARM(R) RealView(R) Platform Baseboard for Include support for the ARM(R) RealView(R) Platform Baseboard for
ARM1176JZF-S. ARM1176JZF-S.
@ -78,6 +85,8 @@ config MACH_REALVIEW_PBX
bool "Support RealView(R) Platform Baseboard Explore" bool "Support RealView(R) Platform Baseboard Explore"
select ARM_GIC select ARM_GIC
select HAVE_PATA_PLATFORM select HAVE_PATA_PLATFORM
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET
select ZONE_DMA if SPARSEMEM select ZONE_DMA if SPARSEMEM
help help

2
arch/arm/mach-vexpress/Kconfig
View File

@ -8,5 +8,7 @@ config ARCH_VEXPRESS_CA9X4
select ARM_ERRATA_720789 select ARM_ERRATA_720789
select ARM_ERRATA_751472 select ARM_ERRATA_751472
select ARM_ERRATA_753970 select ARM_ERRATA_753970
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
endmenu endmenu

23
arch/arm/mm/Kconfig
View File

@ -833,14 +833,23 @@ config CACHE_FEROCEON_L2_WRITETHROUGH
Say Y here to use the Feroceon L2 cache in writethrough mode. Say Y here to use the Feroceon L2 cache in writethrough mode.
Unless you specifically require this, say N for writeback mode. Unless you specifically require this, say N for writeback mode.
config MIGHT_HAVE_CACHE_L2X0
bool
help
This option should be selected by machines which have a L2x0
or PL310 cache controller, but where its use is optional.
The only effect of this option is to make CACHE_L2X0 and
related options available to the user for configuration.
Boards or SoCs which always require the cache controller
support to be present should select CACHE_L2X0 directly
instead of this option, thus preventing the user from
inadvertently configuring a broken kernel.
config CACHE_L2X0 config CACHE_L2X0
bool "Enable the L2x0 outer cache controller" bool "Enable the L2x0 outer cache controller" if MIGHT_HAVE_CACHE_L2X0
depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ default MIGHT_HAVE_CACHE_L2X0
REALVIEW_EB_A9MP || ARCH_IMX_V6_V7 || MACH_REALVIEW_PBX || \
ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \
ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \
ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX || ARCH_HIGHBANK
default y
select OUTER_CACHE select OUTER_CACHE
select OUTER_CACHE_SYNC select OUTER_CACHE_SYNC
help help

1
arch/arm/plat-mxc/Kconfig
View File

@ -20,6 +20,7 @@ config ARCH_IMX_V6_V7
bool "i.MX3, i.MX6" bool "i.MX3, i.MX6"
select AUTO_ZRELADDR if !ZBOOT_ROM select AUTO_ZRELADDR if !ZBOOT_ROM
select ARM_PATCH_PHYS_VIRT select ARM_PATCH_PHYS_VIRT
select MIGHT_HAVE_CACHE_L2X0
help help
This enables support for systems based on the Freescale i.MX3 and i.MX6 This enables support for systems based on the Freescale i.MX3 and i.MX6
family. family.