diff options
author | Tony Lindgren <tony@atomide.com> | 2010-02-12 15:26:48 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-02-15 12:27:02 -0500 |
commit | a8eb7ca0cbb41c9cd379b8d2a2a5efb503aa65e9 (patch) | |
tree | 86901095aeb9e59815a6f95547cf68a9ec0b32e0 /arch/arm/mach-omap2/Kconfig | |
parent | 088ef950dc0dd58d2f339e1616c9092fea923f06 (diff) |
omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3
Replace ARCH_OMAP34XX with ARCH_OMAP3
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
-rw-r--r-- | arch/arm/mach-omap2/Kconfig | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 69a6b2baabfe..317b8cb375be 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
@@ -11,14 +11,9 @@ config ARCH_OMAP2430 | |||
11 | bool "OMAP2430 support" | 11 | bool "OMAP2430 support" |
12 | depends on ARCH_OMAP2 | 12 | depends on ARCH_OMAP2 |
13 | 13 | ||
14 | config ARCH_OMAP34XX | ||
15 | bool "OMAP34xx Based System" | ||
16 | depends on ARCH_OMAP3 | ||
17 | select USB_ARCH_HAS_EHCI | ||
18 | |||
19 | config ARCH_OMAP3430 | 14 | config ARCH_OMAP3430 |
20 | bool "OMAP3430 support" | 15 | bool "OMAP3430 support" |
21 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 16 | depends on ARCH_OMAP3 |
22 | select ARCH_OMAP_OTG | 17 | select ARCH_OMAP_OTG |
23 | 18 | ||
24 | config OMAP_PACKAGE_CBC | 19 | config OMAP_PACKAGE_CBC |
@@ -60,42 +55,42 @@ config MACH_OMAP_2430SDP | |||
60 | 55 | ||
61 | config MACH_OMAP3_BEAGLE | 56 | config MACH_OMAP3_BEAGLE |
62 | bool "OMAP3 BEAGLE board" | 57 | bool "OMAP3 BEAGLE board" |
63 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 58 | depends on ARCH_OMAP3 |
64 | select OMAP_PACKAGE_CBB | 59 | select OMAP_PACKAGE_CBB |
65 | 60 | ||
66 | config MACH_OMAP_LDP | 61 | config MACH_OMAP_LDP |
67 | bool "OMAP3 LDP board" | 62 | bool "OMAP3 LDP board" |
68 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 63 | depends on ARCH_OMAP3 |
69 | select OMAP_PACKAGE_CBB | 64 | select OMAP_PACKAGE_CBB |
70 | 65 | ||
71 | config MACH_OVERO | 66 | config MACH_OVERO |
72 | bool "Gumstix Overo board" | 67 | bool "Gumstix Overo board" |
73 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 68 | depends on ARCH_OMAP3 |
74 | select OMAP_PACKAGE_CBB | 69 | select OMAP_PACKAGE_CBB |
75 | 70 | ||
76 | config MACH_OMAP3EVM | 71 | config MACH_OMAP3EVM |
77 | bool "OMAP 3530 EVM board" | 72 | bool "OMAP 3530 EVM board" |
78 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 73 | depends on ARCH_OMAP3 |
79 | select OMAP_PACKAGE_CBB | 74 | select OMAP_PACKAGE_CBB |
80 | 75 | ||
81 | config MACH_OMAP3517EVM | 76 | config MACH_OMAP3517EVM |
82 | bool "OMAP3517/ AM3517 EVM board" | 77 | bool "OMAP3517/ AM3517 EVM board" |
83 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 78 | depends on ARCH_OMAP3 |
84 | select OMAP_PACKAGE_CBB | 79 | select OMAP_PACKAGE_CBB |
85 | 80 | ||
86 | config MACH_OMAP3_PANDORA | 81 | config MACH_OMAP3_PANDORA |
87 | bool "OMAP3 Pandora" | 82 | bool "OMAP3 Pandora" |
88 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 83 | depends on ARCH_OMAP3 |
89 | select OMAP_PACKAGE_CBB | 84 | select OMAP_PACKAGE_CBB |
90 | 85 | ||
91 | config MACH_OMAP3_TOUCHBOOK | 86 | config MACH_OMAP3_TOUCHBOOK |
92 | bool "OMAP3 Touch Book" | 87 | bool "OMAP3 Touch Book" |
93 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 88 | depends on ARCH_OMAP3 |
94 | select BACKLIGHT_CLASS_DEVICE | 89 | select BACKLIGHT_CLASS_DEVICE |
95 | 90 | ||
96 | config MACH_OMAP_3430SDP | 91 | config MACH_OMAP_3430SDP |
97 | bool "OMAP 3430 SDP board" | 92 | bool "OMAP 3430 SDP board" |
98 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 93 | depends on ARCH_OMAP3 |
99 | select OMAP_PACKAGE_CBB | 94 | select OMAP_PACKAGE_CBB |
100 | 95 | ||
101 | config MACH_NOKIA_N800 | 96 | config MACH_NOKIA_N800 |
@@ -116,33 +111,33 @@ config MACH_NOKIA_N8X0 | |||
116 | 111 | ||
117 | config MACH_NOKIA_RX51 | 112 | config MACH_NOKIA_RX51 |
118 | bool "Nokia RX-51 board" | 113 | bool "Nokia RX-51 board" |
119 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 114 | depends on ARCH_OMAP3 |
120 | select OMAP_PACKAGE_CBB | 115 | select OMAP_PACKAGE_CBB |
121 | 116 | ||
122 | config MACH_OMAP_ZOOM2 | 117 | config MACH_OMAP_ZOOM2 |
123 | bool "OMAP3 Zoom2 board" | 118 | bool "OMAP3 Zoom2 board" |
124 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 119 | depends on ARCH_OMAP3 |
125 | select OMAP_PACKAGE_CBB | 120 | select OMAP_PACKAGE_CBB |
126 | 121 | ||
127 | config MACH_OMAP_ZOOM3 | 122 | config MACH_OMAP_ZOOM3 |
128 | bool "OMAP3630 Zoom3 board" | 123 | bool "OMAP3630 Zoom3 board" |
129 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 124 | depends on ARCH_OMAP3 |
130 | select OMAP_PACKAGE_CBP | 125 | select OMAP_PACKAGE_CBP |
131 | 126 | ||
132 | config MACH_CM_T35 | 127 | config MACH_CM_T35 |
133 | bool "CompuLab CM-T35 module" | 128 | bool "CompuLab CM-T35 module" |
134 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 129 | depends on ARCH_OMAP3 |
135 | select OMAP_PACKAGE_CUS | 130 | select OMAP_PACKAGE_CUS |
136 | select OMAP_MUX | 131 | select OMAP_MUX |
137 | 132 | ||
138 | config MACH_IGEP0020 | 133 | config MACH_IGEP0020 |
139 | bool "IGEP0020" | 134 | bool "IGEP0020" |
140 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 135 | depends on ARCH_OMAP3 |
141 | select OMAP_PACKAGE_CBB | 136 | select OMAP_PACKAGE_CBB |
142 | 137 | ||
143 | config MACH_OMAP_3630SDP | 138 | config MACH_OMAP_3630SDP |
144 | bool "OMAP3630 SDP board" | 139 | bool "OMAP3630 SDP board" |
145 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 140 | depends on ARCH_OMAP3 |
146 | select OMAP_PACKAGE_CBP | 141 | select OMAP_PACKAGE_CBP |
147 | 142 | ||
148 | config MACH_OMAP_4430SDP | 143 | config MACH_OMAP_4430SDP |
@@ -158,7 +153,7 @@ config OMAP3_EMU | |||
158 | 153 | ||
159 | config OMAP3_SDRC_AC_TIMING | 154 | config OMAP3_SDRC_AC_TIMING |
160 | bool "Enable SDRC AC timing register changes" | 155 | bool "Enable SDRC AC timing register changes" |
161 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 156 | depends on ARCH_OMAP3 |
162 | default n | 157 | default n |
163 | help | 158 | help |
164 | If you know that none of your system initiators will attempt to | 159 | If you know that none of your system initiators will attempt to |