Skip to contentSkip to conversation

ARM: S5P6442: Update Kconfig and Makefiles

PATCH Superseded Kukjin Kim 2 participants 2 messages Jan 29, 2010

Subsystems (2)
Arm (32-bit) Arm sub-architectures

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Kukjin Kim

author
#0 lore raw

PATCH v2 4/7 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 <[email protected]>
---
 arch/arm/Kconfig          |   12 +++++++++++-
 arch/arm/Makefile         |    1 +
 arch/arm/plat-s5p/Kconfig |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
arch/arm/Kconfig +11 -1
index 3bc5169..a3b0551 100644
@@ -641,6 +641,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

@@ -805,6 +813,8 @@ endif
 
 source "arch/arm/mach-s5p6440/Kconfig"
 
+source "arch/arm/mach-s5p6442/Kconfig"
+
 source "arch/arm/plat-stmp3xxx/Kconfig"
 
 if ARCH_S5PC1XX

@@ -1085,7 +1095,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
arch/arm/Makefile +1 -0
index bbcd512..553fe62 100644
@@ -162,6 +162,7 @@ machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c24
 machine-$(CONFIG_ARCH_S3C24A0)		:= s3c24a0
 machine-$(CONFIG_ARCH_S3C64XX)		:= s3c6400 s3c6410
 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
arch/arm/plat-s5p/Kconfig +1 -1
index fca6dad..2151949 100644
@@ -7,7 +7,7 @@
 
 config PLAT_S5P
 	bool
-	depends on ARCH_S5P6440
+	depends on (ARCH_S5P6440 || ARCH_S5P6442)
 	default y
 	select PLAT_S3C
 	select ARM_VIC
Signature · 1 line
1.6.2.5
#1 lore raw

PATCH v2 4/7 ARM: S5P6442: Update Kconfig and Makefiles

Quoted 65 lines · Kukjin Kim

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 <[email protected]>
---
 arch/arm/Kconfig          |   12 +++++++++++-
 arch/arm/Makefile         |    1 +
 arch/arm/plat-s5p/Kconfig |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
arch/arm/Kconfig +11 -1
index 3bc5169..a3b0551 100644
@@ -641,6 +641,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

@@ -805,6 +813,8 @@ endif
 
 source "arch/arm/mach-s5p6440/Kconfig"
 
+source "arch/arm/mach-s5p6442/Kconfig"
+
 source "arch/arm/plat-stmp3xxx/Kconfig"
 
 if ARCH_S5PC1XX

@@ -1085,7 +1095,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
arch/arm/Makefile +1 -0
index bbcd512..553fe62 100644
@@ -162,6 +162,7 @@ machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c24
 machine-$(CONFIG_ARCH_S3C24A0)		:= s3c24a0
 machine-$(CONFIG_ARCH_S3C64XX)		:= s3c6400 s3c6410
 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
arch/arm/plat-s5p/Kconfig +0 -0
index fca6dad..2151949 100644

arch/arm/plat-s5p/Kconfig line 10

Quoted 5 lines
arch/arm/plat-s5p/Kconfig +1 -1
@@ -7,7 +7,7 @@
 
 config PLAT_S5P
 	bool
-	depends on ARCH_S5P6440
+	depends on (ARCH_S5P6440 || ARCH_S5P6442)

Think we should probably turn this aorund into a select from each ARCH. This however can be left until later.

Quoted 6 lines
arch/arm/plat-s5p/Kconfig +0 -0
 	default y
 	select PLAT_S3C
 	select ARM_VIC
Signature · 1 line
1.6.2.5
Signature · 5 lines
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.