forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ARM] Remove arch-imx from build system

Browse source 
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>
This commit is contained in:
Sascha Hauer 2009-04-01 12:40:15 +02:00
commit 8c8fdbc9bd
6 changed files with 13 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

28
arch/arm/Kconfig
View file

@ -308,15 +308,6 @@ config ARCH_H720X
help help
This enables support for systems based on the Hynix HMS720x This enables support for systems based on the Hynix HMS720x
config ARCH_IMX
bool "IMX"
select CPU_ARM920T
select GENERIC_GPIO
select GENERIC_TIME
select GENERIC_CLOCKEVENTS
help
Support for Motorola's i.MX family of processors (MX1, MXL).
config ARCH_IOP13XX config ARCH_IOP13XX
bool "IOP13xx-based" bool "IOP13xx-based"
depends on MMU depends on MMU
@ -682,8 +673,6 @@ endif
source "arch/arm/mach-lh7a40x/Kconfig" source "arch/arm/mach-lh7a40x/Kconfig"
source "arch/arm/mach-imx/Kconfig"
source "arch/arm/mach-h720x/Kconfig" source "arch/arm/mach-h720x/Kconfig"
source "arch/arm/mach-versatile/Kconfig" source "arch/arm/mach-versatile/Kconfig"
@ -1022,7 +1011,7 @@ source "mm/Kconfig"
config LEDS config LEDS
bool "Timer and CPU usage LEDs" bool "Timer and CPU usage LEDs"
depends on ARCH_CDB89712 || ARCH_EBSA110 || \ depends on ARCH_CDB89712 || ARCH_EBSA110 || \
ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \ ARCH_EBSA285 || ARCH_INTEGRATOR || \
ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \ ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
@ -1188,7 +1177,7 @@ endmenu
menu "CPU Power Management" menu "CPU Power Management"
if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA) if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_PXA)
source "drivers/cpufreq/Kconfig" source "drivers/cpufreq/Kconfig"
@ -1213,14 +1202,11 @@ config CPU_FREQ_INTEGRATOR
If in doubt, say Y. If in doubt, say Y.
config CPU_FREQ_IMX config CPU_FREQ_PXA
tristate "CPUfreq driver for i.MX CPUs" bool
depends on ARCH_IMX && CPU_FREQ depends on CPU_FREQ && ARCH_PXA && PXA25x
default n default y
help select CPU_FREQ_DEFAULT_GOV_USERSPACE
This enables the CPUfreq driver for i.MX CPUs.
If in doubt, say N.
endif endif

1
arch/arm/Makefile
View file

@ -135,7 +135,6 @@ endif
plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c
machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x
machine-$(CONFIG_ARCH_VERSATILE) := versatile machine-$(CONFIG_ARCH_VERSATILE) := versatile
machine-$(CONFIG_ARCH_IMX) := imx
machine-$(CONFIG_ARCH_H720X) := h720x machine-$(CONFIG_ARCH_H720X) := h720x
machine-$(CONFIG_ARCH_AAEC2000) := aaec2000 machine-$(CONFIG_ARCH_AAEC2000) := aaec2000
machine-$(CONFIG_ARCH_REALVIEW) := realview machine-$(CONFIG_ARCH_REALVIEW) := realview

2
drivers/mmc/host/Kconfig
View file

@ -155,7 +155,7 @@ config MMC_ATMELMCI_DMA
config MMC_IMX config MMC_IMX
tristate "Motorola i.MX Multimedia Card Interface support" tristate "Motorola i.MX Multimedia Card Interface support"
depends on ARCH_IMX depends on ARCH_MX1
help help
This selects the Motorola i.MX Multimedia card Interface. This selects the Motorola i.MX Multimedia card Interface.
If you have a i.MX platform with a Multimedia Card slot, If you have a i.MX platform with a Multimedia Card slot,

13
drivers/serial/imx.c
View file

