diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 13 | ||||
| -rw-r--r-- | arch/arm/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/plat-s5p/Kconfig | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ac5f74b0f03e..9adc7e5158c9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -672,6 +672,15 @@ config ARCH_S5PC1XX | |||
| 672 | help | 672 | help |
| 673 | Samsung S5PC1XX series based systems | 673 | Samsung S5PC1XX series based systems |
| 674 | 674 | ||
| 675 | config ARCH_S5PV210 | ||
| 676 | bool "Samsung S5PV210/S5PC110" | ||
| 677 | select CPU_V7 | ||
| 678 | select GENERIC_GPIO | ||
| 679 | select HAVE_CLK | ||
| 680 | select ARM_L1_CACHE_SHIFT_6 | ||
| 681 | help | ||
| 682 | Samsung S5PV210/S5PC110 series based systems | ||
| 683 | |||
| 675 | config ARCH_SHARK | 684 | config ARCH_SHARK |
| 676 | bool "Shark" | 685 | bool "Shark" |
| 677 | select CPU_SA110 | 686 | select CPU_SA110 |
| @@ -832,6 +841,8 @@ if ARCH_S5PC1XX | |||
| 832 | source "arch/arm/mach-s5pc100/Kconfig" | 841 | source "arch/arm/mach-s5pc100/Kconfig" |
| 833 | endif | 842 | endif |
| 834 | 843 | ||
| 844 | source "arch/arm/mach-s5pv210/Kconfig" | ||
| 845 | |||
| 835 | source "arch/arm/mach-lh7a40x/Kconfig" | 846 | source "arch/arm/mach-lh7a40x/Kconfig" |
| 836 | 847 | ||
| 837 | source "arch/arm/mach-h720x/Kconfig" | 848 | source "arch/arm/mach-h720x/Kconfig" |
| @@ -1106,7 +1117,7 @@ source kernel/Kconfig.preempt | |||
| 1106 | config HZ | 1117 | config HZ |
| 1107 | int | 1118 | int |
| 1108 | default 128 if ARCH_L7200 | 1119 | default 128 if ARCH_L7200 |
| 1109 | default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 | 1120 | default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210 |
| 1110 | default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER | 1121 | default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER |
| 1111 | default AT91_TIMER_HZ if ARCH_AT91 | 1122 | default AT91_TIMER_HZ if ARCH_AT91 |
| 1112 | default 100 | 1123 | default 100 |
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index fc8cc4ba0fbd..27032222b865 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -164,6 +164,7 @@ machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx | |||
| 164 | machine-$(CONFIG_ARCH_S5P6440) := s5p6440 | 164 | machine-$(CONFIG_ARCH_S5P6440) := s5p6440 |
| 165 | machine-$(CONFIG_ARCH_S5P6442) := s5p6442 | 165 | machine-$(CONFIG_ARCH_S5P6442) := s5p6442 |
| 166 | machine-$(CONFIG_ARCH_S5PC1XX) := s5pc100 | 166 | machine-$(CONFIG_ARCH_S5PC1XX) := s5pc100 |
| 167 | machine-$(CONFIG_ARCH_S5PV210) := s5pv210 | ||
| 167 | machine-$(CONFIG_ARCH_SA1100) := sa1100 | 168 | machine-$(CONFIG_ARCH_SA1100) := sa1100 |
| 168 | machine-$(CONFIG_ARCH_SHARK) := shark | 169 | machine-$(CONFIG_ARCH_SHARK) := shark |
| 169 | machine-$(CONFIG_ARCH_STMP378X) := stmp378x | 170 | machine-$(CONFIG_ARCH_STMP378X) := stmp378x |
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig index 7cf7f5e2c5fd..d400a6a20fe4 100644 --- a/arch/arm/plat-s5p/Kconfig +++ b/arch/arm/plat-s5p/Kconfig | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | config PLAT_S5P | 8 | config PLAT_S5P |
| 9 | bool | 9 | bool |
| 10 | depends on (ARCH_S5P6440 || ARCH_S5P6442) | 10 | depends on (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210) |
| 11 | default y | 11 | default y |
| 12 | select ARM_VIC | 12 | select ARM_VIC |
| 13 | select NO_IOPORT | 13 | select NO_IOPORT |
