summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorTroy Kisky <troy.kisky@boundarydevices.com>2012-07-19 08:18:23 +0000
committerHeiko Schocher <hs@denx.de>2012-07-31 08:00:32 +0200
commit18c0ad27c1e75e0a4695bb293cf8e3849538c36f (patch)
tree5040d5f508c529f318d416468574ea615defc64a /arch/arm
parentaf2a35fb1f432c78e6181172ff4df34d37ff5154 (diff)
downloadu-boot-imx-18c0ad27c1e75e0a4695bb293cf8e3849538c36f.zip
u-boot-imx-18c0ad27c1e75e0a4695bb293cf8e3849538c36f.tar.gz
u-boot-imx-18c0ad27c1e75e0a4695bb293cf8e3849538c36f.tar.bz2
i.mx: iomux-v3.c: move to imx-common directory
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/armv7/imx-common/Makefile2
-rw-r--r--arch/arm/cpu/armv7/imx-common/iomux-v3.c (renamed from arch/arm/cpu/armv7/mx6/iomux-v3.c)0
-rw-r--r--arch/arm/cpu/armv7/mx6/Makefile2
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/imx-common/Makefile b/arch/arm/cpu/armv7/imx-common/Makefile
index e5ff375..53296fa 100644
--- a/arch/arm/cpu/armv7/imx-common/Makefile
+++ b/arch/arm/cpu/armv7/imx-common/Makefile
@@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libimx-common.o
-COBJS = timer.o cpu.o speed.o
+COBJS = iomux-v3.o timer.o cpu.o speed.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/arch/arm/cpu/armv7/mx6/iomux-v3.c b/arch/arm/cpu/armv7/imx-common/iomux-v3.c
index da093fb..da093fb 100644
--- a/arch/arm/cpu/armv7/mx6/iomux-v3.c
+++ b/arch/arm/cpu/armv7/imx-common/iomux-v3.c
diff --git a/arch/arm/cpu/armv7/mx6/Makefile b/arch/arm/cpu/armv7/mx6/Makefile
index b0da028..cbce411 100644
--- a/arch/arm/cpu/armv7/mx6/Makefile
+++ b/arch/arm/cpu/armv7/mx6/Makefile
@@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(SOC).o
-COBJS = soc.o clock.o iomux-v3.o
+COBJS = soc.o clock.o
SOBJS = lowlevel_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)