فهرست منبع

MX: set a common place to share code for Freescale i.MX

Up now only MX5 and MX6 can share code, because they have
a common source directory in cpu/armv7. Other not armv7
i.MX can profit of the same shared code. Move these files
into a directory accessible for all, similar to plat-mxc
in linux.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Stefano Babic 12 سال پیش
والد
کامیت
ea00e59be0

+ 2 - 5
Makefile

@@ -306,11 +306,8 @@ ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
 LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
 endif
 
-ifeq ($(SOC),mx5)
-LIBS-y += $(CPUDIR)/imx-common/libimx-common.o
-endif
-ifeq ($(SOC),mx6)
-LIBS-y += $(CPUDIR)/imx-common/libimx-common.o
+ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
+LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
 endif
 
 ifeq ($(SOC),s5pc1xx)

+ 3 - 1
arch/arm/cpu/armv7/imx-common/Makefile → arch/arm/imx-common/Makefile

@@ -27,8 +27,10 @@ include $(TOPDIR)/config.mk
 
 LIB     = $(obj)libimx-common.o
 
+ifeq ($(SOC),$(filter $(SOC),mx5 mx6))
 COBJS-y	= iomux-v3.o timer.o cpu.o speed.o
-COBJS-$(CONFIG_I2C_MXC) += i2c.o
+COBJS-$(CONFIG_I2C_MXC) += i2c-mxv7.o
+endif
 COBJS-$(CONFIG_CMD_BMODE) += cmd_bmode.o
 COBJS	:= $(sort $(COBJS-y))
 

+ 0 - 0
arch/arm/cpu/armv7/imx-common/cmd_bmode.c → arch/arm/imx-common/cmd_bmode.c


+ 0 - 0
arch/arm/cpu/armv7/imx-common/cpu.c → arch/arm/imx-common/cpu.c


+ 0 - 0
arch/arm/cpu/armv7/imx-common/i2c.c → arch/arm/imx-common/i2c-mxv7.c


+ 0 - 0
arch/arm/cpu/armv7/imx-common/iomux-v3.c → arch/arm/imx-common/iomux-v3.c


+ 0 - 0
arch/arm/cpu/armv7/imx-common/speed.c → arch/arm/imx-common/speed.c


+ 0 - 0
arch/arm/cpu/armv7/imx-common/timer.c → arch/arm/imx-common/timer.c