Skip to content

Commit

Permalink
ARM: S5P6442: Update Kconfig and Makefiles
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kukjin Kim authored and Ben Dooks committed Feb 24, 2010
1 parent d13de2a commit 550db7f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
12 changes: 11 additions & 1 deletion arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions arch/arm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/plat-s5p/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 550db7f

Please sign in to comment.