* [U-Boot] [PATCH v2 1/2] MX28: config: Allow different target generation in elftosb call
@ 2012-08-18 17:25 Otavio Salvador
2012-08-18 17:25 ` [U-Boot] [PATCH v2 2/2] MX28: Move "regs-base.h" include after SoC type configuration Otavio Salvador
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Otavio Salvador @ 2012-08-18 17:25 UTC (permalink / raw)
To: u-boot
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 <otavio@ossystems.com.br>
---
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%)
diff --git a/Makefile b/Makefile
index f6471e2..1df4c1d 100644
--- a/Makefile
+++ b/Makefile
@@ -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.
diff --git a/arch/arm/cpu/arm926ejs/mxs/u-boot.bd 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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [U-Boot] [PATCH v2 2/2] MX28: Move "regs-base.h" include after SoC type configuration 2012-08-18 17:25 [U-Boot] [PATCH v2 1/2] MX28: config: Allow different target generation in elftosb call Otavio Salvador @ 2012-08-18 17:25 ` Otavio Salvador 2012-08-18 18:04 ` Marek Vasut 2012-08-20 8:02 ` Stefano Babic 2012-08-18 18:03 ` [U-Boot] [PATCH v2 1/2] MX28: config: Allow different target generation in elftosb call Marek Vasut 2012-08-20 8:01 ` Stefano Babic 2 siblings, 2 replies; 11+ messages in thread From: Otavio Salvador @ 2012-08-18 17:25 UTC (permalink / raw) To: u-boot 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 <otavio@ossystems.com.br> Acked-by: Stefano Babic <sbabic@denx.de> --- 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(-) diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index b5ae44f..af0b714 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -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 diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index b3ac316..91c6bb9 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -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 diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 4e70617..ac06caf 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -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 diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index f0b6f2b..0ebdfb8 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -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 -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 2/2] MX28: Move "regs-base.h" include after SoC type configuration 2012-08-18 17:25 ` [U-Boot] [PATCH v2 2/2] MX28: Move "regs-base.h" include after SoC type configuration Otavio Salvador @ 2012-08-18 18:04 ` Marek Vasut 2012-08-20 8:02 ` Stefano Babic 1 sibling, 0 replies; 11+ messages in thread From: Marek Vasut @ 2012-08-18 18:04 UTC (permalink / raw) To: u-boot Dear 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 <otavio@ossystems.com.br> > Acked-by: Stefano Babic <sbabic@denx.de> Seems ok > --- > 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(-) > > diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h > index b5ae44f..af0b714 100644 > --- a/include/configs/apx4devkit.h > +++ b/include/configs/apx4devkit.h > @@ -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 > diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h > index b3ac316..91c6bb9 100644 > --- a/include/configs/m28evk.h > +++ b/include/configs/m28evk.h > @@ -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 > diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h > index 4e70617..ac06caf 100644 > --- a/include/configs/mx28evk.h > +++ b/include/configs/mx28evk.h > @@ -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 > diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h > index f0b6f2b..0ebdfb8 100644 > --- a/include/configs/sc_sps_1.h > +++ b/include/configs/sc_sps_1.h > @@ -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 Best regards, Marek Vasut ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 2/2] MX28: Move "regs-base.h" include after SoC type configuration 2012-08-18 17:25 ` [U-Boot] [PATCH v2 2/2] MX28: Move "regs-base.h" include after SoC type configuration Otavio Salvador 2012-08-18 18:04 ` Marek Vasut @ 2012-08-20 8:02 ` Stefano Babic 1 sibling, 0 replies; 11+ messages in thread From: Stefano Babic @ 2012-08-20 8:02 UTC (permalink / raw) To: u-boot On 18/08/2012 19:25, Otavio Salvador wrote: > 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 <otavio@ossystems.com.br> > Acked-by: Stefano Babic <sbabic@denx.de> > --- > 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(-) > > diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h > index b5ae44f..af0b714 100644 > --- a/include/configs/apx4devkit.h > +++ b/include/configs/apx4devkit.h > @@ -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 > diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h > index b3ac316..91c6bb9 100644 > --- a/include/configs/m28evk.h > +++ b/include/configs/m28evk.h > @@ -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 > diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h > index 4e70617..ac06caf 100644 > --- a/include/configs/mx28evk.h > +++ b/include/configs/mx28evk.h > @@ -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 > diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h > index f0b6f2b..0ebdfb8 100644 > --- a/include/configs/sc_sps_1.h > +++ b/include/configs/sc_sps_1.h > @@ -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 > Applied to u-boot-imx, thanks. Best regards, Stefano Babic -- ===================================================================== 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 1/2] MX28: config: Allow different target generation in elftosb call 2012-08-18 17:25 [U-Boot] [PATCH v2 1/2] MX28: config: Allow different target generation in elftosb call Otavio Salvador 2012-08-18 17:25 ` [U-Boot] [PATCH v2 2/2] MX28: Move "regs-base.h" include after SoC type configuration Otavio Salvador @ 2012-08-18 18:03 ` Marek Vasut 2012-08-18 18:08 ` Otavio Salvador 2012-08-20 8:01 ` Stefano Babic 2 siblings, 1 reply; 11+ messages in thread From: Marek Vasut @ 2012-08-18 18:03 UTC (permalink / raw) To: u-boot Dear 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 <otavio@ossystems.com.br> > --- > 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%) > > diff --git a/Makefile b/Makefile > index f6471e2..1df4c1d 100644 > --- a/Makefile > +++ b/Makefile > @@ -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. > diff --git a/arch/arm/cpu/arm926ejs/mxs/u-boot.bd > 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 1/2] MX28: config: Allow different target generation in elftosb call 2012-08-18 18:03 ` [U-Boot] [PATCH v2 1/2] MX28: config: Allow different target generation in elftosb call Marek Vasut @ 2012-08-18 18:08 ` Otavio Salvador 2012-08-18 22:06 ` Marek Vasut 0 siblings, 1 reply; 11+ messages in thread From: Otavio Salvador @ 2012-08-18 18:08 UTC (permalink / raw) To: u-boot On Sat, Aug 18, 2012 at 3:03 PM, Marek Vasut <marek.vasut@gmail.com> wrote: > 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. -- 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 1/2] MX28: config: Allow different target generation in elftosb call 2012-08-18 18:08 ` Otavio Salvador @ 2012-08-18 22:06 ` Marek Vasut 2012-08-18 22:28 ` Otavio Salvador 0 siblings, 1 reply; 11+ messages in thread From: Marek Vasut @ 2012-08-18 22:06 UTC (permalink / raw) To: u-boot Dear Otavio Salvador, > On Sat, Aug 18, 2012 at 3:03 PM, Marek Vasut <marek.vasut@gmail.com> wrote: > > 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. > If we can get those merged, good. Best regards, Marek Vasut ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 1/2] MX28: config: Allow different target generation in elftosb call 2012-08-18 22:06 ` Marek Vasut @ 2012-08-18 22:28 ` Otavio Salvador 2012-08-18 22:54 ` stefano babic 0 siblings, 1 reply; 11+ messages in thread From: Otavio Salvador @ 2012-08-18 22:28 UTC (permalink / raw) To: u-boot On Sat, Aug 18, 2012 at 7:06 PM, Marek Vasut <marex@denx.de> wrote: > Dear Otavio Salvador, > >> On Sat, Aug 18, 2012 at 3:03 PM, Marek Vasut <marek.vasut@gmail.com> wrote: >> > 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. > >> If we can get those merged, good. So; what we should do? Do you think this can be merged as is? -- 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 1/2] MX28: config: Allow different target generation in elftosb call 2012-08-18 22:28 ` Otavio Salvador @ 2012-08-18 22:54 ` stefano babic 2012-08-18 23:00 ` Marek Vasut 0 siblings, 1 reply; 11+ messages in thread From: stefano babic @ 2012-08-18 22:54 UTC (permalink / raw) To: u-boot Am 19/08/2012 00:28, schrieb Otavio Salvador: > On Sat, Aug 18, 2012 at 7:06 PM, Marek Vasut <marex@denx.de> wrote: >> Dear Otavio Salvador, >> >>> On Sat, Aug 18, 2012 at 3:03 PM, Marek Vasut <marek.vasut@gmail.com> wrote: >>>> 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. >> >>> 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 -- ===================================================================== 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 ===================================================================== ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 1/2] MX28: config: Allow different target generation in elftosb call 2012-08-18 22:54 ` stefano babic @ 2012-08-18 23:00 ` Marek Vasut 0 siblings, 0 replies; 11+ messages in thread From: Marek Vasut @ 2012-08-18 23:00 UTC (permalink / raw) To: u-boot Dear stefano babic, > Am 19/08/2012 00:28, schrieb Otavio Salvador: > > On Sat, Aug 18, 2012 at 7:06 PM, Marek Vasut <marex@denx.de> wrote: > >> Dear Otavio Salvador, > >> > >>> On Sat, Aug 18, 2012 at 3:03 PM, Marek Vasut <marek.vasut@gmail.com> wrote: > >>>> 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. > >> > >>> 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 <marex@denx.de> > Stefano Best regards, Marek Vasut ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 1/2] MX28: config: Allow different target generation in elftosb call 2012-08-18 17:25 [U-Boot] [PATCH v2 1/2] MX28: config: Allow different target generation in elftosb call Otavio Salvador 2012-08-18 17:25 ` [U-Boot] [PATCH v2 2/2] MX28: Move "regs-base.h" include after SoC type configuration Otavio Salvador 2012-08-18 18:03 ` [U-Boot] [PATCH v2 1/2] MX28: config: Allow different target generation in elftosb call Marek Vasut @ 2012-08-20 8:01 ` Stefano Babic 2 siblings, 0 replies; 11+ messages in thread From: Stefano Babic @ 2012-08-20 8:01 UTC (permalink / raw) To: u-boot On 18/08/2012 19:25, Otavio Salvador wrote: > 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 <otavio@ossystems.com.br> > --- > 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%) > > diff --git a/Makefile b/Makefile > index f6471e2..1df4c1d 100644 > --- a/Makefile > +++ b/Makefile > @@ -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. > diff --git a/arch/arm/cpu/arm926ejs/mxs/u-boot.bd 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 > Applied to u-boot-imx, thanks. Best regards, Stefano Babic -- ===================================================================== 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
end of thread, other threads:[~2012-08-20 8:02 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-08-18 17:25 [U-Boot] [PATCH v2 1/2] MX28: config: Allow different target generation in elftosb call Otavio Salvador 2012-08-18 17:25 ` [U-Boot] [PATCH v2 2/2] MX28: Move "regs-base.h" include after SoC type configuration Otavio Salvador 2012-08-18 18:04 ` Marek Vasut 2012-08-20 8:02 ` Stefano Babic 2012-08-18 18:03 ` [U-Boot] [PATCH v2 1/2] MX28: config: Allow different target generation in elftosb call Marek Vasut 2012-08-18 18:08 ` Otavio Salvador 2012-08-18 22:06 ` Marek Vasut 2012-08-18 22:28 ` Otavio Salvador 2012-08-18 22:54 ` stefano babic 2012-08-18 23:00 ` Marek Vasut 2012-08-20 8:01 ` Stefano Babic
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox