* [U-Boot] [PATCH v1] MX: set a common place to share code for Freescale i.MX
@ 2012-09-01 8:05 Stefano Babic
2012-09-01 14:51 ` Marek Vasut
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Stefano Babic @ 2012-09-01 8:05 UTC (permalink / raw)
To: u-boot
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>
---
Makefile | 4 ++--
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(+), 2 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..10af1d3 100644
--- a/Makefile
+++ b/Makefile
@@ -306,10 +306,10 @@ LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
endif
ifeq ($(SOC),mx5)
-LIBS-y += $(CPUDIR)/imx-common/libimx-common.o
+LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
endif
ifeq ($(SOC),mx6)
-LIBS-y += $(CPUDIR)/imx-common/libimx-common.o
+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..d5dc6c0 100644
--- a/arch/arm/cpu/armv7/imx-common/Makefile
+++ b/arch/arm/imx-common/Makefile
@@ -27,7 +27,9 @@ 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
+endif
COBJS-$(CONFIG_I2C_MXC) += i2c.o
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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v1] MX: set a common place to share code for Freescale i.MX
2012-09-01 8:05 [U-Boot] [PATCH v1] MX: set a common place to share code for Freescale i.MX Stefano Babic
@ 2012-09-01 14:51 ` Marek Vasut
2012-09-05 7:00 ` [U-Boot] [PATCH v2] " Stefano Babic
2012-09-06 6:16 ` [U-Boot] [PATCH v3] " Stefano Babic
2 siblings, 0 replies; 11+ messages in thread
From: Marek Vasut @ 2012-09-01 14:51 UTC (permalink / raw)
To: u-boot
Dear Stefano Babic,
> 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>
Reviewed-by: Marek Vasut <marex@denx.de>
[...]
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2] MX: set a common place to share code for Freescale i.MX
2012-09-01 8:05 [U-Boot] [PATCH v1] MX: set a common place to share code for Freescale i.MX Stefano Babic
2012-09-01 14:51 ` Marek Vasut
@ 2012-09-05 7:00 ` Stefano Babic
2012-09-05 7:14 ` Marek Vasut
2012-09-05 20:10 ` Troy Kisky
2012-09-06 6:16 ` [U-Boot] [PATCH v3] " Stefano Babic
2 siblings, 2 replies; 11+ messages in thread
From: Stefano Babic @ 2012-09-05 7:00 UTC (permalink / raw)
To: u-boot
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>
---
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
+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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2] MX: set a common place to share code for Freescale i.MX
2012-09-05 7:00 ` [U-Boot] [PATCH v2] " Stefano Babic
@ 2012-09-05 7:14 ` Marek Vasut
2012-09-05 20:10 ` Troy Kisky
1 sibling, 0 replies; 11+ messages in thread
From: Marek Vasut @ 2012-09-05 7:14 UTC (permalink / raw)
To: u-boot
Dear Stefano Babic,
> 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.
Add in my
Reviewed-by: Marek Vasut <marex@denx.de>
... not that there's too much to review :)
> Signed-off-by: Stefano Babic <sbabic@denx.de>
> ---
> 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
> +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
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2] MX: set a common place to share code for Freescale i.MX
2012-09-05 7:00 ` [U-Boot] [PATCH v2] " Stefano Babic
2012-09-05 7:14 ` Marek Vasut
@ 2012-09-05 20:10 ` Troy Kisky
2012-09-05 20:12 ` Troy Kisky
1 sibling, 1 reply; 11+ messages in thread
From: Troy Kisky @ 2012-09-05 20:10 UTC (permalink / raw)
To: u-boot
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 <sbabic@denx.de>
> ---
> 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
> +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
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2] MX: set a common place to share code for Freescale i.MX
2012-09-05 20:10 ` Troy Kisky
@ 2012-09-05 20:12 ` Troy Kisky
2012-09-06 5:47 ` Stefano Babic
0 siblings, 1 reply; 11+ messages in thread
From: Troy Kisky @ 2012-09-05 20:12 UTC (permalink / raw)
To: u-boot
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 <sbabic@denx.de>
>> ---
>> 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
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2] MX: set a common place to share code for Freescale i.MX
2012-09-05 20:12 ` Troy Kisky
@ 2012-09-06 5:47 ` Stefano Babic
2012-09-06 5:54 ` Marek Vasut
0 siblings, 1 reply; 11+ messages in thread
From: Stefano Babic @ 2012-09-06 5:47 UTC (permalink / raw)
To: u-boot
On 05/09/2012 22:12, Troy Kisky wrote:
> 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 <sbabic@denx.de>
>>> ---
>>> 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.
No problem. Maybe we should also later rename the files specific for a
SOC or a SOC family in imx-common, as i2c.c that it is only for MX5 and mx6.
Regards,
Stefano
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2] MX: set a common place to share code for Freescale i.MX
2012-09-06 5:47 ` Stefano Babic
@ 2012-09-06 5:54 ` Marek Vasut
2012-09-06 6:07 ` Stefano Babic
0 siblings, 1 reply; 11+ messages in thread
From: Marek Vasut @ 2012-09-06 5:54 UTC (permalink / raw)
To: u-boot
Dear Stefano Babic,
> On 05/09/2012 22:12, Troy Kisky wrote:
> > 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 <sbabic@denx.de>
> >>> ---
> >>> 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.
>
> No problem. Maybe we should also later rename the files specific for a
> SOC or a SOC family in imx-common, as i2c.c that it is only for MX5 and
> mx6.
i2c-mxv7 ? :)
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2] MX: set a common place to share code for Freescale i.MX
2012-09-06 5:54 ` Marek Vasut
@ 2012-09-06 6:07 ` Stefano Babic
2012-09-06 6:28 ` Marek Vasut
0 siblings, 1 reply; 11+ messages in thread
From: Stefano Babic @ 2012-09-06 6:07 UTC (permalink / raw)
To: u-boot
On 06/09/2012 07:54, Marek Vasut wrote:
>>>> 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.
>>
>> No problem. Maybe we should also later rename the files specific for a
>> SOC or a SOC family in imx-common, as i2c.c that it is only for MX5 and
>> mx6.
>
> i2c-mxv7 ? :)
Good idea. I push a V3 for it.
Thanks,
Stefano
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v3] MX: set a common place to share code for Freescale i.MX
2012-09-01 8:05 [U-Boot] [PATCH v1] MX: set a common place to share code for Freescale i.MX Stefano Babic
2012-09-01 14:51 ` Marek Vasut
2012-09-05 7:00 ` [U-Boot] [PATCH v2] " Stefano Babic
@ 2012-09-06 6:16 ` Stefano Babic
2 siblings, 0 replies; 11+ messages in thread
From: Stefano Babic @ 2012-09-06 6:16 UTC (permalink / raw)
To: u-boot
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>
---
Changes in v2:
- Use the common path for all i.MX SOCs
Changes in v3:
- use suffix for files that are SOC specific (Marek Vasut)
Makefile | 7 ++-----
arch/arm/{cpu/armv7 => }/imx-common/Makefile | 4 +++-
arch/arm/{cpu/armv7 => }/imx-common/cmd_bmode.c | 0
arch/arm/{cpu/armv7 => }/imx-common/cpu.c | 0
.../imx-common/i2c.c => imx-common/i2c-mxv7.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, 5 insertions(+), 6 deletions(-)
rename arch/arm/{cpu/armv7 => }/imx-common/Makefile (94%)
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 => imx-common/i2c-mxv7.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 94%
rename from arch/arm/cpu/armv7/imx-common/Makefile
rename to arch/arm/imx-common/Makefile
index 16fba8d..b3e608e 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
+COBJS-$(CONFIG_I2C_MXC) += i2c-mxv7.o
+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-mxv7.c
similarity index 100%
rename from arch/arm/cpu/armv7/imx-common/i2c.c
rename to arch/arm/imx-common/i2c-mxv7.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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2] MX: set a common place to share code for Freescale i.MX
2012-09-06 6:07 ` Stefano Babic
@ 2012-09-06 6:28 ` Marek Vasut
0 siblings, 0 replies; 11+ messages in thread
From: Marek Vasut @ 2012-09-06 6:28 UTC (permalink / raw)
To: u-boot
Dear Stefano Babic,
> On 06/09/2012 07:54, Marek Vasut wrote:
> >>>> 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.
> >>
> >> No problem. Maybe we should also later rename the files specific for a
> >> SOC or a SOC family in imx-common, as i2c.c that it is only for MX5 and
> >> mx6.
> >
> > i2c-mxv7 ? :)
>
> Good idea. I push a V3 for it.
Heh, it was just an early-morning blurt ;-)
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-09-06 6:28 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-01 8:05 [U-Boot] [PATCH v1] MX: set a common place to share code for Freescale i.MX Stefano Babic
2012-09-01 14:51 ` Marek Vasut
2012-09-05 7:00 ` [U-Boot] [PATCH v2] " Stefano Babic
2012-09-05 7:14 ` Marek Vasut
2012-09-05 20:10 ` Troy Kisky
2012-09-05 20:12 ` Troy Kisky
2012-09-06 5:47 ` Stefano Babic
2012-09-06 5:54 ` Marek Vasut
2012-09-06 6:07 ` Stefano Babic
2012-09-06 6:28 ` Marek Vasut
2012-09-06 6:16 ` [U-Boot] [PATCH v3] " Stefano Babic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox