diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-04-01 06:40:15 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-05-07 10:15:48 -0400 |
commit | 8c8fdbc9bd9718b21146065de61c0cafdff11ecb (patch) | |
tree | 5888e8ed21a19bc629a84217f1fbf2e3651b348f /arch/arm/Kconfig | |
parent | 84c9fa43040af08126326ac8b2a2b18f804eb1e8 (diff) |
[ARM] Remove arch-imx from build system
arch-imx is superseeded by the MXC architecture support.
This patch removes arch-imx from the build system.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e60ec54df334..be680f3cdf00 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -308,15 +308,6 @@ config ARCH_H720X | |||
308 | help | 308 | help |
309 | This enables support for systems based on the Hynix HMS720x | 309 | This enables support for systems based on the Hynix HMS720x |
310 | 310 | ||
311 | config ARCH_IMX | ||
312 | bool "IMX" | ||
313 | select CPU_ARM920T | ||
314 | select GENERIC_GPIO | ||
315 | select GENERIC_TIME | ||
316 | select GENERIC_CLOCKEVENTS | ||
317 | help | ||
318 | Support for Motorola's i.MX family of processors (MX1, MXL). | ||
319 | |||
320 | config ARCH_IOP13XX | 311 | config ARCH_IOP13XX |
321 | bool "IOP13xx-based" | 312 | bool "IOP13xx-based" |
322 | depends on MMU | 313 | depends on MMU |
@@ -682,8 +673,6 @@ endif | |||
682 | 673 | ||
683 | source "arch/arm/mach-lh7a40x/Kconfig" | 674 | source "arch/arm/mach-lh7a40x/Kconfig" |
684 | 675 | ||
685 | source "arch/arm/mach-imx/Kconfig" | ||
686 | |||
687 | source "arch/arm/mach-h720x/Kconfig" | 676 | source "arch/arm/mach-h720x/Kconfig" |
688 | 677 | ||
689 | source "arch/arm/mach-versatile/Kconfig" | 678 | source "arch/arm/mach-versatile/Kconfig" |
@@ -1022,7 +1011,7 @@ source "mm/Kconfig" | |||
1022 | config LEDS | 1011 | config LEDS |
1023 | bool "Timer and CPU usage LEDs" | 1012 | bool "Timer and CPU usage LEDs" |
1024 | depends on ARCH_CDB89712 || ARCH_EBSA110 || \ | 1013 | depends on ARCH_CDB89712 || ARCH_EBSA110 || \ |
1025 | ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \ | 1014 | ARCH_EBSA285 || ARCH_INTEGRATOR || \ |
1026 | ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ | 1015 | ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ |
1027 | ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ | 1016 | ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ |
1028 | ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \ | 1017 | ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \ |
@@ -1188,7 +1177,7 @@ endmenu | |||
1188 | 1177 | ||
1189 | menu "CPU Power Management" | 1178 | menu "CPU Power Management" |
1190 | 1179 | ||
1191 | if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA) | 1180 | if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_PXA) |
1192 | 1181 | ||
1193 | source "drivers/cpufreq/Kconfig" | 1182 | source "drivers/cpufreq/Kconfig" |
1194 | 1183 | ||
@@ -1213,14 +1202,11 @@ config CPU_FREQ_INTEGRATOR | |||
1213 | 1202 | ||
1214 | If in doubt, say Y. | 1203 | If in doubt, say Y. |
1215 | 1204 | ||
1216 | config CPU_FREQ_IMX | 1205 | config CPU_FREQ_PXA |
1217 | tristate "CPUfreq driver for i.MX CPUs" | 1206 | bool |
1218 | depends on ARCH_IMX && CPU_FREQ | 1207 | depends on CPU_FREQ && ARCH_PXA && PXA25x |
1219 | default n | 1208 | default y |
1220 | help | 1209 | select CPU_FREQ_DEFAULT_GOV_USERSPACE |
1221 | This enables the CPUfreq driver for i.MX CPUs. | ||
1222 | |||
1223 | If in doubt, say N. | ||
1224 | 1210 | ||
1225 | endif | 1211 | endif |
1226 | 1212 | ||