Skip to content

Commit

Permalink
ARM: S5P6440: Add new Kconfig and Makefiles
Browse files Browse the repository at this point in the history
This patch adds the Kconfig and Makefile for the new S5P6440 machine
and platform directories. It also updates arch/arm Kconfig and Makefiles
to include the support for the new S5P6440 CPU.

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 Jan 15, 2010
1 parent 5f3545f commit c4ffccd
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 1 deletion.
13 changes: 12 additions & 1 deletion arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,14 @@ config ARCH_S3C64XX
help
Samsung S3C64XX series based systems

config ARCH_S5P6440
bool "Samsung S5P6440"
select CPU_V6
select GENERIC_GPIO
select HAVE_CLK
help
Samsung S5P6440 CPU based systems

config ARCH_S5PC1XX
bool "Samsung S5PC1XX"
select GENERIC_GPIO
Expand Down Expand Up @@ -778,6 +786,7 @@ source "arch/arm/plat-samsung/Kconfig"
source "arch/arm/plat-s3c24xx/Kconfig"
source "arch/arm/plat-s3c64xx/Kconfig"
source "arch/arm/plat-s3c/Kconfig"
source "arch/arm/plat-s5p/Kconfig"
source "arch/arm/plat-s5pc1xx/Kconfig"

if ARCH_S3C2410
Expand All @@ -794,6 +803,8 @@ source "arch/arm/mach-s3c6400/Kconfig"
source "arch/arm/mach-s3c6410/Kconfig"
endif

source "arch/arm/mach-s5p6440/Kconfig"

source "arch/arm/plat-stmp3xxx/Kconfig"

if ARCH_S5PC1XX
Expand Down Expand Up @@ -1074,7 +1085,7 @@ source kernel/Kconfig.preempt
config HZ
int
default 128 if ARCH_L7200
default 200 if ARCH_EBSA110 || ARCH_S3C2410
default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440
default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
default AT91_TIMER_HZ if ARCH_AT91
default 100
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ machine-$(CONFIG_ARCH_RPC) := rpc
machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0
machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410
machine-$(CONFIG_ARCH_S5P6440) := s5p6440
machine-$(CONFIG_ARCH_S5PC1XX) := s5pc100
machine-$(CONFIG_ARCH_SA1100) := sa1100
machine-$(CONFIG_ARCH_SHARK) := shark
Expand All @@ -184,6 +185,7 @@ plat-$(CONFIG_PLAT_PXA) := pxa
plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c samsung
plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c samsung
plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c samsung
plat-$(CONFIG_PLAT_S5P) := s5p samsung s3c
plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx

ifeq ($(CONFIG_ARCH_EBSA110),y)
Expand Down
23 changes: 23 additions & 0 deletions arch/arm/mach-s5p6440/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# arch/arm/mach-s5p6440/Kconfig
#
# Copyright (c) 2009 Samsung Electronics Co., Ltd.
# http://www.samsung.com/
#
# Licensed under GPLv2

if ARCH_S5P6440

config CPU_S5P6440
bool
select CPU_S5P6440_INIT
select CPU_S5P6440_CLOCK
help
Enable S5P6440 CPU support

config MACH_SMDK6440
bool "SMDK6440"
select CPU_S5P6440
help
Machine support for the Samsung SMDK6440

endif
19 changes: 19 additions & 0 deletions arch/arm/mach-s5p6440/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# arch/arm/mach-s5p6440/Makefile
#
# Copyright (c) 2009 Samsung Electronics Co., Ltd.
# http://www.samsung.com/
#
# Licensed under GPLv2

obj-y :=
obj-m :=
obj-n :=
obj- :=

# Core support for S5P6440 system

obj-$(CONFIG_CPU_S5P6440) += cpu.o

# machine support

obj-$(CONFIG_MACH_SMDK6440) += mach-smdk6440.o
2 changes: 2 additions & 0 deletions arch/arm/mach-s5p6440/Makefile.boot
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
zreladdr-y := 0x20008000
params_phys-y := 0x20000100
38 changes: 38 additions & 0 deletions arch/arm/plat-s5p/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# arch/arm/plat-s5p/Kconfig
#
# Copyright (c) 2009 Samsung Electronics Co., Ltd.
# http://www.samsung.com/
#
# Licensed under GPLv2

config PLAT_S5P
bool
depends on ARCH_S5P6440
default y
select PLAT_S3C
select ARM_VIC
select NO_IOPORT
select ARCH_REQUIRE_GPIOLIB
select S3C_GPIO_TRACK
select PLAT_SAMSUNG
select SAMSUNG_CLKSRC
select SAMSUNG_IRQ_VIC_TIMER
select SAMSUNG_IRQ_UART
help
Base platform code for Samsung's S5P series SoC.

if (PLAT_S5P && ARCH_S5P6440)

# Configuration options shared by all S5P64XX implementations

config CPU_S5P6440_INIT
bool
help
Initialisation code for the S5P6440.

config CPU_S5P6440_CLOCK
bool
help
Clock support code for the S5P6440.

endif
24 changes: 24 additions & 0 deletions arch/arm/plat-s5p/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# arch/arm/plat-s5p/Makefile
#
# Copyright (c) 2009 Samsung Electronics Co., Ltd.
# http://www.samsung.com/
#
# Licensed under GPLv2

obj-y :=
obj-m :=
obj-n := dummy.o
obj- :=

# Core files

obj-y += dev-uart.o
obj-y += cpu.o
obj-y += clock.o
obj-y += irq.o
obj-y += setup-i2c0.o

# CPU support

obj-$(CONFIG_CPU_S5P6440_INIT) += s5p6440-init.o
obj-$(CONFIG_CPU_S5P6440_CLOCK) += s5p6440-clock.o

0 comments on commit c4ffccd

Please sign in to comment.