MX28: config: Allow different target generation in elftosb call

PATCH New Otavio Salvador 4 participants 11 messages Aug 18, 2012 – Aug 20, 2012

Subsystems (3)

Arm (32-bit) Arm i.MX and Layerscape Kbuild

lore

Share & tools

lore

Otavio Salvador

author

2012-08-18 17:25 UTC #0 lore raw

PATCH v2 1/2 MX28: config: Allow different target generation in elftosb call

The elftosb call needs to use a target param specific for i.MX28. This patch allow for later addition of i.MX233.

Signed-off-by Otavio Salvador <[email protected]>

---
Changes in v2:
- fix Makefile according
- move u-boot.bd to u-boot-imx28.bd

 Makefile                                                  |    5 ++++-
 arch/arm/cpu/arm926ejs/mxs/{u-boot.bd => u-boot-imx28.bd} |    0
 2 files changed, 4 insertions(+), 1 deletion(-)
 rename arch/arm/cpu/arm926ejs/mxs/{u-boot.bd => u-boot-imx28.bd} (100%)

Makefile +4 -1

index f6471e2..1df4c1d 100644
@@ -452,8 +452,11 @@ $(obj)u-boot.ais:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
 		cat $(obj)spl/u-boot-spl-pad.ais $(obj)u-boot.bin > \
 			$(obj)u-boot.ais
 
+# Specify the target for use in elftosb call
+ELFTOSB_TARGET-$(CONFIG_MX28) = imx28
+
 $(obj)u-boot.sb:       $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
-		elftosb -zdf imx28 -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot.bd \
+		elftosb -zdf $(ELFTOSB_TARGET-y) -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd \
 			-o $(obj)u-boot.sb
 
 # On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.

arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd renamed from arch/arm/cpu/arm926ejs/mxs/u-boot.bd +0 -0

similarity index 100%
rename from arch/arm/cpu/arm926ejs/mxs/u-boot.bd
rename to arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd

Signature · 1 line

1.7.10.4

Otavio Salvador

author

2012-08-18 17:25 UTC #1 lore raw

PATCH v2 2/2 MX28: Move "regs-base.h" include after SoC type configuration

For i.MX233 addition the base registers need to be change so the SoC definition needs to be known before the header include.

The following boards has been changed:

* apx4devkit
* m28evk
* mx28evk
* sc_sps_1

Signed-off-by Otavio Salvador <[email protected]>

Acked-by Stefano Babic <[email protected]>

---
Changes in v2:
- no changes

 include/configs/apx4devkit.h |    4 ++--
 include/configs/m28evk.h     |    4 ++--
 include/configs/mx28evk.h    |    5 +++--
 include/configs/sc_sps_1.h   |    4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

include/configs/apx4devkit.h +2 -2

index b5ae44f..af0b714 100644
@@ -22,8 +22,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/regs-base.h>
-
 /* SoC configurations */
 #define CONFIG_MX28				/* i.MX28 SoC */
 #define CONFIG_MXS_GPIO				/* GPIO control */

@@ -32,6 +30,8 @@
 #define MACH_TYPE_APX4DEVKIT	3712
 #define CONFIG_MACH_TYPE	MACH_TYPE_APX4DEVKIT
 
+#include <asm/arch/regs-base.h>
+
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_ARCH_CPU_INIT

include/configs/m28evk.h +2 -2

index b3ac316..91c6bb9 100644
@@ -20,8 +20,6 @@
 #ifndef __M28EVK_CONFIG_H__
 #define __M28EVK_CONFIG_H__
 
-#include <asm/arch/regs-base.h>
-
 /*
  * SoC configurations
  */

@@ -36,6 +34,8 @@
 
 #define	CONFIG_MACH_TYPE	MACH_TYPE_M28EVK
 
+#include <asm/arch/regs-base.h>
+
 #define	CONFIG_SYS_NO_FLASH
 #define	CONFIG_BOARD_EARLY_INIT_F
 #define	CONFIG_ARCH_MISC_INIT

include/configs/mx28evk.h +3 -2

