diff options
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 224793cefa31..d5fee71b9978 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -306,9 +306,11 @@ choice | |||
306 | config ARCH_MULTIPLATFORM | 306 | config ARCH_MULTIPLATFORM |
307 | bool "Allow multiple platforms to be selected" | 307 | bool "Allow multiple platforms to be selected" |
308 | depends on MMU | 308 | depends on MMU |
309 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
309 | select ARM_PATCH_PHYS_VIRT | 310 | select ARM_PATCH_PHYS_VIRT |
310 | select AUTO_ZRELADDR | 311 | select AUTO_ZRELADDR |
311 | select COMMON_CLK | 312 | select COMMON_CLK |
313 | select GENERIC_CLOCKEVENTS | ||
312 | select MULTI_IRQ_HANDLER | 314 | select MULTI_IRQ_HANDLER |
313 | select SPARSE_IRQ | 315 | select SPARSE_IRQ |
314 | select USE_OF | 316 | select USE_OF |
@@ -904,16 +906,18 @@ config ARCH_MULTI_V4_V5 | |||
904 | config ARCH_MULTI_V6 | 906 | config ARCH_MULTI_V6 |
905 | bool "ARMv6 based platforms (ARM11)" | 907 | bool "ARMv6 based platforms (ARM11)" |
906 | select ARCH_MULTI_V6_V7 | 908 | select ARCH_MULTI_V6_V7 |
907 | select CPU_V6 | 909 | select CPU_V6K |
908 | 910 | ||
909 | config ARCH_MULTI_V7 | 911 | config ARCH_MULTI_V7 |
910 | bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)" | 912 | bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)" |
911 | default y | 913 | default y |
912 | select ARCH_MULTI_V6_V7 | 914 | select ARCH_MULTI_V6_V7 |
913 | select CPU_V7 | 915 | select CPU_V7 |
916 | select HAVE_SMP | ||
914 | 917 | ||
915 | config ARCH_MULTI_V6_V7 | 918 | config ARCH_MULTI_V6_V7 |
916 | bool | 919 | bool |
920 | select MIGHT_HAVE_CACHE_L2X0 | ||
917 | 921 | ||
918 | config ARCH_MULTI_CPU_AUTO | 922 | config ARCH_MULTI_CPU_AUTO |
919 | def_bool !(ARCH_MULTI_V4 || ARCH_MULTI_V4T || ARCH_MULTI_V6_V7) | 923 | def_bool !(ARCH_MULTI_V4 || ARCH_MULTI_V4T || ARCH_MULTI_V6_V7) |
@@ -921,6 +925,13 @@ config ARCH_MULTI_CPU_AUTO | |||
921 | 925 | ||
922 | endmenu | 926 | endmenu |
923 | 927 | ||
928 | config ARCH_VIRT | ||
929 | bool "Dummy Virtual Machine" if ARCH_MULTI_V7 | ||
930 | select ARM_AMBA | ||
931 | select ARM_GIC | ||
932 | select ARM_PSCI | ||
933 | select HAVE_ARM_ARCH_TIMER | ||
934 | |||
924 | # | 935 | # |
925 | # This is sorted alphabetically by mach-* pathname. However, plat-* | 936 | # This is sorted alphabetically by mach-* pathname. However, plat-* |
926 | # Kconfigs may be included either alphabetically (according to the | 937 | # Kconfigs may be included either alphabetically (according to the |
@@ -1046,8 +1057,6 @@ source "arch/arm/mach-versatile/Kconfig" | |||
1046 | source "arch/arm/mach-vexpress/Kconfig" | 1057 | source "arch/arm/mach-vexpress/Kconfig" |
1047 | source "arch/arm/plat-versatile/Kconfig" | 1058 | source "arch/arm/plat-versatile/Kconfig" |
1048 | 1059 | ||
1049 | source "arch/arm/mach-virt/Kconfig" | ||
1050 | |||
1051 | source "arch/arm/mach-vt8500/Kconfig" | 1060 | source "arch/arm/mach-vt8500/Kconfig" |
1052 | 1061 | ||
1053 | source "arch/arm/mach-w90x900/Kconfig" | 1062 | source "arch/arm/mach-w90x900/Kconfig" |