aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-03-07 17:05:13 -0500
committerOlof Johansson <olof@lixom.net>2012-03-07 17:05:13 -0500
commit412fe6b3a1f6fa6c88c11c8d2b2422b79342de8c (patch)
treed07592e2676135dd7cbcc8535fc3625179356a95 /arch
parentc6dbba0e45edb1a88d97bc8118c4e8332c603076 (diff)
parentf558b275439a9d14a1e2a754484f81ecebf56764 (diff)
Merge branch 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
* 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: Revert "ARM: OMAP2+: Fix multiple randconfig errors with SOC_OMAP and SOC_OMAP_NOOP"
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Makefile4
-rw-r--r--arch/arm/mach-omap2/Kconfig51
2 files changed, 20 insertions, 35 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index ea69448be0ed..1683bfb9166f 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -164,7 +164,9 @@ machine-$(CONFIG_ARCH_MXS) := mxs
164machine-$(CONFIG_ARCH_NETX) := netx 164machine-$(CONFIG_ARCH_NETX) := netx
165machine-$(CONFIG_ARCH_NOMADIK) := nomadik 165machine-$(CONFIG_ARCH_NOMADIK) := nomadik
166machine-$(CONFIG_ARCH_OMAP1) := omap1 166machine-$(CONFIG_ARCH_OMAP1) := omap1
167machine-$(CONFIG_ARCH_OMAP2PLUS) := omap2 167machine-$(CONFIG_ARCH_OMAP2) := omap2
168machine-$(CONFIG_ARCH_OMAP3) := omap2
169machine-$(CONFIG_ARCH_OMAP4) := omap2
168machine-$(CONFIG_ARCH_ORION5X) := orion5x 170machine-$(CONFIG_ARCH_ORION5X) := orion5x
169machine-$(CONFIG_ARCH_PICOXCELL) := picoxcell 171machine-$(CONFIG_ARCH_PICOXCELL) := picoxcell
170machine-$(CONFIG_ARCH_PNX4008) := pnx4008 172machine-$(CONFIG_ARCH_PNX4008) := pnx4008
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index c4ae0a77f7b4..337f98dd8148 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -21,12 +21,16 @@ config ARCH_OMAP2PLUS_TYPICAL
21 Compile a kernel suitable for booting most boards 21 Compile a kernel suitable for booting most boards
22 22
23config ARCH_OMAP2 23config ARCH_OMAP2
24 bool 24 bool "TI OMAP2"
25 depends on ARCH_OMAP2PLUS
26 default y
25 select CPU_V6 27 select CPU_V6
26 select MULTI_IRQ_HANDLER 28 select MULTI_IRQ_HANDLER
27 29
28config ARCH_OMAP3 30config ARCH_OMAP3
29 bool 31 bool "TI OMAP3"
32 depends on ARCH_OMAP2PLUS
33 default y
30 select CPU_V7 34 select CPU_V7
31 select USB_ARCH_HAS_EHCI if USB_SUPPORT 35 select USB_ARCH_HAS_EHCI if USB_SUPPORT
32 select ARCH_HAS_OPP 36 select ARCH_HAS_OPP
@@ -35,7 +39,9 @@ config ARCH_OMAP3
35 select MULTI_IRQ_HANDLER 39 select MULTI_IRQ_HANDLER
36 40
37config ARCH_OMAP4 41config ARCH_OMAP4
38 bool 42 bool "TI OMAP4"
43 default y
44 depends on ARCH_OMAP2PLUS
39 select CACHE_L2X0 45 select CACHE_L2X0
40 select CPU_V7 46 select CPU_V7
41 select ARM_GIC 47 select ARM_GIC
@@ -50,58 +56,36 @@ config ARCH_OMAP4
50 select ARM_CPU_SUSPEND if PM 56 select ARM_CPU_SUSPEND if PM
51 57
52comment "OMAP Core Type" 58comment "OMAP Core Type"
53 59 depends on ARCH_OMAP2
54config SOC_OMAP
55 bool
56 60
57config SOC_OMAP2420 61config SOC_OMAP2420
58 bool "OMAP2420 support" 62 bool "OMAP2420 support"
63 depends on ARCH_OMAP2
59 default y 64 default y
60 select SOC_OMAP
61 select ARCH_OMAP2
62 select OMAP_DM_TIMER 65 select OMAP_DM_TIMER
63 select ARCH_OMAP_OTG 66 select ARCH_OMAP_OTG
64 67
65config SOC_OMAP2430 68config SOC_OMAP2430
66 bool "OMAP2430 support" 69 bool "OMAP2430 support"
70 depends on ARCH_OMAP2
67 default y 71 default y
68 select SOC_OMAP
69 select ARCH_OMAP2
70 select ARCH_OMAP_OTG 72 select ARCH_OMAP_OTG
71 73
72config SOC_OMAP3430 74config SOC_OMAP3430
73 bool "OMAP3430 support" 75 bool "OMAP3430 support"
76 depends on ARCH_OMAP3
74 default y 77 default y
75 select SOC_OMAP
76 select ARCH_OMAP3
77 select ARCH_OMAP_OTG 78 select ARCH_OMAP_OTG
78 79
79config SOC_OMAPTI81XX 80config SOC_OMAPTI81XX
80 bool "TI81XX support" 81 bool "TI81XX support"
82 depends on ARCH_OMAP3
81 default y 83 default y
82 select SOC_OMAP
83 select ARCH_OMAP3
84 84
85config SOC_OMAPAM33XX 85config SOC_OMAPAM33XX
86 bool "AM33XX support" 86 bool "AM33XX support"
87 depends on ARCH_OMAP3
87 default y 88 default y
88 select SOC_OMAP
89 select ARCH_OMAP3
90
91config SOC_OMAP44XX
92 bool "OMAP44XX support"
93 default y
94 select SOC_OMAP
95 select ARCH_OMAP4
96
97config SOC_OMAP_NOOP
98 bool
99 depends on !SOC_OMAP
100 default y
101 select ARCH_OMAP2
102 select ARCH_OMAP3
103 select ARCH_OMAP4
104 select MACH_OMAP_GENERIC
105 89
106config OMAP_PACKAGE_ZAF 90config OMAP_PACKAGE_ZAF
107 bool 91 bool
@@ -128,17 +112,17 @@ config OMAP_PACKAGE_CBS
128 bool 112 bool
129 113
130comment "OMAP Board Type" 114comment "OMAP Board Type"
115 depends on ARCH_OMAP2PLUS
131 116
132config MACH_OMAP_GENERIC 117config MACH_OMAP_GENERIC
133 bool "Generic OMAP2+ board" 118 bool "Generic OMAP2+ board"
119 depends on ARCH_OMAP2PLUS
134 select USE_OF 120 select USE_OF
135 default y 121 default y
136 help 122 help
137 Support for generic TI OMAP2+ boards using Flattened Device Tree. 123 Support for generic TI OMAP2+ boards using Flattened Device Tree.
138 More information at Documentation/devicetree 124 More information at Documentation/devicetree
139 125
140if SOC_OMAP
141
142config MACH_OMAP2_TUSB6010 126config MACH_OMAP2_TUSB6010
143 bool 127 bool
144 depends on ARCH_OMAP2 && SOC_OMAP2420 128 depends on ARCH_OMAP2 && SOC_OMAP2420
@@ -359,7 +343,6 @@ config MACH_OMAP4_PANDA
359 select OMAP_PACKAGE_CBS 343 select OMAP_PACKAGE_CBS
360 select REGULATOR_FIXED_VOLTAGE if REGULATOR 344 select REGULATOR_FIXED_VOLTAGE if REGULATOR
361 345
362endif
363config OMAP3_EMU 346config OMAP3_EMU
364 bool "OMAP3 debugging peripherals" 347 bool "OMAP3 debugging peripherals"
365 depends on ARCH_OMAP3 348 depends on ARCH_OMAP3
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-06 03:55:44 -0400