| From c22d03e14635ecd4200062fa4fbd777754eb46db Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Thu, 18 Jul 2013 05:31:09 +0900 |
| Subject: ARM: shmobile: Introduce ARCH_SHMOBILE_MULTI |
| |
| Add ARCH_SHMOBILE_MULTI to mach-shmobile that can be used |
| to enable ARCH_MULTIPLATFORM on selected SoCs and boards. |
| |
| The headers stay under arch/arm/mach-shmobile/include/mach/ |
| for now, they can and will be migrated independently over time. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit efacfce5f8a523457e9419a25d52fe39db00b26a) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/Makefile | 1 + |
| arch/arm/mach-shmobile/Kconfig | 21 +++++++++++++++++++++ |
| arch/arm/mach-shmobile/Makefile | 2 ++ |
| 3 files changed, 24 insertions(+) |
| |
| diff --git a/arch/arm/Makefile b/arch/arm/Makefile |
| index 1ba358ba..f56df13d 100644 |
| --- a/arch/arm/Makefile |
| +++ b/arch/arm/Makefile |
| @@ -181,6 +181,7 @@ machine-$(CONFIG_ARCH_EXYNOS) += exynos |
| machine-$(CONFIG_ARCH_SA1100) += sa1100 |
| machine-$(CONFIG_ARCH_SHARK) += shark |
| machine-$(CONFIG_ARCH_SHMOBILE) += shmobile |
| +machine-$(CONFIG_ARCH_SHMOBILE_MULTI) += shmobile |
| machine-$(CONFIG_ARCH_TEGRA) += tegra |
| machine-$(CONFIG_ARCH_U300) += u300 |
| machine-$(CONFIG_ARCH_U8500) += ux500 |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index 5ae27f21..b6ba366a 100644 |
| --- a/arch/arm/mach-shmobile/Kconfig |
| +++ b/arch/arm/mach-shmobile/Kconfig |
| @@ -1,3 +1,24 @@ |
| +config ARCH_SHMOBILE_MULTI |
| + bool "SH-Mobile Series" if ARCH_MULTI_V7 |
| + depends on MMU |
| + select CPU_V7 |
| + select GENERIC_CLOCKEVENTS |
| + select HAVE_ARM_SCU if SMP |
| + select HAVE_ARM_TWD if LOCAL_TIMERS |
| + select HAVE_SMP |
| + select ARM_GIC |
| + select MIGHT_HAVE_CACHE_L2X0 |
| + select NO_IOPORT |
| + select PINCTRL |
| + select ARCH_REQUIRE_GPIOLIB |
| + select CLKDEV_LOOKUP |
| + |
| +if ARCH_SHMOBILE_MULTI |
| + |
| +comment "SH-Mobile System Type" |
| + |
| +endif |
| + |
| if ARCH_SHMOBILE |
| |
| comment "SH-Mobile System Type" |
| diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile |
| index 28dc9ab3..8bda014c 100644 |
| --- a/arch/arm/mach-shmobile/Makefile |
| +++ b/arch/arm/mach-shmobile/Makefile |
| @@ -2,6 +2,8 @@ |
| # Makefile for the linux kernel. |
| # |
| |
| +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include |
| + |
| # Common objects |
| obj-y := timer.o console.o |
| |
| -- |
| 1.8.4.3.gca3854a |
| |
