Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187698
b: refs/heads/master
c: 170f4e4
h: refs/heads/master
v: v3
  • Loading branch information
Kukjin Kim authored and Ben Dooks committed Feb 24, 2010
1 parent b1e3375 commit ab7d146
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2c798557b9e0961e545e526197654d9437a6330e
refs/heads/master: 170f4e425808b801f81bb6be24b2c1eb80313d8e
13 changes: 12 additions & 1 deletion trunk/arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,15 @@ config ARCH_S5PC1XX
help
Samsung S5PC1XX series based systems

config ARCH_S5PV210
bool "Samsung S5PV210/S5PC110"
select CPU_V7
select GENERIC_GPIO
select HAVE_CLK
select ARM_L1_CACHE_SHIFT_6
help
Samsung S5PV210/S5PC110 series based systems

config ARCH_SHARK
bool "Shark"
select CPU_SA110
Expand Down Expand Up @@ -832,6 +841,8 @@ if ARCH_S5PC1XX
source "arch/arm/mach-s5pc100/Kconfig"
endif

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

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

source "arch/arm/mach-h720x/Kconfig"
Expand Down Expand Up @@ -1106,7 +1117,7 @@ source kernel/Kconfig.preempt
config HZ
int
default 128 if ARCH_L7200
default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442
default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210
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 trunk/arch/arm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx
machine-$(CONFIG_ARCH_S5P6440) := s5p6440
machine-$(CONFIG_ARCH_S5P6442) := s5p6442
machine-$(CONFIG_ARCH_S5PC1XX) := s5pc100
machine-$(CONFIG_ARCH_S5PV210) := s5pv210
machine-$(CONFIG_ARCH_SA1100) := sa1100
machine-$(CONFIG_ARCH_SHARK) := shark
machine-$(CONFIG_ARCH_STMP378X) := stmp378x
Expand Down
2 changes: 1 addition & 1 deletion trunk/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 || ARCH_S5P6442)
depends on (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210)
default y
select ARM_VIC
select NO_IOPORT
Expand Down

0 comments on commit ab7d146

Please sign in to comment.