![Uwe Kleine-König](/assets/img/avatar_default.png)
Removed selection of COMMON_CLKDEV by CONFIG_ARCH_MX5. This is handled in03e09cd890
. arch/arm/plat-mxc/iomux-mx1-mx2.c was moved to arch/arm/plat-mxc/iomux-v1.c in5e2e95f520
and got bug fixed in5c17ef878f
. The bug in arch/arm/plat-mxc/iomux-v1.c isn't present any more sincebac3fcfad5
, so arch/arm/plat-mxc/iomux-mx1-mx2.c is simply deleted. Conflicts: arch/arm/plat-mxc/Kconfig arch/arm/plat-mxc/Makefile arch/arm/plat-mxc/iomux-mx1-mx2.c Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
20 lines
598 B
Makefile
20 lines
598 B
Makefile
#
|
|
# Makefile for the linux kernel.
|
|
#
|
|
|
|
# Common support
|
|
obj-y := irq.o clock.o gpio.o time.o devices.o cpu.o system.o
|
|
|
|
# MX51 uses the TZIC interrupt controller, older platforms use AVIC (irq.o)
|
|
obj-$(CONFIG_MXC_TZIC) += tzic.o
|
|
|
|
obj-$(CONFIG_ARCH_MX1) += dma-mx1-mx2.o
|
|
obj-$(CONFIG_ARCH_MX2) += dma-mx1-mx2.o
|
|
obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
|
|
obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
|
|
obj-$(CONFIG_MXC_PWM) += pwm.o
|
|
obj-$(CONFIG_USB_EHCI_MXC) += ehci.o
|
|
obj-$(CONFIG_MXC_ULPI) += ulpi.o
|
|
obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o
|
|
obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o
|