| Message ID | 1366344655-8535-3-git-send-email-marex@denx.de |
|---|---|
| State | Changes Requested |
| Delegated to: | Stefano Babic |
| Headers | show |
Dear Marek Vasut, On Friday, April 19, 2013 6:10:52 AM, Marek Vasut wrote: > This target is currently concatenating u-boot SPL in imximage format > with u-boot.bin. The NAND SPL can load a raw binary, but the preffered > format with much less limitations is uImage format. Fix the target > so u-boot.bin is first converted into uImage format and only after > that is concatenated. Please reword: This is not a fix, but an enhancement. > > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> > Cc: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> > Cc: Fabio Estevam <fabio.estevam@freescale.com> > Cc: Scott Wood <scottwood@freescale.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Tom Rini <trini@ti.com> > --- > arch/arm/imx-common/Makefile | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile > index 44b6822..ba31d3e 100644 > --- a/arch/arm/imx-common/Makefile > +++ b/arch/arm/imx-common/Makefile > @@ -69,8 +69,11 @@ $(OBJTREE)/u-boot-with-nand-spl.imx: $(OBJTREE)/SPL > $(OBJTREE)/u-boot.bin > -I binary -O binary $(OBJTREE)/spl/u-boot-nand-spl.imx \ > $(OBJTREE)/spl/u-boot-nand-spl-pad.imx > rm $(OBJTREE)/spl/u-boot-nand-spl.imx > - cat $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.bin > $@ > - rm $(OBJTREE)/spl/u-boot-nand-spl-pad.imx > + $(OBJTREE)/tools/mkimage -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \ > + -e $(CONFIG_SYS_TEXT_BASE) -C none -d $(OBJTREE)/u-boot.bin \ > + $(OBJTREE)/u-boot.uim > + cat $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.uim > $@ > + rm $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.uim > > > ######################################################################### > -- > 1.7.11.7 This change is correct. I don't know the uImage format very well. Can you give examples of what this patch can bring compared to the raw binary format? If this change is useful, it should probably be made for u-boot-with-spl.imx too. Best regards, Benoît
Dear Benoît Thébaudeau, > Dear Marek Vasut, > > On Friday, April 19, 2013 6:10:52 AM, Marek Vasut wrote: > > This target is currently concatenating u-boot SPL in imximage format > > with u-boot.bin. The NAND SPL can load a raw binary, but the preffered > > format with much less limitations is uImage format. Fix the target > > so u-boot.bin is first converted into uImage format and only after > > that is concatenated. > > Please reword: This is not a fix, but an enhancement. > > > Signed-off-by: Marek Vasut <marex@denx.de> > > Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> > > Cc: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> > > Cc: Fabio Estevam <fabio.estevam@freescale.com> > > Cc: Scott Wood <scottwood@freescale.com> > > Cc: Stefano Babic <sbabic@denx.de> > > Cc: Tom Rini <trini@ti.com> > > --- > > > > arch/arm/imx-common/Makefile | 7 +++++-- > > 1 file changed, 5 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile > > index 44b6822..ba31d3e 100644 > > --- a/arch/arm/imx-common/Makefile > > +++ b/arch/arm/imx-common/Makefile > > @@ -69,8 +69,11 @@ $(OBJTREE)/u-boot-with-nand-spl.imx: $(OBJTREE)/SPL > > $(OBJTREE)/u-boot.bin > > > > -I binary -O binary $(OBJTREE)/spl/u-boot-nand-spl.imx \ > > $(OBJTREE)/spl/u-boot-nand-spl-pad.imx > > > > rm $(OBJTREE)/spl/u-boot-nand-spl.imx > > > > - cat $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.bin > $@ > > - rm $(OBJTREE)/spl/u-boot-nand-spl-pad.imx > > + $(OBJTREE)/tools/mkimage -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \ > > + -e $(CONFIG_SYS_TEXT_BASE) -C none -d $(OBJTREE)/u-boot.bin \ > > + $(OBJTREE)/u-boot.uim > > + cat $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.uim > $@ > > + rm $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.uim > > > > ######################################################################## > > # > > > > -- > > 1.7.11.7 > > This change is correct. > > I don't know the uImage format very well. Can you give examples of what > this patch can bring compared to the raw binary format? > > If this change is useful, it should probably be made for > u-boot-with-spl.imx too. Please see common/spl/spl_nand.c which calls spl_parse_image_header() on the payload loaded from NAND. This is implemented in common/spl/spl.c and if proper header is not found, the payload is assumed to be of 200kB of size, which is far less than fully configured U-Boot. So using the uimage format is much more flexible. Best regards, Marek Vasut
Dear Marek Vasut, On Friday, April 19, 2013 1:16:31 PM, Marek Vasut wrote: > Dear Benoît Thébaudeau, > > > Dear Marek Vasut, > > > > On Friday, April 19, 2013 6:10:52 AM, Marek Vasut wrote: > > > This target is currently concatenating u-boot SPL in imximage format > > > with u-boot.bin. The NAND SPL can load a raw binary, but the preffered > > > format with much less limitations is uImage format. Fix the target > > > so u-boot.bin is first converted into uImage format and only after > > > that is concatenated. > > > > Please reword: This is not a fix, but an enhancement. > > > > > Signed-off-by: Marek Vasut <marex@denx.de> > > > Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> > > > Cc: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> > > > Cc: Fabio Estevam <fabio.estevam@freescale.com> > > > Cc: Scott Wood <scottwood@freescale.com> > > > Cc: Stefano Babic <sbabic@denx.de> > > > Cc: Tom Rini <trini@ti.com> > > > --- > > > > > > arch/arm/imx-common/Makefile | 7 +++++-- > > > 1 file changed, 5 insertions(+), 2 deletions(-) > > > > > > diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile > > > index 44b6822..ba31d3e 100644 > > > --- a/arch/arm/imx-common/Makefile > > > +++ b/arch/arm/imx-common/Makefile > > > @@ -69,8 +69,11 @@ $(OBJTREE)/u-boot-with-nand-spl.imx: $(OBJTREE)/SPL > > > $(OBJTREE)/u-boot.bin > > > > > > -I binary -O binary $(OBJTREE)/spl/u-boot-nand-spl.imx \ > > > $(OBJTREE)/spl/u-boot-nand-spl-pad.imx > > > > > > rm $(OBJTREE)/spl/u-boot-nand-spl.imx > > > > > > - cat $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.bin > $@ > > > - rm $(OBJTREE)/spl/u-boot-nand-spl-pad.imx > > > + $(OBJTREE)/tools/mkimage -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \ > > > + -e $(CONFIG_SYS_TEXT_BASE) -C none -d $(OBJTREE)/u-boot.bin \ > > > + $(OBJTREE)/u-boot.uim > > > + cat $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.uim > $@ > > > + rm $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.uim > > > > > > ######################################################################## > > > # > > > > > > -- > > > 1.7.11.7 > > > > This change is correct. > > > > I don't know the uImage format very well. Can you give examples of what > > this patch can bring compared to the raw binary format? > > > > If this change is useful, it should probably be made for > > u-boot-with-spl.imx too. > > Please see common/spl/spl_nand.c which calls spl_parse_image_header() on the > payload loaded from NAND. This is implemented in common/spl/spl.c and if > proper > header is not found, the payload is assumed to be of 200kB of size, which is > far > less than fully configured U-Boot. Or you could #define CONFIG_SYS_MONITOR_LEN to what you need. > So using the uimage format is much more > flexible. I agree. So I'd see the following changes for this patch: - Reword "fix" to show enhancement, and detail the flexibility rationale in the description. - Extend to u-boot-with-spl.imx. Best regards, Benoît
Dear Benoît Thébaudeau, > Dear Marek Vasut, > > On Friday, April 19, 2013 1:16:31 PM, Marek Vasut wrote: > > Dear Benoît Thébaudeau, > > > > > Dear Marek Vasut, > > > > > > On Friday, April 19, 2013 6:10:52 AM, Marek Vasut wrote: > > > > This target is currently concatenating u-boot SPL in imximage format > > > > with u-boot.bin. The NAND SPL can load a raw binary, but the > > > > preffered format with much less limitations is uImage format. Fix > > > > the target so u-boot.bin is first converted into uImage format and > > > > only after that is concatenated. > > > > > > Please reword: This is not a fix, but an enhancement. > > > > > > > Signed-off-by: Marek Vasut <marex@denx.de> > > > > Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> > > > > Cc: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> > > > > Cc: Fabio Estevam <fabio.estevam@freescale.com> > > > > Cc: Scott Wood <scottwood@freescale.com> > > > > Cc: Stefano Babic <sbabic@denx.de> > > > > Cc: Tom Rini <trini@ti.com> > > > > --- > > > > > > > > arch/arm/imx-common/Makefile | 7 +++++-- > > > > 1 file changed, 5 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/arch/arm/imx-common/Makefile > > > > b/arch/arm/imx-common/Makefile index 44b6822..ba31d3e 100644 > > > > --- a/arch/arm/imx-common/Makefile > > > > +++ b/arch/arm/imx-common/Makefile > > > > @@ -69,8 +69,11 @@ $(OBJTREE)/u-boot-with-nand-spl.imx: > > > > $(OBJTREE)/SPL $(OBJTREE)/u-boot.bin > > > > > > > > -I binary -O binary $(OBJTREE)/spl/u-boot-nand-spl.imx \ > > > > $(OBJTREE)/spl/u-boot-nand-spl-pad.imx > > > > > > > > rm $(OBJTREE)/spl/u-boot-nand-spl.imx > > > > > > > > - cat $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.bin > > > > > $@ - rm $(OBJTREE)/spl/u-boot-nand-spl-pad.imx > > > > + $(OBJTREE)/tools/mkimage -A arm -O U-Boot -a > > > > $(CONFIG_SYS_TEXT_BASE) \ + -e $(CONFIG_SYS_TEXT_BASE) -C none -d > > > > $(OBJTREE)/u-boot.bin \ + $(OBJTREE)/u-boot.uim > > > > + cat $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.uim > > > > > $@ + rm $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.uim > > > > > > > > #################################################################### > > > > #### # > > > > > > > > -- > > > > 1.7.11.7 > > > > > > This change is correct. > > > > > > I don't know the uImage format very well. Can you give examples of what > > > this patch can bring compared to the raw binary format? > > > > > > If this change is useful, it should probably be made for > > > u-boot-with-spl.imx too. > > > > Please see common/spl/spl_nand.c which calls spl_parse_image_header() on > > the payload loaded from NAND. This is implemented in common/spl/spl.c > > and if proper > > header is not found, the payload is assumed to be of 200kB of size, which > > is far > > less than fully configured U-Boot. > > Or you could #define CONFIG_SYS_MONITOR_LEN to what you need. YUCK! > > So using the uimage format is much more > > flexible. > > I agree. > > So I'd see the following changes for this patch: > - Reword "fix" to show enhancement, and detail the flexibility rationale > in the description. > - Extend to u-boot-with-spl.imx. Ok. Tom, shall we merge this one into current release after it's fixed?
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 04/19/2013 07:51 AM, Marek Vasut wrote: > Dear Benoît Thébaudeau, > >> Dear Marek Vasut, >> >> On Friday, April 19, 2013 1:16:31 PM, Marek Vasut wrote: >>> Dear Benoît Thébaudeau, >>> >>>> Dear Marek Vasut, >>>> >>>> On Friday, April 19, 2013 6:10:52 AM, Marek Vasut wrote: >>>>> This target is currently concatenating u-boot SPL in >>>>> imximage format with u-boot.bin. The NAND SPL can load a >>>>> raw binary, but the preffered format with much less >>>>> limitations is uImage format. Fix the target so u-boot.bin >>>>> is first converted into uImage format and only after that >>>>> is concatenated. >>>> >>>> Please reword: This is not a fix, but an enhancement. >>>> >>>>> Signed-off-by: Marek Vasut <marex@denx.de> Cc: Albert >>>>> ARIBAUD <albert.u.boot@aribaud.net> Cc: Benoît Thébaudeau >>>>> <benoit.thebaudeau@advansee.com> Cc: Fabio Estevam >>>>> <fabio.estevam@freescale.com> Cc: Scott Wood >>>>> <scottwood@freescale.com> Cc: Stefano Babic >>>>> <sbabic@denx.de> Cc: Tom Rini <trini@ti.com> --- >>>>> >>>>> arch/arm/imx-common/Makefile | 7 +++++-- 1 file changed, 5 >>>>> insertions(+), 2 deletions(-) >>>>> >>>>> diff --git a/arch/arm/imx-common/Makefile >>>>> b/arch/arm/imx-common/Makefile index 44b6822..ba31d3e >>>>> 100644 --- a/arch/arm/imx-common/Makefile +++ >>>>> b/arch/arm/imx-common/Makefile @@ -69,8 +69,11 @@ >>>>> $(OBJTREE)/u-boot-with-nand-spl.imx: $(OBJTREE)/SPL >>>>> $(OBJTREE)/u-boot.bin >>>>> >>>>> -I binary -O binary $(OBJTREE)/spl/u-boot-nand-spl.imx \ >>>>> $(OBJTREE)/spl/u-boot-nand-spl-pad.imx rm >>>>> $(OBJTREE)/spl/u-boot-nand-spl.imx >>>>> >>>>> - cat $(OBJTREE)/spl/u-boot-nand-spl-pad.imx >>>>> $(OBJTREE)/u-boot.bin >> >>>>> $@ - rm $(OBJTREE)/spl/u-boot-nand-spl-pad.imx + >>>>> $(OBJTREE)/tools/mkimage -A arm -O U-Boot -a >>>>> $(CONFIG_SYS_TEXT_BASE) \ + -e $(CONFIG_SYS_TEXT_BASE) -C >>>>> > none -d >>>>> $(OBJTREE)/u-boot.bin \ + $(OBJTREE)/u-boot.uim + cat >>>>> $(OBJTREE)/spl/u-boot-nand-spl-pad.imx >>>>> $(OBJTREE)/u-boot.uim >> >>>>> $@ + rm $(OBJTREE)/spl/u-boot-nand-spl-pad.imx >>>>> $(OBJTREE)/u-boot.uim >>>>> >>>>> #################################################################### >>>>> >>>>> #### # >>>>> >>>>> -- 1.7.11.7 >>>> >>>> This change is correct. >>>> >>>> I don't know the uImage format very well. Can you give >>>> examples of what this patch can bring compared to the raw >>>> binary format? >>>> >>>> If this change is useful, it should probably be made for >>>> u-boot-with-spl.imx too. >>> >>> Please see common/spl/spl_nand.c which calls >>> spl_parse_image_header() on the payload loaded from NAND. This >>> is implemented in common/spl/spl.c and if proper header is not >>> found, the payload is assumed to be of 200kB of size, which is >>> far less than fully configured U-Boot. >> >> Or you could #define CONFIG_SYS_MONITOR_LEN to what you need. > > YUCK! > >>> So using the uimage format is much more flexible. >> >> I agree. >> >> So I'd see the following changes for this patch: - Reword "fix" >> to show enhancement, and detail the flexibility rationale in the >> description. - Extend to u-boot-with-spl.imx. > > Ok. > > Tom, shall we merge this one into current release after it's > fixed? This is an enhancement not a bug fix, right? If so, next release. - -- Tom -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJRcTCWAAoJENk4IS6UOR1WFx8P/1CXwEcPqrvZthAJPqMYOjvU r1FVOX0MgXCkRQ1FXnGKaYdlJbc+1GS09KgsnbQ+AOwMEPPPAju62npHzP1/CfhH FkRInGmb/cqSuIt3shXg/Q4URkGEyMW6QhQpaskMgLNAzjGX1Q12Wnz2O1BLnIzr 1y9hMxNaqA8aIW9apXEtC/U67vHFVU74jT5IHzv/F6rzcAayoCz2Az0oG4bvRR90 HTPJMLH/z2lis1JgG5GSiH+604z+KOprNz1Uid2aZr7os/WmDsPkO4rJ0l8kd2HE Us7Au7/b0h1TfXrJv6oYNEsYn4jECPZ8HeHxjcRTi102JBAiiAK914PSuKVm+Kys ILffCZXcOHS6Q3zUTp4EkrcrxVzJxX+yIv2SJipy0dXx7mmrM559J55DUyFLsrKh o8Z4MMidjqulmTdQNeBhLLIo80URynouRQ2ZpiwpR7iKdObFuAPr0HVzg65tNpbo vr5WOquk4fooK88s3HXKjDvIyBJcq08rtn5sgmJCvba57WRrlnYwS1D3SF6NT/Me isF6jeL7nsZF2mckeCHJ3Wduw6kbg9n9mbfDWWqpYyqh/srvWvN6A7gCtwrlK2eR vN8DvDkBpWWulqfRzq6PLs8nH1x3WOajiA9iICc1O7+YyXzKGF+sAEBcBgTcH3fX lz4Hs0VAu3RA/kdeJiVJ =zMqB -----END PGP SIGNATURE-----
Dear Tom Rini, > On 04/19/2013 07:51 AM, Marek Vasut wrote: > > Dear Benoît Thébaudeau, > > > >> Dear Marek Vasut, > >> > >> On Friday, April 19, 2013 1:16:31 PM, Marek Vasut wrote: > >>> Dear Benoît Thébaudeau, > >>> > >>>> Dear Marek Vasut, > >>>> > >>>> On Friday, April 19, 2013 6:10:52 AM, Marek Vasut wrote: > >>>>> This target is currently concatenating u-boot SPL in > >>>>> imximage format with u-boot.bin. The NAND SPL can load a > >>>>> raw binary, but the preffered format with much less > >>>>> limitations is uImage format. Fix the target so u-boot.bin > >>>>> is first converted into uImage format and only after that > >>>>> is concatenated. > >>>> > >>>> Please reword: This is not a fix, but an enhancement. > >>>> > >>>>> Signed-off-by: Marek Vasut <marex@denx.de> Cc: Albert > >>>>> ARIBAUD <albert.u.boot@aribaud.net> Cc: Benoît Thébaudeau > >>>>> <benoit.thebaudeau@advansee.com> Cc: Fabio Estevam > >>>>> <fabio.estevam@freescale.com> Cc: Scott Wood > >>>>> <scottwood@freescale.com> Cc: Stefano Babic > >>>>> <sbabic@denx.de> Cc: Tom Rini <trini@ti.com> --- > >>>>> > >>>>> arch/arm/imx-common/Makefile | 7 +++++-- 1 file changed, 5 > >>>>> insertions(+), 2 deletions(-) > >>>>> > >>>>> diff --git a/arch/arm/imx-common/Makefile > >>>>> b/arch/arm/imx-common/Makefile index 44b6822..ba31d3e > >>>>> 100644 --- a/arch/arm/imx-common/Makefile +++ > >>>>> b/arch/arm/imx-common/Makefile @@ -69,8 +69,11 @@ > >>>>> $(OBJTREE)/u-boot-with-nand-spl.imx: $(OBJTREE)/SPL > >>>>> $(OBJTREE)/u-boot.bin > >>>>> > >>>>> -I binary -O binary $(OBJTREE)/spl/u-boot-nand-spl.imx \ > >>>>> $(OBJTREE)/spl/u-boot-nand-spl-pad.imx rm > >>>>> $(OBJTREE)/spl/u-boot-nand-spl.imx > >>>>> > >>>>> - cat $(OBJTREE)/spl/u-boot-nand-spl-pad.imx > >>>>> $(OBJTREE)/u-boot.bin > >>>>> > >>>>> $@ - rm $(OBJTREE)/spl/u-boot-nand-spl-pad.imx + > >>>>> $(OBJTREE)/tools/mkimage -A arm -O U-Boot -a > >>>>> $(CONFIG_SYS_TEXT_BASE) \ + -e $(CONFIG_SYS_TEXT_BASE) -C > > > > none -d > > > >>>>> $(OBJTREE)/u-boot.bin \ + $(OBJTREE)/u-boot.uim + cat > >>>>> $(OBJTREE)/spl/u-boot-nand-spl-pad.imx > >>>>> $(OBJTREE)/u-boot.uim > >>>>> > >>>>> $@ + rm $(OBJTREE)/spl/u-boot-nand-spl-pad.imx > >>>>> $(OBJTREE)/u-boot.uim > >>>>> > >>>>> #################################################################### > > #### # > > >>>>> -- 1.7.11.7 > >>>> > >>>> This change is correct. > >>>> > >>>> I don't know the uImage format very well. Can you give > >>>> examples of what this patch can bring compared to the raw > >>>> binary format? > >>>> > >>>> If this change is useful, it should probably be made for > >>>> u-boot-with-spl.imx too. > >>> > >>> Please see common/spl/spl_nand.c which calls > >>> spl_parse_image_header() on the payload loaded from NAND. This > >>> is implemented in common/spl/spl.c and if proper header is not > >>> found, the payload is assumed to be of 200kB of size, which is > >>> far less than fully configured U-Boot. > >> > >> Or you could #define CONFIG_SYS_MONITOR_LEN to what you need. > > > > YUCK! > > > >>> So using the uimage format is much more flexible. > >> > >> I agree. > >> > >> So I'd see the following changes for this patch: - Reword "fix" > >> to show enhancement, and detail the flexibility rationale in the > >> description. - Extend to u-boot-with-spl.imx. > > > > Ok. > > > > Tom, shall we merge this one into current release after it's > > fixed? > > This is an enhancement not a bug fix, right? If so, next release. Since the release is nigh, let's wrap it into the next one. But the usability of the spl is lower :(
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile index 44b6822..ba31d3e 100644 --- a/arch/arm/imx-common/Makefile +++ b/arch/arm/imx-common/Makefile @@ -69,8 +69,11 @@ $(OBJTREE)/u-boot-with-nand-spl.imx: $(OBJTREE)/SPL $(OBJTREE)/u-boot.bin -I binary -O binary $(OBJTREE)/spl/u-boot-nand-spl.imx \ $(OBJTREE)/spl/u-boot-nand-spl-pad.imx rm $(OBJTREE)/spl/u-boot-nand-spl.imx - cat $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.bin > $@ - rm $(OBJTREE)/spl/u-boot-nand-spl-pad.imx + $(OBJTREE)/tools/mkimage -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \ + -e $(CONFIG_SYS_TEXT_BASE) -C none -d $(OBJTREE)/u-boot.bin \ + $(OBJTREE)/u-boot.uim + cat $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.uim > $@ + rm $(OBJTREE)/spl/u-boot-nand-spl-pad.imx $(OBJTREE)/u-boot.uim #########################################################################
This target is currently concatenating u-boot SPL in imximage format with u-boot.bin. The NAND SPL can load a raw binary, but the preffered format with much less limitations is uImage format. Fix the target so u-boot.bin is first converted into uImage format and only after that is concatenated. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Scott Wood <scottwood@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Tom Rini <trini@ti.com> --- arch/arm/imx-common/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)