diff options
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 653b489479e0..6fb91fb604a0 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -21,7 +21,6 @@ config ARCH_OMAP3 | |||
| 21 | select PM_OPP if PM | 21 | select PM_OPP if PM |
| 22 | select PM_RUNTIME if CPU_IDLE | 22 | select PM_RUNTIME if CPU_IDLE |
| 23 | select SOC_HAS_OMAP2_SDRC | 23 | select SOC_HAS_OMAP2_SDRC |
| 24 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | ||
| 25 | 24 | ||
| 26 | config ARCH_OMAP4 | 25 | config ARCH_OMAP4 |
| 27 | bool "TI OMAP4" | 26 | bool "TI OMAP4" |
| @@ -42,7 +41,6 @@ config ARCH_OMAP4 | |||
| 42 | select PL310_ERRATA_727915 | 41 | select PL310_ERRATA_727915 |
| 43 | select PM_OPP if PM | 42 | select PM_OPP if PM |
| 44 | select PM_RUNTIME if CPU_IDLE | 43 | select PM_RUNTIME if CPU_IDLE |
| 45 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | ||
| 46 | select ARM_ERRATA_754322 | 44 | select ARM_ERRATA_754322 |
| 47 | select ARM_ERRATA_775420 | 45 | select ARM_ERRATA_775420 |
| 48 | 46 | ||
| @@ -50,11 +48,12 @@ config SOC_OMAP5 | |||
| 50 | bool "TI OMAP5" | 48 | bool "TI OMAP5" |
| 51 | depends on ARCH_MULTI_V7 | 49 | depends on ARCH_MULTI_V7 |
| 52 | select ARCH_OMAP2PLUS | 50 | select ARCH_OMAP2PLUS |
| 51 | select ARCH_HAS_OPP | ||
| 53 | select ARM_CPU_SUSPEND if PM | 52 | select ARM_CPU_SUSPEND if PM |
| 54 | select ARM_GIC | 53 | select ARM_GIC |
| 55 | select CPU_V7 | 54 | select CPU_V7 |
| 56 | select HAVE_ARM_SCU if SMP | 55 | select HAVE_ARM_SCU if SMP |
| 57 | select HAVE_ARM_TWD if LOCAL_TIMERS | 56 | select HAVE_ARM_TWD if SMP |
| 58 | select HAVE_SMP | 57 | select HAVE_SMP |
| 59 | select HAVE_ARM_ARCH_TIMER | 58 | select HAVE_ARM_ARCH_TIMER |
| 60 | select ARM_ERRATA_798181 if SMP | 59 | select ARM_ERRATA_798181 if SMP |
| @@ -63,6 +62,7 @@ config SOC_AM33XX | |||
| 63 | bool "TI AM33XX" | 62 | bool "TI AM33XX" |
| 64 | depends on ARCH_MULTI_V7 | 63 | depends on ARCH_MULTI_V7 |
| 65 | select ARCH_OMAP2PLUS | 64 | select ARCH_OMAP2PLUS |
| 65 | select ARCH_HAS_OPP | ||
| 66 | select ARM_CPU_SUSPEND if PM | 66 | select ARM_CPU_SUSPEND if PM |
| 67 | select CPU_V7 | 67 | select CPU_V7 |
| 68 | select MULTI_IRQ_HANDLER | 68 | select MULTI_IRQ_HANDLER |
| @@ -72,6 +72,7 @@ config SOC_AM43XX | |||
| 72 | depends on ARCH_MULTI_V7 | 72 | depends on ARCH_MULTI_V7 |
| 73 | select CPU_V7 | 73 | select CPU_V7 |
| 74 | select ARCH_OMAP2PLUS | 74 | select ARCH_OMAP2PLUS |
| 75 | select ARCH_HAS_OPP | ||
| 75 | select MULTI_IRQ_HANDLER | 76 | select MULTI_IRQ_HANDLER |
| 76 | select ARM_GIC | 77 | select ARM_GIC |
| 77 | select MACH_OMAP_GENERIC | 78 | select MACH_OMAP_GENERIC |
| @@ -80,6 +81,7 @@ config SOC_DRA7XX | |||
| 80 | bool "TI DRA7XX" | 81 | bool "TI DRA7XX" |
| 81 | depends on ARCH_MULTI_V7 | 82 | depends on ARCH_MULTI_V7 |
| 82 | select ARCH_OMAP2PLUS | 83 | select ARCH_OMAP2PLUS |
| 84 | select ARCH_HAS_OPP | ||
| 83 | select ARM_CPU_SUSPEND if PM | 85 | select ARM_CPU_SUSPEND if PM |
| 84 | select ARM_GIC | 86 | select ARM_GIC |
| 85 | select CPU_V7 | 87 | select CPU_V7 |
| @@ -268,9 +270,6 @@ config MACH_OMAP_3430SDP | |||
| 268 | default y | 270 | default y |
| 269 | select OMAP_PACKAGE_CBB | 271 | select OMAP_PACKAGE_CBB |
| 270 | 272 | ||
| 271 | config MACH_NOKIA_N800 | ||
| 272 | bool | ||
| 273 | |||
| 274 | config MACH_NOKIA_N810 | 273 | config MACH_NOKIA_N810 |
| 275 | bool | 274 | bool |
| 276 | 275 | ||
| @@ -281,7 +280,6 @@ config MACH_NOKIA_N8X0 | |||
| 281 | bool "Nokia N800/N810" | 280 | bool "Nokia N800/N810" |
| 282 | depends on SOC_OMAP2420 | 281 | depends on SOC_OMAP2420 |
| 283 | default y | 282 | default y |
| 284 | select MACH_NOKIA_N800 | ||
| 285 | select MACH_NOKIA_N810 | 283 | select MACH_NOKIA_N810 |
| 286 | select MACH_NOKIA_N810_WIMAX | 284 | select MACH_NOKIA_N810_WIMAX |
| 287 | select OMAP_PACKAGE_ZAC | 285 | select OMAP_PACKAGE_ZAC |