aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2010-01-29 10:19:26 +0900
committerBen Dooks <ben-linux@fluff.org>2010-02-24 01:52:17 +0000
commit550db7f155c9e51288fbe114fbb33d7a044d8a75 (patch)
tree723170fde69dc87f383d8f3a9d20cb6a2870d5cb
parentd13de2ab8a7afe2d915be4c4758fe25825204226 (diff)
downloadmrst-s0i3-test-550db7f155c9e51288fbe114fbb33d7a044d8a75.tar.gz
mrst-s0i3-test-550db7f155c9e51288fbe114fbb33d7a044d8a75.tar.xz
mrst-s0i3-test-550db7f155c9e51288fbe114fbb33d7a044d8a75.zip
ARM: S5P6442: Update Kconfig and Makefiles
Updates arch/arm Kconfig and Makefile for building the S5P6442 support. Also modifies the plat-s5p Kconfig file to include the support for plat-s5p for S5P6442. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r--arch/arm/Kconfig12
-rw-r--r--arch/arm/Makefile1
-rw-r--r--arch/arm/plat-s5p/Kconfig2
3 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fd4882e61dd..ac5f74b0f03 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -656,6 +656,14 @@ config ARCH_S5P6440
help
Samsung S5P6440 CPU based systems
+config ARCH_S5P6442
+ bool "Samsung S5P6442"
+ select CPU_V6
+ select GENERIC_GPIO
+ select HAVE_CLK
+ help
+ Samsung S5P6442 CPU based systems
+
config ARCH_S5PC1XX
bool "Samsung S5PC1XX"
select GENERIC_GPIO
@@ -816,6 +824,8 @@ endif
source "arch/arm/mach-s5p6440/Kconfig"
+source "arch/arm/mach-s5p6442/Kconfig"
+
source "arch/arm/plat-stmp3xxx/Kconfig"
if ARCH_S5PC1XX
@@ -1096,7 +1106,7 @@ source kernel/Kconfig.preempt
config HZ
int
default 128 if ARCH_L7200
- default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440
+ default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442
default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
default AT91_TIMER_HZ if ARCH_AT91
default 100
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 13c5c2be31a..fc8cc4ba0fb 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -162,6 +162,7 @@ machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2443
machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0
machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx
machine-$(CONFIG_ARCH_S5P6440) := s5p6440
+machine-$(CONFIG_ARCH_S5P6442) := s5p6442
machine-$(CONFIG_ARCH_S5PC1XX) := s5pc100
machine-$(CONFIG_ARCH_SA1100) := sa1100
machine-$(CONFIG_ARCH_SHARK) := shark
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
index e5d1305764a..7cf7f5e2c5f 100644
--- a/arch/arm/plat-s5p/Kconfig
+++ b/arch/arm/plat-s5p/Kconfig
@@ -7,7 +7,7 @@
config PLAT_S5P
bool
- depends on ARCH_S5P6440
+ depends on (ARCH_S5P6440 || ARCH_S5P6442)
default y
select ARM_VIC
select NO_IOPORT