[PATCH v2 u-boot 2/3] powerpc/mpc85xx: socrates: Rename u-boot-socrates.bin to u-boot.bin

[Tom Rini]

On Sat, Jan 14, 2023 at 10:12:06PM +0100, Pali Rohár wrote:
> On Friday 13 January 2023 18:16:03 Tom Rini wrote:
> > On Sat, Jan 14, 2023 at 12:11:22AM +0100, Pali Rohár wrote:
> > > U-Boot build process for socrates board produces final U-Boot binary in
> > > file u-boot-socrates.bin (by binman) And as a bonus it produces two
> > > unusable broken binaries u-boot-dtb.bin and u-boot.bin (by Makefile).
> > > 
> > > So do not build broken u-boot-dtb.bin and u-boot.bin binaries and rename
> > > board specific u-boot-socrates.bin binary to u-boot.bin.
> > > 
> > > Renaming requires to define a new socrates specific Makefile target for
> > > u-boot.bin (via binman) and also changing output name in socrates binman
> > > config file.
> > > 
> > > With this change U-Boot build process for socrates board also produces
> > > final U-Boot binary in file u-boot.bin.
> > > 
> > > Signed-off-by: Pali Rohár <pali at kernel.org>
> > > ---
> > > Added make dependency on u-boot.dtb
> > > ---
> > >  Makefile                              | 11 +++++++++++
> > >  arch/powerpc/dts/socrates-u-boot.dtsi |  2 +-
> > >  2 files changed, 12 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/Makefile b/Makefile
> > > index a4a14d5d35a8..5473bea25332 100644
> > > --- a/Makefile
> > > +++ b/Makefile
> > > @@ -1195,22 +1195,30 @@ endif
> > >  u-boot.bin: u-boot-fit-dtb.bin FORCE
> > >  	$(call if_changed,copy)
> > >  
> > > +ifneq ($(CONFIG_TARGET_SOCRATES),y)
> > >  u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE
> > >  	$(call if_changed,cat)
> > > +endif
> > >  
> > >  else ifeq ($(CONFIG_OF_SEPARATE).$(CONFIG_OF_OMIT_DTB),y.)
> > > +ifneq ($(CONFIG_TARGET_SOCRATES),y)
> > >  u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE
> > >  	$(call if_changed,cat)
> > > +endif
> > >  
> > >  ifneq ($(CONFIG_MPC85XX_HAVE_RESET_VECTOR)$(CONFIG_OF_SEPARATE),yy)
> > > +ifneq ($(CONFIG_TARGET_SOCRATES),y)
> > >  u-boot.bin: u-boot-dtb.bin FORCE
> > >  	$(call if_changed,copy)
> > >  endif
> > > +endif
> > >  
> > >  else ifneq ($(CONFIG_MPC85XX_HAVE_RESET_VECTOR)$(CONFIG_OF_SEPARATE),yy)
> > > +ifneq ($(CONFIG_TARGET_SOCRATES),y)
> > >  u-boot.bin: u-boot-nodtb.bin FORCE
> > >  	$(call if_changed,copy)
> > >  endif
> > > +endif
> > 
> > Simon's point from before still stands. This is the opposite of what we
> > want. There must not be CONFIG_TARGET_ logic introduced to the
> > top-level Makefile. socrate is "just" another mpc85xx platform, it
> > doesn't have a special ROM, we need to adjust it back to acting like
> > other platforms.
> 
> socrates has its own flash layout, own build procedure and purpose of
> this patch is just to prevent another breakage (like it was done in the
> past) by throwing make errors.
> 
> Trying to adjust board code and changing its layout is really not up to
> me. I do not have this board.
> 
> One there is generic binman build rules from make then it can be
> switches to that generic binman rule. Until it happen there is not
> better option...

Yes, it should be Heiko, as the board maintainer, dealing with fixing
this part. I don't understand the flash layout, and the partition table
laid out in arch/powerpc/dts/socrates.dts confuses things even more to
me. But, the board maintainer should be able to sort this all out.
Because we do not want to add CONFIG_TARGET_ logic to the top-level
Makefile.

-- 
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/20230114/6bbac0f8/attachment.sig>