index 4e70617..ac06caf 100644
@@ -19,17 +19,18 @@
 #ifndef __MX28EVK_CONFIG_H__
 #define __MX28EVK_CONFIG_H__
 
-#include <asm/arch/regs-base.h>
-
 /*
  * SoC configurations
  */
 #define CONFIG_MX28				/* i.MX28 SoC */
+
 #define CONFIG_MXS_GPIO			/* GPIO control */
 #define CONFIG_SYS_HZ		1000		/* Ticks per second */
 
 #define CONFIG_MACH_TYPE	MACH_TYPE_MX28EVK
 
+#include <asm/arch/regs-base.h>
+
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_ARCH_MISC_INIT

include/configs/sc_sps_1.h +2 -2

index f0b6f2b..0ebdfb8 100644
@@ -22,8 +22,6 @@
 #ifndef __SC_SPS_1_H__
 #define __SC_SPS_1_H__
 
-#include <asm/arch/regs-base.h>
-
 /*
  * SoC configurations
  */

@@ -38,6 +36,8 @@
 
 #define CONFIG_MACH_TYPE	MACH_TYPE_SC_SPS_1
 
+#include <asm/arch/regs-base.h>
+
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_SYS_ICACHE_OFF
 #define CONFIG_SYS_DCACHE_OFF

Signature · 1 line

1.7.10.4

Marek Vasut

2012-08-18 18:04 UTC #2 lore raw

PATCH v2 2/2 MX28: Move "regs-base.h" include after SoC type configuration

Dear Otavio Salvador,

Quoted 5 lines

For i.MX233 addition the base registers need to be change so the SoC definition needs to be known before the header include.
The following boards has been changed:

Quoted 7 lines

* apx4devkit
* m28evk
* mx28evk
* sc_sps_1
Signed-off-by Otavio Salvador <[email protected]>
Acked-by Stefano Babic <[email protected]>

Seems ok

Quoted 93 lines

---
Changes in v2:
- no changes

 include/configs/apx4devkit.h |    4 ++--
 include/configs/m28evk.h     |    4 ++--
 include/configs/mx28evk.h    |    5 +++--
 include/configs/sc_sps_1.h   |    4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

include/configs/apx4devkit.h +2 -2

index b5ae44f..af0b714 100644
@@ -22,8 +22,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/regs-base.h>
-
 /* SoC configurations */
 #define CONFIG_MX28				/* i.MX28 SoC */
 #define CONFIG_MXS_GPIO				/* GPIO control */

@@ -32,6 +30,8 @@
 #define MACH_TYPE_APX4DEVKIT	3712
 #define CONFIG_MACH_TYPE	MACH_TYPE_APX4DEVKIT
 
+#include <asm/arch/regs-base.h>
+
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_ARCH_CPU_INIT

include/configs/m28evk.h +2 -2

index b3ac316..91c6bb9 100644
@@ -20,8 +20,6 @@
 #ifndef __M28EVK_CONFIG_H__
 #define __M28EVK_CONFIG_H__
 
-#include <asm/arch/regs-base.h>
-
 /*
  * SoC configurations
  */

@@ -36,6 +34,8 @@
 
 #define	CONFIG_MACH_TYPE	MACH_TYPE_M28EVK
 
+#include <asm/arch/regs-base.h>
+
 #define	CONFIG_SYS_NO_FLASH
 #define	CONFIG_BOARD_EARLY_INIT_F
 #define	CONFIG_ARCH_MISC_INIT

include/configs/mx28evk.h +3 -2

index 4e70617..ac06caf 100644
@@ -19,17 +19,18 @@
 #ifndef __MX28EVK_CONFIG_H__
 #define __MX28EVK_CONFIG_H__
 
-#include <asm/arch/regs-base.h>
-
 /*
  * SoC configurations
  */
 #define CONFIG_MX28				/* i.MX28 SoC */
+
 #define CONFIG_MXS_GPIO			/* GPIO control */
 #define CONFIG_SYS_HZ		1000		/* Ticks per second */
 
 #define CONFIG_MACH_TYPE	MACH_TYPE_MX28EVK
 
