* [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y
@ 2021-02-01 20:07 Marek Vasut
2021-02-02 10:48 ` Christoph Niedermaier
2021-03-01 9:27 ` Stefano Babic
0 siblings, 2 replies; 12+ messages in thread
From: Marek Vasut @ 2021-02-01 20:07 UTC (permalink / raw)
To: u-boot
The u-boot-with-spl.imx is a concatenation of SPL and u-boot.uim.
The u-boot.uim is u-boot.bin wrapped in uImage. In case OF_SEPARATE
is enabled, the u-boot.bin does not contain control DT for U-Boot,
and so u-boot.uim does not contain the DT, and so u-boot-with-spl.imx
does not contain the DT, and a system where u-boot-with-spl.imx is
written to offset 1024B to the start of storage no longer boots, as
it is missing DT.
In case OF_SEPARATE is enabled, u-boot.img contains both u-boot.bin
and the necessary DTs. Therefore, use u-boot.img instead of u-boot.uim
to generate u-boot-with-spl.imx when OF_SEPARATE is enabled.
Tested-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Christoph Niedermaier <cniedermaier@dh-electronics.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Ye Li <ye.li@nxp.com>
Cc: uboot-imx <uboot-imx@nxp.com>
---
V2: Swap the u-boot.uim <-> u-boot.img in the conditional so this would
match the patch which Fabio originally tested
---
arch/arm/mach-imx/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 1aa26a50ad8..e6b4654cd35 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -202,10 +202,10 @@ append = cat $(filter-out $< $(PHONY), $^) >> $@
quiet_cmd_pad_cat = CAT $@
cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@
-u-boot-with-spl.imx: SPL u-boot.uim FORCE
+u-boot-with-spl.imx: SPL $(if $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE
$(call if_changed,pad_cat)
-u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx u-boot.uim FORCE
+u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx $(if $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE
$(call if_changed,pad_cat)
quiet_cmd_u-boot-nand-spl_imx = GEN $@
--
2.29.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y 2021-02-01 20:07 [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y Marek Vasut @ 2021-02-02 10:48 ` Christoph Niedermaier 2021-03-01 9:27 ` Stefano Babic 1 sibling, 0 replies; 12+ messages in thread From: Christoph Niedermaier @ 2021-02-02 10:48 UTC (permalink / raw) To: u-boot From: Marek Vasut <marex@denx.de> Sent: Monday, February 1, 2021 9:07 PM > The u-boot-with-spl.imx is a concatenation of SPL and u-boot.uim. > The u-boot.uim is u-boot.bin wrapped in uImage. In case OF_SEPARATE > is enabled, the u-boot.bin does not contain control DT for U-Boot, > and so u-boot.uim does not contain the DT, and so u-boot-with-spl.imx > does not contain the DT, and a system where u-boot-with-spl.imx is > written to offset 1024B to the start of storage no longer boots, as > it is missing DT. > > In case OF_SEPARATE is enabled, u-boot.img contains both u-boot.bin > and the necessary DTs. Therefore, use u-boot.img instead of u-boot.uim > to generate u-boot-with-spl.imx when OF_SEPARATE is enabled. > > Tested-by: Fabio Estevam <festevam@gmail.com> > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Christoph Niedermaier <cniedermaier@dh-electronics.de> > Cc: Fabio Estevam <festevam@gmail.com> > Cc: Peng Fan <peng.fan@nxp.com> > Cc: Simon Glass <sjg@chromium.org> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Ye Li <ye.li@nxp.com> > Cc: uboot-imx <uboot-imx@nxp.com> > --- > V2: Swap the u-boot.uim <-> u-boot.img in the conditional so this would > match the patch which Fabio originally tested > --- > arch/arm/mach-imx/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile > index 1aa26a50ad8..e6b4654cd35 100644 > --- a/arch/arm/mach-imx/Makefile > +++ b/arch/arm/mach-imx/Makefile > @@ -202,10 +202,10 @@ append = cat $(filter-out $< $(PHONY), $^) >> $@ > quiet_cmd_pad_cat = CAT $@ > cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@ > > -u-boot-with-spl.imx: SPL u-boot.uim FORCE > +u-boot-with-spl.imx: SPL $(if $(CONFIG_OF_SEPARATE),u-boot.img,u- > boot.uim) FORCE > $(call if_changed,pad_cat) > > -u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx u-boot.uim FORCE > +u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx $(if > $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE > $(call if_changed,pad_cat) > > quiet_cmd_u-boot-nand-spl_imx = GEN $@ > -- > 2.29.2 Tested-by: Christoph Niedermaier <cniedermaier@dh-electronics.com> Best regards Christoph ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y 2021-02-01 20:07 [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y Marek Vasut 2021-02-02 10:48 ` Christoph Niedermaier @ 2021-03-01 9:27 ` Stefano Babic 2021-03-01 13:36 ` Marek Vasut 1 sibling, 1 reply; 12+ messages in thread From: Stefano Babic @ 2021-03-01 9:27 UTC (permalink / raw) To: u-boot Hi Marek, On 01.02.21 21:07, Marek Vasut wrote: > The u-boot-with-spl.imx is a concatenation of SPL and u-boot.uim. > The u-boot.uim is u-boot.bin wrapped in uImage. In case OF_SEPARATE > is enabled, the u-boot.bin does not contain control DT for U-Boot, > and so u-boot.uim does not contain the DT, and so u-boot-with-spl.imx > does not contain the DT, and a system where u-boot-with-spl.imx is > written to offset 1024B to the start of storage no longer boots, as > it is missing DT. > > In case OF_SEPARATE is enabled, u-boot.img contains both u-boot.bin > and the necessary DTs. Therefore, use u-boot.img instead of u-boot.uim > to generate u-boot-with-spl.imx when OF_SEPARATE is enabled. > > Tested-by: Fabio Estevam <festevam@gmail.com> > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Christoph Niedermaier <cniedermaier@dh-electronics.de> > Cc: Fabio Estevam <festevam@gmail.com> > Cc: Peng Fan <peng.fan@nxp.com> > Cc: Simon Glass <sjg@chromium.org> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Ye Li <ye.li@nxp.com> > Cc: uboot-imx <uboot-imx@nxp.com> > --- > V2: Swap the u-boot.uim <-> u-boot.img in the conditional so this would > match the patch which Fabio originally tested > --- > arch/arm/mach-imx/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile > index 1aa26a50ad8..e6b4654cd35 100644 > --- a/arch/arm/mach-imx/Makefile > +++ b/arch/arm/mach-imx/Makefile > @@ -202,10 +202,10 @@ append = cat $(filter-out $< $(PHONY), $^) >> $@ > quiet_cmd_pad_cat = CAT $@ > cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@ > > -u-boot-with-spl.imx: SPL u-boot.uim FORCE > +u-boot-with-spl.imx: SPL $(if $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE > $(call if_changed,pad_cat) > > -u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx u-boot.uim FORCE > +u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx $(if $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE > $(call if_changed,pad_cat) > > quiet_cmd_u-boot-nand-spl_imx = GEN $@ > This patch breaks build for two boards, udoo and ot1200_spl. Strange enough, I get weird results with git bisect (but definetely this is the only patch I am applying that cause the issue). Could you take a look, please ? Thanks, Stefano Thanks, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk 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] 12+ messages in thread
* [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y 2021-03-01 9:27 ` Stefano Babic @ 2021-03-01 13:36 ` Marek Vasut 2021-03-01 13:40 ` Stefano Babic 0 siblings, 1 reply; 12+ messages in thread From: Marek Vasut @ 2021-03-01 13:36 UTC (permalink / raw) To: u-boot On 3/1/21 10:27 AM, Stefano Babic wrote: > Hi Marek, Hi, [...] >> diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile >> index 1aa26a50ad8..e6b4654cd35 100644 >> --- a/arch/arm/mach-imx/Makefile >> +++ b/arch/arm/mach-imx/Makefile >> @@ -202,10 +202,10 @@ append = cat $(filter-out $< $(PHONY), $^) >> $@ >> ? quiet_cmd_pad_cat = CAT???? $@ >> ? cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@ >> -u-boot-with-spl.imx: SPL u-boot.uim FORCE >> +u-boot-with-spl.imx: SPL $(if >> $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE >> ????? $(call if_changed,pad_cat) >> -u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx u-boot.uim FORCE >> +u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx $(if >> $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE >> ????? $(call if_changed,pad_cat) >> ? quiet_cmd_u-boot-nand-spl_imx = GEN???? $@ >> > > This patch breaks build for two boards, udoo and ot1200_spl. Strange > enough, I get weird results with git bisect (but definetely this is the > only patch I am applying that cause the issue). > > Could you take a look, please ? There is V3 already, does that work? [PATCH V3] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y 2021-03-01 13:36 ` Marek Vasut @ 2021-03-01 13:40 ` Stefano Babic 2021-03-01 13:44 ` Stefano Babic 0 siblings, 1 reply; 12+ messages in thread From: Stefano Babic @ 2021-03-01 13:40 UTC (permalink / raw) To: u-boot On 01.03.21 14:36, Marek Vasut wrote: > On 3/1/21 10:27 AM, Stefano Babic wrote: >> Hi Marek, > > Hi, > > [...] > >>> diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile >>> index 1aa26a50ad8..e6b4654cd35 100644 >>> --- a/arch/arm/mach-imx/Makefile >>> +++ b/arch/arm/mach-imx/Makefile >>> @@ -202,10 +202,10 @@ append = cat $(filter-out $< $(PHONY), $^) >> $@ >>> ? quiet_cmd_pad_cat = CAT???? $@ >>> ? cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@ >>> -u-boot-with-spl.imx: SPL u-boot.uim FORCE >>> +u-boot-with-spl.imx: SPL $(if >>> $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE >>> ????? $(call if_changed,pad_cat) >>> -u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx u-boot.uim FORCE >>> +u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx $(if >>> $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE >>> ????? $(call if_changed,pad_cat) >>> ? quiet_cmd_u-boot-nand-spl_imx = GEN???? $@ >>> >> >> This patch breaks build for two boards, udoo and ot1200_spl. Strange >> enough, I get weird results with git bisect (but definetely this is >> the only patch I am applying that cause the issue). >> >> Could you take a look, please ? > > There is V3 already, does that work? > [PATCH V3] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if > OF_SEPARATE=y I pick it up and let you know, thanks. Regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk 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] 12+ messages in thread
* [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y 2021-03-01 13:40 ` Stefano Babic @ 2021-03-01 13:44 ` Stefano Babic 2021-03-01 15:41 ` Marek Vasut 2021-03-01 17:56 ` Tom Rini 0 siblings, 2 replies; 12+ messages in thread From: Stefano Babic @ 2021-03-01 13:44 UTC (permalink / raw) To: u-boot On 01.03.21 14:40, Stefano Babic wrote: > On 01.03.21 14:36, Marek Vasut wrote: >> On 3/1/21 10:27 AM, Stefano Babic wrote: >>> Hi Marek, >> >> Hi, >> >> [...] >> >>>> diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile >>>> index 1aa26a50ad8..e6b4654cd35 100644 >>>> --- a/arch/arm/mach-imx/Makefile >>>> +++ b/arch/arm/mach-imx/Makefile >>>> @@ -202,10 +202,10 @@ append = cat $(filter-out $< $(PHONY), $^) >> $@ >>>> ? quiet_cmd_pad_cat = CAT???? $@ >>>> ? cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@ >>>> -u-boot-with-spl.imx: SPL u-boot.uim FORCE >>>> +u-boot-with-spl.imx: SPL $(if >>>> $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE >>>> ????? $(call if_changed,pad_cat) >>>> -u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx u-boot.uim FORCE >>>> +u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx $(if >>>> $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE >>>> ????? $(call if_changed,pad_cat) >>>> ? quiet_cmd_u-boot-nand-spl_imx = GEN???? $@ >>>> >>> >>> This patch breaks build for two boards, udoo and ot1200_spl. Strange >>> enough, I get weird results with git bisect (but definetely this is >>> the only patch I am applying that cause the issue). >>> >>> Could you take a look, please ? >> >> There is V3 already, does that work? >> [PATCH V3] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if >> OF_SEPARATE=y > > I pick it up and let you know, thanks. > Sorry, I answered to V2 thread, but I had already picked up V3, and this causes the issue with udoo and ot1200_spl. Regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk 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] 12+ messages in thread
* [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y 2021-03-01 13:44 ` Stefano Babic @ 2021-03-01 15:41 ` Marek Vasut 2021-03-01 17:56 ` Tom Rini 1 sibling, 0 replies; 12+ messages in thread From: Marek Vasut @ 2021-03-01 15:41 UTC (permalink / raw) To: u-boot On 3/1/21 2:44 PM, Stefano Babic wrote: > On 01.03.21 14:40, Stefano Babic wrote: >> On 01.03.21 14:36, Marek Vasut wrote: >>> On 3/1/21 10:27 AM, Stefano Babic wrote: >>>> Hi Marek, >>> >>> Hi, >>> >>> [...] >>> >>>>> diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile >>>>> index 1aa26a50ad8..e6b4654cd35 100644 >>>>> --- a/arch/arm/mach-imx/Makefile >>>>> +++ b/arch/arm/mach-imx/Makefile >>>>> @@ -202,10 +202,10 @@ append = cat $(filter-out $< $(PHONY), $^) >> $@ >>>>> ? quiet_cmd_pad_cat = CAT???? $@ >>>>> ? cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@ >>>>> -u-boot-with-spl.imx: SPL u-boot.uim FORCE >>>>> +u-boot-with-spl.imx: SPL $(if >>>>> $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE >>>>> ????? $(call if_changed,pad_cat) >>>>> -u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx u-boot.uim FORCE >>>>> +u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx $(if >>>>> $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE >>>>> ????? $(call if_changed,pad_cat) >>>>> ? quiet_cmd_u-boot-nand-spl_imx = GEN???? $@ >>>>> >>>> >>>> This patch breaks build for two boards, udoo and ot1200_spl. Strange >>>> enough, I get weird results with git bisect (but definetely this is >>>> the only patch I am applying that cause the issue). >>>> >>>> Could you take a look, please ? >>> >>> There is V3 already, does that work? >>> [PATCH V3] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if >>> OF_SEPARATE=y >> >> I pick it up and let you know, thanks. >> > > Sorry, I answered to V2 thread, but I had already picked up V3, and this > causes the issue with udoo and ot1200_spl. All right, V4 is out, please give it a try. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y 2021-03-01 13:44 ` Stefano Babic 2021-03-01 15:41 ` Marek Vasut @ 2021-03-01 17:56 ` Tom Rini 2021-03-01 18:43 ` Marek Vasut 2021-03-01 19:28 ` Peter Robinson 1 sibling, 2 replies; 12+ messages in thread From: Tom Rini @ 2021-03-01 17:56 UTC (permalink / raw) To: u-boot On Mon, Mar 01, 2021 at 02:44:13PM +0100, Stefano Babic wrote: > On 01.03.21 14:40, Stefano Babic wrote: > > On 01.03.21 14:36, Marek Vasut wrote: > > > On 3/1/21 10:27 AM, Stefano Babic wrote: > > > > Hi Marek, > > > > > > Hi, > > > > > > [...] > > > > > > > > diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile > > > > > index 1aa26a50ad8..e6b4654cd35 100644 > > > > > --- a/arch/arm/mach-imx/Makefile > > > > > +++ b/arch/arm/mach-imx/Makefile > > > > > @@ -202,10 +202,10 @@ append = cat $(filter-out $< $(PHONY), $^) >> $@ > > > > > ? quiet_cmd_pad_cat = CAT???? $@ > > > > > ? cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@ > > > > > -u-boot-with-spl.imx: SPL u-boot.uim FORCE > > > > > +u-boot-with-spl.imx: SPL $(if > > > > > $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE > > > > > ????? $(call if_changed,pad_cat) > > > > > -u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx u-boot.uim FORCE > > > > > +u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx $(if > > > > > $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE > > > > > ????? $(call if_changed,pad_cat) > > > > > ? quiet_cmd_u-boot-nand-spl_imx = GEN???? $@ > > > > > > > > > > > > > This patch breaks build for two boards, udoo and ot1200_spl. > > > > Strange enough, I get weird results with git bisect (but > > > > definetely this is the only patch I am applying that cause the > > > > issue). > > > > > > > > Could you take a look, please ? > > > > > > There is V3 already, does that work? > > > [PATCH V3] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if > > > OF_SEPARATE=y > > > > I pick it up and let you know, thanks. > > > > Sorry, I answered to V2 thread, but I had already picked up V3, and this > causes the issue with udoo and ot1200_spl. Please note that ot1200 has today been ack'd for removal and udoo is on the removal list: https://patchwork.ozlabs.org/project/uboot/patch/20210221010634.21310-24-trini at konsulko.com/ -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210301/ef6138d5/attachment.sig> ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y 2021-03-01 17:56 ` Tom Rini @ 2021-03-01 18:43 ` Marek Vasut 2021-03-01 19:28 ` Peter Robinson 1 sibling, 0 replies; 12+ messages in thread From: Marek Vasut @ 2021-03-01 18:43 UTC (permalink / raw) To: u-boot On 3/1/21 6:56 PM, Tom Rini wrote: [...] >>>>> This patch breaks build for two boards, udoo and ot1200_spl. >>>>> Strange enough, I get weird results with git bisect (but >>>>> definetely this is the only patch I am applying that cause the >>>>> issue). >>>>> >>>>> Could you take a look, please ? >>>> >>>> There is V3 already, does that work? >>>> [PATCH V3] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if >>>> OF_SEPARATE=y >>> >>> I pick it up and let you know, thanks. >>> >> >> Sorry, I answered to V2 thread, but I had already picked up V3, and this >> causes the issue with udoo and ot1200_spl. > > Please note that ot1200 has today been ack'd for removal and udoo is on > the removal list: > https://patchwork.ozlabs.org/project/uboot/patch/20210221010634.21310-24-trini at konsulko.com/ That's sad. Anyway, this patch was buggy, it should be fixed in V4. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y 2021-03-01 17:56 ` Tom Rini 2021-03-01 18:43 ` Marek Vasut @ 2021-03-01 19:28 ` Peter Robinson 2021-03-01 19:42 ` Tom Rini 1 sibling, 1 reply; 12+ messages in thread From: Peter Robinson @ 2021-03-01 19:28 UTC (permalink / raw) To: u-boot On Mon, Mar 1, 2021 at 5:57 PM Tom Rini <trini@konsulko.com> wrote: > > On Mon, Mar 01, 2021 at 02:44:13PM +0100, Stefano Babic wrote: > > On 01.03.21 14:40, Stefano Babic wrote: > > > On 01.03.21 14:36, Marek Vasut wrote: > > > > On 3/1/21 10:27 AM, Stefano Babic wrote: > > > > > Hi Marek, > > > > > > > > Hi, > > > > > > > > [...] > > > > > > > > > > diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile > > > > > > index 1aa26a50ad8..e6b4654cd35 100644 > > > > > > --- a/arch/arm/mach-imx/Makefile > > > > > > +++ b/arch/arm/mach-imx/Makefile > > > > > > @@ -202,10 +202,10 @@ append = cat $(filter-out $< $(PHONY), $^) >> $@ > > > > > > quiet_cmd_pad_cat = CAT $@ > > > > > > cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@ > > > > > > -u-boot-with-spl.imx: SPL u-boot.uim FORCE > > > > > > +u-boot-with-spl.imx: SPL $(if > > > > > > $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE > > > > > > $(call if_changed,pad_cat) > > > > > > -u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx u-boot.uim FORCE > > > > > > +u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx $(if > > > > > > $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE > > > > > > $(call if_changed,pad_cat) > > > > > > quiet_cmd_u-boot-nand-spl_imx = GEN $@ > > > > > > > > > > > > > > > > This patch breaks build for two boards, udoo and ot1200_spl. > > > > > Strange enough, I get weird results with git bisect (but > > > > > definetely this is the only patch I am applying that cause the > > > > > issue). > > > > > > > > > > Could you take a look, please ? > > > > > > > > There is V3 already, does that work? > > > > [PATCH V3] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if > > > > OF_SEPARATE=y > > > > > > I pick it up and let you know, thanks. > > > > > > > Sorry, I answered to V2 thread, but I had already picked up V3, and this > > causes the issue with udoo and ot1200_spl. > > Please note that ot1200 has today been ack'd for removal and udoo is on > the removal list: FYI I am working to update the udoo and the udoo_neo so they're not removed as we support those boards in Fedora, I've still working my way through it with my schedule. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y 2021-03-01 19:28 ` Peter Robinson @ 2021-03-01 19:42 ` Tom Rini 2021-03-01 20:21 ` Peter Robinson 0 siblings, 1 reply; 12+ messages in thread From: Tom Rini @ 2021-03-01 19:42 UTC (permalink / raw) To: u-boot On Mon, Mar 01, 2021 at 07:28:17PM +0000, Peter Robinson wrote: > On Mon, Mar 1, 2021 at 5:57 PM Tom Rini <trini@konsulko.com> wrote: > > > > On Mon, Mar 01, 2021 at 02:44:13PM +0100, Stefano Babic wrote: > > > On 01.03.21 14:40, Stefano Babic wrote: > > > > On 01.03.21 14:36, Marek Vasut wrote: > > > > > On 3/1/21 10:27 AM, Stefano Babic wrote: > > > > > > Hi Marek, > > > > > > > > > > Hi, > > > > > > > > > > [...] > > > > > > > > > > > > diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile > > > > > > > index 1aa26a50ad8..e6b4654cd35 100644 > > > > > > > --- a/arch/arm/mach-imx/Makefile > > > > > > > +++ b/arch/arm/mach-imx/Makefile > > > > > > > @@ -202,10 +202,10 @@ append = cat $(filter-out $< $(PHONY), $^) >> $@ > > > > > > > quiet_cmd_pad_cat = CAT $@ > > > > > > > cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@ > > > > > > > -u-boot-with-spl.imx: SPL u-boot.uim FORCE > > > > > > > +u-boot-with-spl.imx: SPL $(if > > > > > > > $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE > > > > > > > $(call if_changed,pad_cat) > > > > > > > -u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx u-boot.uim FORCE > > > > > > > +u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx $(if > > > > > > > $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE > > > > > > > $(call if_changed,pad_cat) > > > > > > > quiet_cmd_u-boot-nand-spl_imx = GEN $@ > > > > > > > > > > > > > > > > > > > This patch breaks build for two boards, udoo and ot1200_spl. > > > > > > Strange enough, I get weird results with git bisect (but > > > > > > definetely this is the only patch I am applying that cause the > > > > > > issue). > > > > > > > > > > > > Could you take a look, please ? > > > > > > > > > > There is V3 already, does that work? > > > > > [PATCH V3] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if > > > > > OF_SEPARATE=y > > > > > > > > I pick it up and let you know, thanks. > > > > > > > > > > Sorry, I answered to V2 thread, but I had already picked up V3, and this > > > causes the issue with udoo and ot1200_spl. > > > > Please note that ot1200 has today been ack'd for removal and udoo is on > > the removal list: > > FYI I am working to update the udoo and the udoo_neo so they're not > removed as we support those boards in Fedora, I've still working my > way through it with my schedule. Please find time soon. I'm spelling this out more in my -rc email (which has been delayed in that I expect an imx PR and so I want to get that, then release) but I will be dropping stuff post v2021.04 release. Thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210301/c9800542/attachment.sig> ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y 2021-03-01 19:42 ` Tom Rini @ 2021-03-01 20:21 ` Peter Robinson 0 siblings, 0 replies; 12+ messages in thread From: Peter Robinson @ 2021-03-01 20:21 UTC (permalink / raw) To: u-boot On Mon, Mar 1, 2021 at 7:42 PM Tom Rini <trini@konsulko.com> wrote: > > On Mon, Mar 01, 2021 at 07:28:17PM +0000, Peter Robinson wrote: > > On Mon, Mar 1, 2021 at 5:57 PM Tom Rini <trini@konsulko.com> wrote: > > > > > > On Mon, Mar 01, 2021 at 02:44:13PM +0100, Stefano Babic wrote: > > > > On 01.03.21 14:40, Stefano Babic wrote: > > > > > On 01.03.21 14:36, Marek Vasut wrote: > > > > > > On 3/1/21 10:27 AM, Stefano Babic wrote: > > > > > > > Hi Marek, > > > > > > > > > > > > Hi, > > > > > > > > > > > > [...] > > > > > > > > > > > > > > diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile > > > > > > > > index 1aa26a50ad8..e6b4654cd35 100644 > > > > > > > > --- a/arch/arm/mach-imx/Makefile > > > > > > > > +++ b/arch/arm/mach-imx/Makefile > > > > > > > > @@ -202,10 +202,10 @@ append = cat $(filter-out $< $(PHONY), $^) >> $@ > > > > > > > > quiet_cmd_pad_cat = CAT $@ > > > > > > > > cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@ > > > > > > > > -u-boot-with-spl.imx: SPL u-boot.uim FORCE > > > > > > > > +u-boot-with-spl.imx: SPL $(if > > > > > > > > $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE > > > > > > > > $(call if_changed,pad_cat) > > > > > > > > -u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx u-boot.uim FORCE > > > > > > > > +u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx $(if > > > > > > > > $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE > > > > > > > > $(call if_changed,pad_cat) > > > > > > > > quiet_cmd_u-boot-nand-spl_imx = GEN $@ > > > > > > > > > > > > > > > > > > > > > > This patch breaks build for two boards, udoo and ot1200_spl. > > > > > > > Strange enough, I get weird results with git bisect (but > > > > > > > definetely this is the only patch I am applying that cause the > > > > > > > issue). > > > > > > > > > > > > > > Could you take a look, please ? > > > > > > > > > > > > There is V3 already, does that work? > > > > > > [PATCH V3] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if > > > > > > OF_SEPARATE=y > > > > > > > > > > I pick it up and let you know, thanks. > > > > > > > > > > > > > Sorry, I answered to V2 thread, but I had already picked up V3, and this > > > > causes the issue with udoo and ot1200_spl. > > > > > > Please note that ot1200 has today been ack'd for removal and udoo is on > > > the removal list: > > > > FYI I am working to update the udoo and the udoo_neo so they're not > > removed as we support those boards in Fedora, I've still working my > > way through it with my schedule. > > Please find time soon. I'm spelling this out more in my -rc email > (which has been delayed in that I expect an imx PR and so I want to get > that, then release) but I will be dropping stuff post v2021.04 release. I was planning on having patches in time for the next merge window. ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-03-01 20:21 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-02-01 20:07 [PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y Marek Vasut 2021-02-02 10:48 ` Christoph Niedermaier 2021-03-01 9:27 ` Stefano Babic 2021-03-01 13:36 ` Marek Vasut 2021-03-01 13:40 ` Stefano Babic 2021-03-01 13:44 ` Stefano Babic 2021-03-01 15:41 ` Marek Vasut 2021-03-01 17:56 ` Tom Rini 2021-03-01 18:43 ` Marek Vasut 2021-03-01 19:28 ` Peter Robinson 2021-03-01 19:42 ` Tom Rini 2021-03-01 20:21 ` Peter Robinson
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.