Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49b7a491 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: S5P64X0: Update Kconfig and Makefile 



This patch updates the Kconfig and Makefile for the S5P6440 and S5P6450
machines. It also updates arch/arm/ Kconfig and Makefile to include for
support ARCH_S5P64X0 with one kernel image.

Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 19a2c065

arch/arm/Kconfig

+6 −5
Original line number Diff line number Diff line
@@ -678,8 +678,8 @@ config ARCH_S3C64XX 
	help

	  Samsung S3C64XX series based systems



config ARCH_S5P6440

	bool "Samsung S5P6440"

config ARCH_S5P64X0

	bool "Samsung S5P6440 S5P6450"

	select CPU_V6

	select GENERIC_GPIO

	select HAVE_CLK
@@ -688,7 +688,8 @@ config ARCH_S5P6440 
	select HAVE_S3C2410_I2C

	select HAVE_S3C_RTC

	help

	  Samsung S5P6440 CPU based systems

	  Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,

	  SMDK6450.



config ARCH_S5P6442

	bool "Samsung S5P6442"
@@ -928,7 +929,7 @@ if ARCH_S3C64XX 
source "arch/arm/mach-s3c64xx/Kconfig"

endif



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

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



source "arch/arm/mach-s5p6442/Kconfig"
@@ -1271,7 +1272,7 @@ source kernel/Kconfig.preempt 


config HZ

	int

	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || \

	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P64X0 || \

		ARCH_S5P6442 || ARCH_S5PV210 || ARCH_S5PV310

	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER

	default AT91_TIMER_HZ if ARCH_AT91

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ machine-$(CONFIG_ARCH_RPC) := rpc 
machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c2443

machine-$(CONFIG_ARCH_S3C24A0)		:= s3c24a0

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c64xx

machine-$(CONFIG_ARCH_S5P6440)		:= s5p6440

machine-$(CONFIG_ARCH_S5P64X0)		:= s5p64x0

machine-$(CONFIG_ARCH_S5P6442)		:= s5p6442

machine-$(CONFIG_ARCH_S5PC100)		:= s5pc100

machine-$(CONFIG_ARCH_S5PV210)		:= s5pv210

arch/arm/mach-s5p6440/Kconfig→arch/arm/mach-s5p64x0/Kconfig

+57 −0
Original line number Diff line number Diff line 
# arch/arm/mach-s5p6440/Kconfig

# arch/arm/mach-s5p64x0/Kconfig

#

# Copyright (c) 2009 Samsung Electronics Co., Ltd.

# Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.

#		http://www.samsung.com/

#

# Licensed under GPLv2



if ARCH_S5P6440

if ARCH_S5P64X0



config CPU_S5P6440

	bool

	select PLAT_S5P

	select S3C_PL330_DMA

	help

	  Enable S5P6440 CPU support



config S5P6440_SETUP_I2C1

config CPU_S5P6450

	bool

	select PLAT_S5P

	select S3C_PL330_DMA

	help

	  Enable S5P6450 CPU support



config S5P64X0_SETUP_I2C1

	bool

	help

	  Common setup code for i2c bus 1.



# machine support



config MACH_SMDK6440

	bool "SMDK6440"

	select CPU_S5P6440

	select S3C_DEV_I2C1

	select S3C_DEV_RTC

	select S3C_DEV_WDT

	select S3C64XX_DEV_SPI

	select SAMSUNG_DEV_ADC

	select SAMSUNG_DEV_TS

	select S5P6440_SETUP_I2C1

	select S5P64X0_SETUP_I2C1

	help

	  Machine support for the Samsung SMDK6440



config MACH_SMDK6450

	bool "SMDK6450"

	select CPU_S5P6450

	select S3C_DEV_I2C1

	select S3C_DEV_RTC

	select S3C_DEV_WDT

	select S3C64XX_DEV_SPI

	select SAMSUNG_DEV_ADC

	select SAMSUNG_DEV_TS

	select S5P64X0_SETUP_I2C1

	help

	  Machine support for the Samsung SMDK6450



endif

arch/arm/mach-s5p6440/Makefile→arch/arm/mach-s5p64x0/Makefile

+30 −0
Original line number Diff line number Diff line 
# arch/arm/mach-s5p6440/Makefile

# arch/arm/mach-s5p64x0/Makefile

#

# Copyright (c) 2009 Samsung Electronics Co., Ltd.

# 		http://www.samsung.com/

# Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.

# 		http://www.samsung.com

#

# Licensed under GPLv2
@@ -10,16 +10,21 @@ obj-m := 
obj-n				:=

obj-				:=



# Core support for S5P6440 system

# Core support for S5P64X0 system



obj-$(CONFIG_CPU_S5P6440)	+= cpu.o init.o clock.o gpio.o dma.o

obj-$(CONFIG_CPU_S5P6440)	+= setup-i2c0.o

obj-$(CONFIG_ARCH_S5P64X0)	+= cpu.o init.o clock.o dma.o

obj-$(CONFIG_ARCH_S5P64X0)	+= setup-i2c0.o

obj-$(CONFIG_CPU_S5P6440)	+= clock-s5p6440.o gpio.o

obj-$(CONFIG_CPU_S5P6450)	+= clock-s5p6450.o



# machine support



obj-$(CONFIG_MACH_SMDK6440)	+= mach-smdk6440.o

obj-$(CONFIG_MACH_SMDK6450)	+= mach-smdk6450.o



# device support



obj-y				+= dev-audio.o

obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o

obj-$(CONFIG_S5P6440_SETUP_I2C1)	+= setup-i2c1.o
 


obj-$(CONFIG_S5P64X0_SETUP_I2C1)	+= setup-i2c1.o