+#include <asm/arch/regs-base.h>
+
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_ARCH_MISC_INIT

include/configs/sc_sps_1.h +0 -2

index f0b6f2b..0ebdfb8 100644
@@ -22,8 +22,6 @@
 #ifndef __SC_SPS_1_H__
 #define __SC_SPS_1_H__
 
-#include <asm/arch/regs-base.h>
-
 /*
  * SoC configurations
  */

include/configs/sc_sps_1.h line 43

Quoted 8 lines

include/configs/sc_sps_1.h +2 -0

@@ -38,6 +36,8 @@
 
 #define CONFIG_MACH_TYPE	MACH_TYPE_SC_SPS_1
 
+#include <asm/arch/regs-base.h>
+
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_SYS_ICACHE_OFF
 #define CONFIG_SYS_DCACHE_OFF

Best regards,
Marek Vasut

Stefano Babic

2012-08-20 08:02 UTC #3 lore raw

PATCH v2 2/2 MX28: Move "regs-base.h" include after SoC type configuration

In reply to Otavio Salvador

Quoted 106 lines · Otavio Salvador

For i.MX233 addition the base registers need to be change so the SoC definition needs to be known before the header include.

The following boards has been changed:

* apx4devkit
* m28evk
* mx28evk
* sc_sps_1

Signed-off-by Otavio Salvador <[email protected]>

Acked-by Stefano Babic <[email protected]>

---
Changes in v2:
- no changes

 include/configs/apx4devkit.h |    4 ++--
 include/configs/m28evk.h     |    4 ++--
 include/configs/mx28evk.h    |    5 +++--
 include/configs/sc_sps_1.h   |    4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

include/configs/apx4devkit.h +2 -2

index b5ae44f..af0b714 100644
@@ -22,8 +22,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/regs-base.h>
-
 /* SoC configurations */
 #define CONFIG_MX28				/* i.MX28 SoC */
 #define CONFIG_MXS_GPIO				/* GPIO control */

@@ -32,6 +30,8 @@
 #define MACH_TYPE_APX4DEVKIT	3712
 #define CONFIG_MACH_TYPE	MACH_TYPE_APX4DEVKIT
 
+#include <asm/arch/regs-base.h>
+
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_ARCH_CPU_INIT

include/configs/m28evk.h +2 -2

index b3ac316..91c6bb9 100644
@@ -20,8 +20,6 @@
 #ifndef __M28EVK_CONFIG_H__
 #define __M28EVK_CONFIG_H__
 
-#include <asm/arch/regs-base.h>
-
 /*
  * SoC configurations
  */

@@ -36,6 +34,8 @@
 
 #define	CONFIG_MACH_TYPE	MACH_TYPE_M28EVK
 
+#include <asm/arch/regs-base.h>
+
 #define	CONFIG_SYS_NO_FLASH
 #define	CONFIG_BOARD_EARLY_INIT_F
 #define	CONFIG_ARCH_MISC_INIT

include/configs/mx28evk.h +3 -2

index 4e70617..ac06caf 100644
@@ -19,17 +19,18 @@
 #ifndef __MX28EVK_CONFIG_H__
 #define __MX28EVK_CONFIG_H__
 
-#include <asm/arch/regs-base.h>
-
 /*
  * SoC configurations
  */
 #define CONFIG_MX28				/* i.MX28 SoC */
+
 #define CONFIG_MXS_GPIO			/* GPIO control */
 #define CONFIG_SYS_HZ		1000		/* Ticks per second */
 
 #define CONFIG_MACH_TYPE	MACH_TYPE_MX28EVK
 
+#include <asm/arch/regs-base.h>
+
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_ARCH_MISC_INIT

include/configs/sc_sps_1.h +0 -2

index f0b6f2b..0ebdfb8 100644
@@ -22,8 +22,6 @@
 #ifndef __SC_SPS_1_H__
 #define __SC_SPS_1_H__
 
-#include <asm/arch/regs-base.h>
-
 /*
  * SoC configurations
  */

include/configs/sc_sps_1.h line 43