@ -66,7 +66,7 @@
#define ONEMS 0xb0 /* One Millisecond register */ #define ONEMS 0xb0 /* One Millisecond register */
#define UTS 0xb4 /* UART Test Register */ #define UTS 0xb4 /* UART Test Register */
#endif #endif
#if defined(CONFIG_ARCH_IMX) || defined(CONFIG_ARCH_MX1) #ifdef CONFIG_ARCH_MX1
#define BIPR1 0xb0 /* Incremental Preset Register 1 */ #define BIPR1 0xb0 /* Incremental Preset Register 1 */
#define BIPR2 0xb4 /* Incremental Preset Register 2 */ #define BIPR2 0xb4 /* Incremental Preset Register 2 */
#define BIPR3 0xb8 /* Incremental Preset Register 3 */ #define BIPR3 0xb8 /* Incremental Preset Register 3 */
@ -96,7 +96,7 @@
#define UCR1_RTSDEN (1<<5) /* RTS delta interrupt enable */ #define UCR1_RTSDEN (1<<5) /* RTS delta interrupt enable */
#define UCR1_SNDBRK (1<<4) /* Send break */ #define UCR1_SNDBRK (1<<4) /* Send break */
#define UCR1_TDMAEN (1<<3) /* Transmitter ready DMA enable */ #define UCR1_TDMAEN (1<<3) /* Transmitter ready DMA enable */
#if defined(CONFIG_ARCH_IMX) || defined(CONFIG_ARCH_MX1) #ifdef CONFIG_ARCH_MX1
#define UCR1_UARTCLKEN (1<<2) /* UART clock enabled */ #define UCR1_UARTCLKEN (1<<2) /* UART clock enabled */
#endif #endif
#if defined CONFIG_ARCH_MX3 || defined CONFIG_ARCH_MX2 #if defined CONFIG_ARCH_MX3 || defined CONFIG_ARCH_MX2
@ -127,7 +127,7 @@
#define UCR3_RXDSEN (1<<6) /* Receive status interrupt enable */ #define UCR3_RXDSEN (1<<6) /* Receive status interrupt enable */
#define UCR3_AIRINTEN (1<<5) /* Async IR wake interrupt enable */ #define UCR3_AIRINTEN (1<<5) /* Async IR wake interrupt enable */
#define UCR3_AWAKEN (1<<4) /* Async wake interrupt enable */ #define UCR3_AWAKEN (1<<4) /* Async wake interrupt enable */
#ifdef CONFIG_ARCH_IMX #ifdef CONFIG_ARCH_MX1
#define UCR3_REF25 (1<<3) /* Ref freq 25 MHz, only on mx1 */ #define UCR3_REF25 (1<<3) /* Ref freq 25 MHz, only on mx1 */
#define UCR3_REF30 (1<<2) /* Ref Freq 30 MHz, only on mx1 */ #define UCR3_REF30 (1<<2) /* Ref Freq 30 MHz, only on mx1 */
#endif #endif
@ -180,13 +180,6 @@
#define UTS_SOFTRST (1<<0) /* Software reset */ #define UTS_SOFTRST (1<<0) /* Software reset */
/* We've been assigned a range on the "Low-density serial ports" major */ /* We've been assigned a range on the "Low-density serial ports" major */
#ifdef CONFIG_ARCH_IMX
#define SERIAL_IMX_MAJOR 204
#define MINOR_START 41
#define DEV_NAME "ttySMX"
#define MAX_INTERNAL_IRQ IMX_IRQS
#endif
#ifdef CONFIG_ARCH_MXC #ifdef CONFIG_ARCH_MXC
#define SERIAL_IMX_MAJOR 207 #define SERIAL_IMX_MAJOR 207
#define MINOR_START 16 #define MINOR_START 16

2
drivers/spi/Kconfig
View file

@ -118,7 +118,7 @@ config SPI_GPIO
config SPI_IMX config SPI_IMX
tristate "Freescale iMX SPI controller" tristate "Freescale iMX SPI controller"
depends on ARCH_IMX && EXPERIMENTAL depends on ARCH_MX1 && EXPERIMENTAL
help help
This enables using the Freescale iMX SPI controller in master This enables using the Freescale iMX SPI controller in master
mode. mode.

2
drivers/video/Kconfig
View file

@ -397,7 +397,7 @@ config FB_SA1100
config FB_IMX config FB_IMX
tristate "Motorola i.MX LCD support" tristate "Motorola i.MX LCD support"
depends on FB && (ARCH_IMX || ARCH_MX2) depends on FB && (ARCH_MX1 || ARCH_MX2)
select FB_CFB_FILLRECT select FB_CFB_FILLRECT
select FB_CFB_COPYAREA select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT select FB_CFB_IMAGEBLIT