From mboxrd@z Thu Jan 1 00:00:00 1970 From: Troy Kisky Date: Wed, 05 Sep 2012 13:12:40 -0700 Subject: [U-Boot] [PATCH v2] MX: set a common place to share code for Freescale i.MX In-Reply-To: <5047B1B6.8060406@boundarydevices.com> References: <1346486755-19500-1-git-send-email-sbabic@denx.de> <1346828457-1365-1-git-send-email-sbabic@denx.de> <5047B1B6.8060406@boundarydevices.com> Message-ID: <5047B238.8030902@boundarydevices.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 9/5/2012 1:10 PM, Troy Kisky wrote: > On 9/5/2012 12:00 AM, Stefano Babic wrote: >> 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 >> --- >> Changes in v2: >> - Use the common path for all i.MX SOCs in Makefile >> >> Makefile | 7 ++----- >> arch/arm/{cpu/armv7 => }/imx-common/Makefile | 2 ++ >> arch/arm/{cpu/armv7 => }/imx-common/cmd_bmode.c | 0 >> arch/arm/{cpu/armv7 => }/imx-common/cpu.c | 0 >> arch/arm/{cpu/armv7 => }/imx-common/i2c.c | 0 >> arch/arm/{cpu/armv7 => }/imx-common/iomux-v3.c | 0 >> arch/arm/{cpu/armv7 => }/imx-common/speed.c | 0 >> arch/arm/{cpu/armv7 => }/imx-common/timer.c | 0 >> 8 files changed, 4 insertions(+), 5 deletions(-) >> rename arch/arm/{cpu/armv7 => }/imx-common/Makefile (97%) >> rename arch/arm/{cpu/armv7 => }/imx-common/cmd_bmode.c (100%) >> rename arch/arm/{cpu/armv7 => }/imx-common/cpu.c (100%) >> rename arch/arm/{cpu/armv7 => }/imx-common/i2c.c (100%) >> rename arch/arm/{cpu/armv7 => }/imx-common/iomux-v3.c (100%) >> rename arch/arm/{cpu/armv7 => }/imx-common/speed.c (100%) >> rename arch/arm/{cpu/armv7 => }/imx-common/timer.c (100%) >> >> diff --git a/Makefile b/Makefile >> index d27bb17..0826055 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -305,11 +305,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) >> diff --git a/arch/arm/cpu/armv7/imx-common/Makefile >> b/arch/arm/imx-common/Makefile >> similarity index 97% >> rename from arch/arm/cpu/armv7/imx-common/Makefile >> rename to arch/arm/imx-common/Makefile >> index 16fba8d..453f822 100644 >> --- a/arch/arm/cpu/armv7/imx-common/Makefile >> +++ b/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 > > shouldn't the endif be a line higher??? > > mx25_3stack.h:#define CONFIG_I2C_MXC 1 > No, I guess your right!!!! Sorry for the noise. >> +endif >> COBJS-$(CONFIG_CMD_BMODE) += cmd_bmode.o >> COBJS := $(sort $(COBJS-y)) >> diff --git a/arch/arm/cpu/armv7/imx-common/cmd_bmode.c >> b/arch/arm/imx-common/cmd_bmode.c >> similarity index 100% >> rename from arch/arm/cpu/armv7/imx-common/cmd_bmode.c >> rename to arch/arm/imx-common/cmd_bmode.c >> diff --git a/arch/arm/cpu/armv7/imx-common/cpu.c >> b/arch/arm/imx-common/cpu.c >> similarity index 100% >> rename from arch/arm/cpu/armv7/imx-common/cpu.c >> rename to arch/arm/imx-common/cpu.c >> diff --git a/arch/arm/cpu/armv7/imx-common/i2c.c >> b/arch/arm/imx-common/i2c.c >> similarity index 100% >> rename from arch/arm/cpu/armv7/imx-common/i2c.c >> rename to arch/arm/imx-common/i2c.c >> diff --git a/arch/arm/cpu/armv7/imx-common/iomux-v3.c >> b/arch/arm/imx-common/iomux-v3.c >> similarity index 100% >> rename from arch/arm/cpu/armv7/imx-common/iomux-v3.c >> rename to arch/arm/imx-common/iomux-v3.c >> diff --git a/arch/arm/cpu/armv7/imx-common/speed.c >> b/arch/arm/imx-common/speed.c >> similarity index 100% >> rename from arch/arm/cpu/armv7/imx-common/speed.c >> rename to arch/arm/imx-common/speed.c >> diff --git a/arch/arm/cpu/armv7/imx-common/timer.c >> b/arch/arm/imx-common/timer.c >> similarity index 100% >> rename from arch/arm/cpu/armv7/imx-common/timer.c >> rename to arch/arm/imx-common/timer.c >