Quoted 8 lines

include/configs/sc_sps_1.h +2 -0

@@ -38,6 +36,8 @@
 
 #define CONFIG_MACH_TYPE	MACH_TYPE_SC_SPS_1
 
+#include <asm/arch/regs-base.h>
+
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_SYS_ICACHE_OFF
 #define CONFIG_SYS_DCACHE_OFF

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
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
=====================================================================

Marek Vasut

2012-08-18 18:03 UTC #4 lore raw

PATCH v2 1/2 MX28: config: Allow different target generation in elftosb call

In reply to Otavio Salvador

Dear Otavio Salvador,

Quoted 31 lines

The elftosb call needs to use a target param specific for i.MX28. This patch allow for later addition of i.MX233.
Signed-off-by Otavio Salvador <[email protected]>
---
Changes in v2:
- fix Makefile according
- move u-boot.bd to u-boot-imx28.bd
 Makefile                                                  |    5 ++++-
 arch/arm/cpu/arm926ejs/mxs/{u-boot.bd => u-boot-imx28.bd} |    0
 2 files changed, 4 insertions(+), 1 deletion(-)
 rename arch/arm/cpu/arm926ejs/mxs/{u-boot.bd => u-boot-imx28.bd} (100%)
Makefile +4 -1
index f6471e2..1df4c1d 100644
@@ -452,8 +452,11 @@ $(obj)u-boot.ais:       $(obj)spl/u-boot-spl.bin
 $(obj)u-boot.bin cat $(obj)spl/u-boot-spl-pad.ais $(obj)u-boot.bin > \
 			$(obj)u-boot.ais
 
+# Specify the target for use in elftosb call
+ELFTOSB_TARGET-$(CONFIG_MX28) = imx28
+
 $(obj)u-boot.sb:       $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
-		elftosb -zdf imx28 -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot.bd \
+		elftosb -zdf $(ELFTOSB_TARGET-y) -c
$(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd \ -o $(obj)u-boot.sb

Quoted 5 lines

# On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.
(quoted diff) +0 -0
b/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd similarity index 100% rename from arch/arm/cpu/arm926ejs/mxs/u-boot.bd
rename to arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd

I think we should try and see if the mx28 and mx23 .bd can't be converged together too. Remind me in the evening (~4-5 hours from now) to try it.

Best regards,
Marek Vasut

Otavio Salvador

author

2012-08-18 18:08 UTC #5 lore raw

PATCH v2 1/2 MX28: config: Allow different target generation in elftosb call

Quoted 2 lines · Marek Vasut

I think we should try and see if the mx28 and mx23 .bd can't be converged together too. Remind me in the evening (~4-5 hours from now) to try it.

We can try but mx23 cannot use the ivt helper; so we ended having a specific file for each processor.

If we can get those merged, good.

Signature · 3 lines

Otavio Salvador                             O.S. Systems
E-mail: otavio at ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Marek Vasut

2012-08-18 22:06 UTC #6 lore raw

PATCH v2 1/2 MX28: config: Allow different target generation in elftosb call

Dear Otavio Salvador,

Quoted 6 lines · Marek Vasut

Quoted 2 lines
I think we should try and see if the mx28 and mx23 .bd can't be converged together too. Remind me in the evening (~4-5 hours from now) to try it.
We can try but mx23 cannot use the ivt helper; so we ended having a specific file for each processor.

Ooooh, that's correct.

Quoted 1 line

If we can get those merged, good.

Best regards,
Marek Vasut

Otavio Salvador

author

2012-08-18 22:28 UTC #7 lore raw

PATCH v2 1/2 MX28: config: Allow different target generation in elftosb call

Quoted 12 lines · Marek Vasut

Dear Otavio Salvador,
Quoted 6 lines · Marek Vasut
Quoted 2 lines
I think we should try and see if the mx28 and mx23 .bd can't be converged together too. Remind me in the evening (~4-5 hours from now) to try it.
We can try but mx23 cannot use the ivt helper; so we ended having a specific file for each processor.
Ooooh, that's correct.
Quoted 1 line
If we can get those merged, good.

So; what we should do? Do you think this can be merged as is?

Signature · 3 lines

Otavio Salvador                             O.S. Systems
E-mail: otavio at ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

stefano babic

2012-08-18 22:54 UTC #8 lore raw

PATCH v2 1/2 MX28: config: Allow different target generation in elftosb call

Am 19/08/2012 00:28, schrieb Otavio Salvador:

Quoted 7 lines · Marek Vasut

Quoted 6 lines
Dear Otavio Salvador,
Quoted 4 lines · Marek Vasut
Quoted 2 lines
I think we should try and see if the mx28 and mx23 .bd can't be converged together too. Remind me in the evening (~4-5 hours from now) to try it.

Quoted 9 lines

Quoted 6 lines
Quoted 2 lines
We can try but mx23 cannot use the ivt helper; so we ended having a specific file for each processor.
Ooooh, that's correct.
Quoted 1 line
If we can get those merged, good.
So; what we should do? Do you think this can be merged as is?

IMHO yes and I will do it, if one of you don't stop me...

Stefano

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Marek Vasut

2012-08-18 23:00 UTC #9 lore raw

PATCH v2 1/2 MX28: config: Allow different target generation in elftosb call

Dear stefano babic,

Quoted 5 lines

Am 19/08/2012 00:28, schrieb Otavio Salvador:
Quoted 4 lines · Marek Vasut
Quoted 3 lines
Dear Otavio Salvador,
Quoted 1 line
On Sat, Aug 18, 2012 at 3:03 PM, Marek Vasut <[email protected]>

Quoted 7 lines · wrote:

Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
Quoted 3 lines
I think we should try and see if the mx28 and mx23 .bd can't be converged together too. Remind me in the evening (~4-5 hours from now) to try it.
We can try but mx23 cannot use the ivt helper; so we ended having a specific file for each processor.

Quoted 7 lines

Quoted 5 lines
Quoted 3 lines
Ooooh, that's correct.
Quoted 1 line
If we can get those merged, good.
So; what we should do? Do you think this can be merged as is?
IMHO yes and I will do it, if one of you don't stop me...

Yes please, throw it in the machine! :-)

