Re: [PATCH] MIPS: vmlinux.lds.S: align raw appended dtb to 8 bytes

[Thomas Bogendoerfer <tsbogend@alpha.franken.de>]

On Mon, Mar 08, 2021 at 02:45:57PM +0100, Bjørn Mork wrote:
> Thomas Bogendoerfer <tsbogend@alpha.franken.de> writes:
> 
> > I see
> >
> > diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
> > index c1c345be04ff..4b4e39b7c79b 100644
> > --- a/arch/mips/kernel/vmlinux.lds.S
> > +++ b/arch/mips/kernel/vmlinux.lds.S
> > @@ -145,6 +145,7 @@ SECTIONS
> >         }
> >  
> >  #ifdef CONFIG_MIPS_ELF_APPENDED_DTB
> > +       STRUCT_ALIGN();
> >         .appended_dtb : AT(ADDR(.appended_dtb) - LOAD_OFFSET) {
> >                 *(.appended_dtb)
> >                 KEEP(*(.appended_dtb))
> > @@ -172,6 +173,7 @@ SECTIONS
> >  #endif
> >  
> >  #ifdef CONFIG_MIPS_RAW_APPENDED_DTB
> > +       STRUCT_ALIGN();
> >         __appended_dtb = .;
> >         /* leave space for appended DTB */
> >         . += 0x100000;
> >
> > in that patch, and IMHO this does align the appended_dtb. What do I miss ?
> 
> I'll not pretend I know anything about this subject, so feel free to
> adjust as necessary.
> 
> The problem with that patch is that it doesn't pad the image to the
> aligment.   So you can't do
> 
>  cat my.dtb >> arch/mips/boot/vmlinux.bin
> 
> anymore.  This used to work before commit 79edff12060f.

ok, took a little while to fully understand the problem. I've applied
your patch to mips-fixes with a Fixes: tag added.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]