summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJason Liu <jason.hui@linaro.org>2011-11-25 00:18:01 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-12-09 17:30:10 +0100
commit18936ee2ad8bf92f8219026b6b93fdcf58baeb61 (patch)
tree1b9eabdd084618a739ba3cc129bed04699fcd809 /Makefile
parent393cb36199d337c8554cc8dfc853f5f405f4742b (diff)
downloadu-boot-imx-18936ee2ad8bf92f8219026b6b93fdcf58baeb61.zip
u-boot-imx-18936ee2ad8bf92f8219026b6b93fdcf58baeb61.tar.gz
u-boot-imx-18936ee2ad8bf92f8219026b6b93fdcf58baeb61.tar.bz2
i.mx: introduce the armv7/imx-common folder
In order to support the coming MX6 platform and to reducde the duplicated code, we had better move some common files or functions to the imx-common folder for sharing. This patch does the following: - move speed.c file from armv7/mx5/speed.c to armv7/imx-common/speed.c - move armv7/mx5/timer.c to armv7/imx-common/timer.c, no any new feature added but just fix the checkpatch errors in the old file and remove the CONFIG_SYS_MX5_CLK32 reference in the file - create one new file cpu.c file to store the common function with i.mx5/6 Signed-off-by: Jason Liu <jason.hui@linaro.org> Cc:Stefano Babic <sbabic@denx.de> Acked-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 1be2d80..8c47d72 100644
--- a/Makefile
+++ b/Makefile
@@ -296,6 +296,14 @@ LIBS += post/libpost.o
ifneq ($(CONFIG_AM335X)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
LIBS += $(CPUDIR)/omap-common/libomap-common.o
endif
+
+ifeq ($(SOC),mx5)
+LIBS += $(CPUDIR)/imx-common/libimx-common.o
+endif
+ifeq ($(SOC),mx6)
+LIBS += $(CPUDIR)/imx-common/libimx-common.o
+endif
+
ifeq ($(SOC),s5pc1xx)
LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
endif