Acked-by Marek Vasut <[email protected]>

Quoted 1 line

Stefano

Best regards,
Marek Vasut

Stefano Babic

2012-08-20 08:01 UTC #10 lore raw

PATCH v2 1/2 MX28: config: Allow different target generation in elftosb call

In reply to Otavio Salvador

arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd

Quoted 36 lines · Otavio Salvador

The elftosb call needs to use a target param specific for i.MX28. This patch allow for later addition of i.MX233.

Signed-off-by Otavio Salvador <[email protected]>

---
Changes in v2:
- fix Makefile according
- move u-boot.bd to u-boot-imx28.bd

 Makefile                                                  |    5 ++++-
 arch/arm/cpu/arm926ejs/mxs/{u-boot.bd => u-boot-imx28.bd} |    0
 2 files changed, 4 insertions(+), 1 deletion(-)
 rename arch/arm/cpu/arm926ejs/mxs/{u-boot.bd => u-boot-imx28.bd} (100%)

Makefile +4 -1

index f6471e2..1df4c1d 100644
@@ -452,8 +452,11 @@ $(obj)u-boot.ais:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
 		cat $(obj)spl/u-boot-spl-pad.ais $(obj)u-boot.bin > \
 			$(obj)u-boot.ais
 
+# Specify the target for use in elftosb call
+ELFTOSB_TARGET-$(CONFIG_MX28) = imx28
+
 $(obj)u-boot.sb:       $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
-		elftosb -zdf imx28 -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot.bd \
+		elftosb -zdf $(ELFTOSB_TARGET-y) -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd \
 			-o $(obj)u-boot.sb
 
 # On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.

arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd renamed from arch/arm/cpu/arm926ejs/mxs/u-boot.bd +0 -0

similarity index 100%
rename from arch/arm/cpu/arm926ejs/mxs/u-boot.bd
rename to arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
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
=====================================================================