On Wed, Mar 3, 2021 at 1:33 PM Paul Cercueil <paul@xxxxxxxxxxxxxxx> wrote: > > Since 5.12-rc1, the Device Tree blob must now be properly aligned. I had checked the other built-in cases as microblaze broke too, but missed some of the many ways MIPS can have a dtb. Appended and built-in DTBs were supposed to be temporary. :( > Therefore, the decompress routine must be careful to copy the blob at > the next aligned address after the kernel image. > > This commit fixes the kernel sometimes not booting with a Device Tree > blob appended to it. > > Fixes: c4d5e638d6e9 ("scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9") > Signed-off-by: Paul Cercueil <paul@xxxxxxxxxxxxxxx> > --- > arch/mips/boot/compressed/decompress.c | 8 ++++++++ > arch/mips/kernel/vmlinux.lds.S | 2 ++ > 2 files changed, 10 insertions(+) Acked-by: Rob Herring <robh@xxxxxxxxxx>