Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 370722
b: refs/heads/master
c: 4c3ffff
h: refs/heads/master
v: v3
  • Loading branch information
Stephen Boyd authored and Arnd Bergmann committed Apr 9, 2013
1 parent 3aae99b commit 4fd9949
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 494cc7606180bbf0bd7c82afeaacc45d5035d7cc
refs/heads/master: 4c3ffffdbca2e6f6f5125fa7b149d87a13f92c94
4 changes: 2 additions & 2 deletions trunk/arch/arm/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,8 @@ config ARCH_SHMOBILE
bool "Renesas SH-Mobile / R-Mobile"
select CLKDEV_LOOKUP
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if LOCAL_TIMERS
select HAVE_CLK
select HAVE_MACH_CLKDEV
select HAVE_SMP
Expand Down Expand Up @@ -1400,7 +1402,6 @@ config SMP
depends on GENERIC_CLOCKEVENTS
depends on HAVE_SMP
depends on MMU
select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
select USE_GENERIC_SMP_HELPERS
help
This enables support for systems with more than one CPU. If you have
Expand Down Expand Up @@ -1525,7 +1526,6 @@ config LOCAL_TIMERS
bool "Use local timer interrupts"
depends on SMP
default y
select HAVE_ARM_TWD if (!ARCH_MSM_SCORPIONMP && !EXYNOS4_MCT)
help
Enable support for local timers on SMP platforms, rather then the
legacy IPI broadcast method. Local timers allows the system
Expand Down
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-exynos/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ menu "SAMSUNG EXYNOS SoCs Support"
config ARCH_EXYNOS4
bool "SAMSUNG EXYNOS4"
default y
select HAVE_ARM_SCU if SMP
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
help
Samsung EXYNOS4 SoCs based systems

config ARCH_EXYNOS5
bool "SAMSUNG EXYNOS5"
select HAVE_ARM_SCU if SMP
select HAVE_SMP
help
Samsung EXYNOS5 (Cortex-A15) SoC based systems
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-highbank/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ config ARCH_HIGHBANK
select CPU_V7
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU
select HAVE_ARM_TWD if LOCAL_TIMERS
select HAVE_SMP
select MAILBOX
select PL320_MBOX
Expand Down
3 changes: 2 additions & 1 deletion trunk/arch/arm/mach-imx/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,8 @@ config SOC_IMX6Q
select ARM_GIC
select COMMON_CLK
select CPU_V7
select HAVE_ARM_SCU
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if LOCAL_TIMERS
select HAVE_CAN_FLEXCAN if CAN
select HAVE_IMX_GPC
select HAVE_IMX_MMDC
Expand Down
7 changes: 2 additions & 5 deletions trunk/arch/arm/mach-msm/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,20 @@ endchoice

config ARCH_MSM8X60
bool "MSM8X60"
select ARCH_MSM_SCORPIONMP
select ARM_GIC
select CPU_V7
select GPIO_MSM_V2
select HAVE_SMP
select MSM_GPIOMUX
select MSM_SCM if SMP
select MSM_V2_TLMM
select USE_OF

config ARCH_MSM8960
bool "MSM8960"
select ARCH_MSM_SCORPIONMP
select ARM_GIC
select CPU_V7
select HAVE_SMP
select MSM_GPIOMUX
select MSM_SCM if SMP
select MSM_V2_TLMM
Expand All @@ -68,9 +68,6 @@ config MSM_HAS_DEBUG_UART_HS

config MSM_SOC_REV_A
bool
config ARCH_MSM_SCORPIONMP
bool
select HAVE_SMP

config ARCH_MSM_ARM11
bool
Expand Down
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-omap2/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ config ARCH_OMAP4
select ARM_GIC
select CACHE_L2X0
select CPU_V7
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if LOCAL_TIMERS
select HAVE_SMP
select LOCAL_TIMERS if SMP
select OMAP_INTERCONNECT
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-prima2/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ config ARCH_MARCO
default y
select ARM_GIC
select CPU_V7
select HAVE_ARM_SCU if SMP
select HAVE_SMP
select SMP_ON_UP
help
Expand Down
8 changes: 8 additions & 0 deletions trunk/arch/arm/mach-realview/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ config REALVIEW_EB_A9MP
bool "Support Multicore Cortex-A9 Tile"
depends on MACH_REALVIEW_EB
select CPU_V7
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if LOCAL_TIMERS
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
help
Expand All @@ -23,6 +25,8 @@ config REALVIEW_EB_ARM11MP
depends on MACH_REALVIEW_EB
select ARCH_HAS_BARRIERS if SMP
select CPU_V6K
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if LOCAL_TIMERS
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
help
Expand All @@ -43,6 +47,8 @@ config MACH_REALVIEW_PB11MP
select ARCH_HAS_BARRIERS if SMP
select ARM_GIC
select CPU_V6K
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if LOCAL_TIMERS
select HAVE_PATA_PLATFORM
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
Expand Down Expand Up @@ -85,6 +91,8 @@ config MACH_REALVIEW_PBX
bool "Support RealView(R) Platform Baseboard Explore"
select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET
select ARM_GIC
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if LOCAL_TIMERS
select HAVE_PATA_PLATFORM
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
Expand Down
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-spear/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ config ARCH_SPEAR13XX
select ARM_GIC
select CPU_V7
select GPIO_SPEAR_SPICS
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if LOCAL_TIMERS
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
select PINCTRL
Expand Down
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-tegra/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ config ARCH_TEGRA
select CLKSRC_OF
select COMMON_CLK
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if LOCAL_TIMERS
select HAVE_CLK
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
Expand Down
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-ux500/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ config ARCH_U8500
select CLKDEV_LOOKUP
select CPU_V7
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if LOCAL_TIMERS
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
help
Expand Down
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-vexpress/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ config ARCH_VEXPRESS
select COMMON_CLK_VERSATILE
select CPU_V7
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if LOCAL_TIMERS
select HAVE_CLK
select HAVE_PATA_PLATFORM
select HAVE_SMP
Expand Down
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-zynq/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ config ARCH_ZYNQ
select COMMON_CLK
select CPU_V7
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if LOCAL_TIMERS
select ICST
select MIGHT_HAVE_CACHE_L2X0
select USE_OF
Expand Down

0 comments on commit 4fd9949

Please sign in to comment.