ARM: EXYNOS: Enable multi-platform build support

This makes it possible to enable the Exynos platform as part of a
multiplatform kernel.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ccacd23e703c47026ab10961497d21d297da4534..c08413c2d1854bd5b4c7edbf10deaacb53ba983b 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -829,35 +829,6 @@ config ARCH_S5PV210
        help
          Samsung S5PV210/S5PC110 series based systems
 
-config ARCH_EXYNOS
-       bool "Samsung EXYNOS"
-       select ARCH_HAS_BANDGAP
-       select ARCH_HAS_CPUFREQ
-       select ARCH_HAS_HOLES_MEMORYMODEL
-       select ARCH_REQUIRE_GPIOLIB
-       select ARCH_SPARSEMEM_ENABLE
-       select ARM_AMBA
-       select ARM_GIC
-       select CLKSRC_OF
-       select COMMON_CLK_SAMSUNG
-       select CPU_V7
-       select GENERIC_CLOCKEVENTS
-       select HAVE_ARM_SCU if SMP
-       select HAVE_S3C2410_I2C if I2C
-       select HAVE_S3C2410_WATCHDOG if WATCHDOG
-       select HAVE_S3C_RTC if RTC_CLASS
-       select HAVE_SMP
-       select NEED_MACH_MEMORY_H
-       select PINCTRL
-       select PINCTRL_EXYNOS
-       select PM_GENERIC_DOMAINS if PM_RUNTIME
-       select S5P_DEV_MFC
-       select SAMSUNG_DMADEV
-       select SPARSE_IRQ
-       select USE_OF
-       help
-         Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5)
-
 config ARCH_DAVINCI
        bool "TI DaVinci"
        select ARCH_HAS_HOLES_MEMORYMODEL

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 28f1a61091c7822fc538c3d96713001dec600df1..0031a57aad94b30040012445049a69e5b1ccc36d 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -7,6 +7,27 @@
 
 # Configuration options for the EXYNOS4
 
+config ARCH_EXYNOS
+       bool "Samsung EXYNOS" if ARCH_MULTI_V7
+       select ARCH_HAS_BANDGAP
+       select ARCH_HAS_CPUFREQ
+       select ARCH_HAS_HOLES_MEMORYMODEL
+       select ARCH_REQUIRE_GPIOLIB
+       select ARM_AMBA
+       select ARM_GIC
+       select COMMON_CLK_SAMSUNG
+       select HAVE_ARM_SCU if SMP
+       select HAVE_S3C2410_I2C if I2C
+       select HAVE_S3C2410_WATCHDOG if WATCHDOG
+       select HAVE_S3C_RTC if RTC_CLASS
+       select PINCTRL
+       select PINCTRL_EXYNOS
+       select PM_GENERIC_DOMAINS if PM_RUNTIME
+       select S5P_DEV_MFC
+       select SRAM
+       help
+         Support for SAMSUNG EXYNOS SoCs (EXYNOS4/5)
+
 if ARCH_EXYNOS
 
 menu "SAMSUNG EXYNOS SoCs Support"

diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
index f6dcc256db56f1772dc762958b11a3c504435054..24a8efe3d4bd3145b29fb0c37d1be7f5adea4ba8 100644 (file)
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@ -5,6 +5,8 @@
 #
 # Licensed under GPLv2
 
+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include
+
 obj-y                          :=
 obj-m                          :=
 obj-n                          :=

diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 25c826ed3b65c6ce0afa2867eb748a1e4112dc1d..5e5beaa9ae15332483adef679078c0fe49cf5121 100644 (file)
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -4,6 +4,9 @@
 #
 # Licensed under GPLv2
 
+ccflags-$(CONFIG_ARCH_MULTI_V7) += -I$(srctree)/$(src)/include
+ccflags-$(CONFIG_ARCH_EXYNOS)  += -I$(srctree)/arch/arm/mach-exynos/include
+
 obj-y                          :=
 obj-m                          :=
 obj-n                          := dummy.o