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 | |
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>
-rw-r--r-- | arch/arm/Kconfig | 28 | ||||
-rw-r--r-- | arch/arm/Makefile | 1 | ||||
-rw-r--r-- | drivers/mmc/host/Kconfig | 2 | ||||
-rw-r--r-- | drivers/serial/imx.c | 13 | ||||
-rw-r--r-- | drivers/spi/Kconfig | 2 | ||||
-rw-r--r-- | drivers/video/Kconfig | 2 |
6 files changed, 13 insertions, 35 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 | ||
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index e84729bf13d4..921a627edb5e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -135,7 +135,6 @@ endif | |||
135 | plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c | 135 | plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c |
136 | machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x | 136 | machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x |
137 | machine-$(CONFIG_ARCH_VERSATILE) := versatile | 137 | machine-$(CONFIG_ARCH_VERSATILE) := versatile |
138 | machine-$(CONFIG_ARCH_IMX) := imx | ||
139 | machine-$(CONFIG_ARCH_H720X) := h720x | 138 | machine-$(CONFIG_ARCH_H720X) := h720x |
140 | machine-$(CONFIG_ARCH_AAEC2000) := aaec2000 | 139 | machine-$(CONFIG_ARCH_AAEC2000) := aaec2000 |
141 | machine-$(CONFIG_ARCH_REALVIEW) := realview | 140 | machine-$(CONFIG_ARCH_REALVIEW) := realview |
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index b4cf691f3f64..3eb87bda14f3 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
@@ -155,7 +155,7 @@ config MMC_ATMELMCI_DMA | |||
155 | 155 | ||
156 | config MMC_IMX | 156 | config MMC_IMX |
157 | tristate "Motorola i.MX Multimedia Card Interface support" | 157 | tristate "Motorola i.MX Multimedia Card Interface support" |
158 | depends on ARCH_IMX | 158 | depends on ARCH_MX1 |
159 | help | 159 | help |
160 | This selects the Motorola i.MX Multimedia card Interface. | 160 | This selects the Motorola i.MX Multimedia card Interface. |
161 | If you have a i.MX platform with a Multimedia Card slot, | 161 | If you have a i.MX platform with a Multimedia Card slot, |
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index 9f460b175c50..3f5d5a200481 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
@@ -66,7 +66,7 @@ | |||
66 | #define ONEMS 0xb0 /* One Millisecond register */ | 66 | #define ONEMS 0xb0 /* One Millisecond register */ |
67 | #define UTS 0xb4 /* UART Test Register */ | 67 | #define UTS 0xb4 /* UART Test Register */ |
68 | #endif | 68 | #endif |
69 | #if defined(CONFIG_ARCH_IMX) || defined(CONFIG_ARCH_MX1) | 69 | #ifdef CONFIG_ARCH_MX1 |
70 | #define BIPR1 0xb0 /* Incremental Preset Register 1 */ | 70 | #define BIPR1 0xb0 /* Incremental Preset Register 1 */ |
71 | #define BIPR2 0xb4 /* Incremental Preset Register 2 */ | 71 | #define BIPR2 0xb4 /* Incremental Preset Register 2 */ |
72 | #define BIPR3 0xb8 /* Incremental Preset Register 3 */ | 72 | #define BIPR3 0xb8 /* Incremental Preset Register 3 */ |
@@ -96,7 +96,7 @@ | |||
96 | #define UCR1_RTSDEN (1<<5) /* RTS delta interrupt enable */ | 96 | #define UCR1_RTSDEN (1<<5) /* RTS delta interrupt enable */ |
97 | #define UCR1_SNDBRK (1<<4) /* Send break */ | 97 | #define UCR1_SNDBRK (1<<4) /* Send break */ |
98 | #define UCR1_TDMAEN (1<<3) /* Transmitter ready DMA enable */ | 98 | #define UCR1_TDMAEN (1<<3) /* Transmitter ready DMA enable */ |
99 | #if defined(CONFIG_ARCH_IMX) || defined(CONFIG_ARCH_MX1) | 99 | #ifdef CONFIG_ARCH_MX1 |
100 | #define UCR1_UARTCLKEN (1<<2) /* UART clock enabled */ | 100 | #define UCR1_UARTCLKEN (1<<2) /* UART clock enabled */ |
101 | #endif | 101 | #endif |
102 | #if defined CONFIG_ARCH_MX3 || defined CONFIG_ARCH_MX2 | 102 | #if defined CONFIG_ARCH_MX3 || defined CONFIG_ARCH_MX2 |
@@ -127,7 +127,7 @@ | |||
127 | #define UCR3_RXDSEN (1<<6) /* Receive status interrupt enable */ | 127 | #define UCR3_RXDSEN (1<<6) /* Receive status interrupt enable */ |
128 | #define UCR3_AIRINTEN (1<<5) /* Async IR wake interrupt enable */ | 128 | #define UCR3_AIRINTEN (1<<5) /* Async IR wake interrupt enable */ |
129 | #define UCR3_AWAKEN (1<<4) /* Async wake interrupt enable */ | 129 | #define UCR3_AWAKEN (1<<4) /* Async wake interrupt enable */ |
130 | #ifdef CONFIG_ARCH_IMX | 130 | #ifdef CONFIG_ARCH_MX1 |
131 | #define UCR3_REF25 (1<<3) /* Ref freq 25 MHz, only on mx1 */ | 131 | #define UCR3_REF25 (1<<3) /* Ref freq 25 MHz, only on mx1 */ |
132 | #define UCR3_REF30 (1<<2) /* Ref Freq 30 MHz, only on mx1 */ | 132 | #define UCR3_REF30 (1<<2) /* Ref Freq 30 MHz, only on mx1 */ |
133 | #endif | 133 | #endif |
@@ -180,13 +180,6 @@ | |||
180 | #define UTS_SOFTRST (1<<0) /* Software reset */ | 180 | #define UTS_SOFTRST (1<<0) /* Software reset */ |
181 | 181 | ||
182 | /* We've been assigned a range on the "Low-density serial ports" major */ | 182 | /* We've been assigned a range on the "Low-density serial ports" major */ |
183 | #ifdef CONFIG_ARCH_IMX | ||
184 | #define SERIAL_IMX_MAJOR 204 | ||
185 | #define MINOR_START 41 | ||
186 | #define DEV_NAME "ttySMX" | ||
187 | #define MAX_INTERNAL_IRQ IMX_IRQS | ||
188 | #endif | ||
189 | |||
190 | #ifdef CONFIG_ARCH_MXC | 183 | #ifdef CONFIG_ARCH_MXC |
191 | #define SERIAL_IMX_MAJOR 207 | 184 | #define SERIAL_IMX_MAJOR 207 |
192 | #define MINOR_START 16 | 185 | #define MINOR_START 16 |
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 83a185d52961..7c61251bea61 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig | |||
@@ -118,7 +118,7 @@ config SPI_GPIO | |||
118 | 118 | ||
119 | config SPI_IMX | 119 | config SPI_IMX |
120 | tristate "Freescale iMX SPI controller" | 120 | tristate "Freescale iMX SPI controller" |
121 | depends on ARCH_IMX && EXPERIMENTAL | 121 | depends on ARCH_MX1 && EXPERIMENTAL |
122 | help | 122 | help |
123 | This enables using the Freescale iMX SPI controller in master | 123 | This enables using the Freescale iMX SPI controller in master |
124 | mode. | 124 | mode. |
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 7826bdce4bbe..93258e114517 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -397,7 +397,7 @@ config FB_SA1100 | |||
397 | 397 | ||
398 | config FB_IMX | 398 | config FB_IMX |
399 | tristate "Motorola i.MX LCD support" | 399 | tristate "Motorola i.MX LCD support" |
400 | depends on FB && (ARCH_IMX || ARCH_MX2) | 400 | depends on FB && (ARCH_MX1 || ARCH_MX2) |
401 | select FB_CFB_FILLRECT | 401 | select FB_CFB_FILLRECT |
402 | select FB_CFB_COPYAREA | 402 | select FB_CFB_COPYAREA |
403 | select FB_CFB_IMAGEBLIT | 403 | select FB_CFB_IMAGEBLIT |