summaryrefslogtreecommitdiff
path: root/arch/arm/imx-common
diff options
context:
space:
mode:
authorBenoît Thébaudeau <benoit.thebaudeau@advansee.com>2013-05-03 10:32:13 +0000
committerStefano Babic <sbabic@denx.de>2013-05-05 17:55:02 +0200
commitab3a990b4d8f135af3a1cdcb247585d2d4fd26f0 (patch)
treea3ad534980ca1ee0752734e44aefb577fd28b9e7 /arch/arm/imx-common
parent0f83b36529bbfb297c6a2bf361e3447e2f48ff29 (diff)
downloadu-boot-imx-ab3a990b4d8f135af3a1cdcb247585d2d4fd26f0.zip
u-boot-imx-ab3a990b4d8f135af3a1cdcb247585d2d4fd26f0.tar.gz
u-boot-imx-ab3a990b4d8f135af3a1cdcb247585d2d4fd26f0.tar.bz2
imx: iomux-v3: Add iomux-mx25.h
Allow usage of the imx-common/iomux-v3.h framework by including pad settings for the i.MX25. The content of the file is taken from Linux kernel at commit 267dd34, plus the required changes to make it work in U-Boot. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Diffstat (limited to 'arch/arm/imx-common')
-rw-r--r--arch/arm/imx-common/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
index 1166488..a33c193 100644
--- a/arch/arm/imx-common/Makefile
+++ b/arch/arm/imx-common/Makefile
@@ -27,8 +27,11 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libimx-common.o
+ifeq ($(SOC),$(filter $(SOC),mx25 mx5 mx6))
+COBJS-y = iomux-v3.o
+endif
ifeq ($(SOC),$(filter $(SOC),mx5 mx6))
-COBJS-y = iomux-v3.o timer.o cpu.o speed.o
+COBJS-y += timer.o cpu.o speed.o
COBJS-$(CONFIG_I2C_MXC) += i2c-mxv7.o
endif
ifeq ($(SOC),$(filter $(SOC),mx6 mxs))