Revision 3f6c515d723480bc8afd456b0a52438fe79128a8 authored by Paul Cercueil on 16 March 2021, 15:45:15 UTC, committed by Thomas Bogendoerfer on 16 March 2021, 21:53:08 UTC
Commit 6654111c893f ("MIPS: vmlinux.lds.S: align raw appended dtb to 8 bytes") changed the alignment from STRUCT_ALIGNMENT bytes to 8 bytes. The commit's message makes it sound like it was actually done on purpose, but this is not the case. The commit was written when raw appended dtb were not aligned at all. The STRUCT_ALIGN() was added a few days before, in commit 7a05293af39f ("MIPS: boot/compressed: Copy DTB to aligned address"). The true purpose of the commit was not to align specifically to 8 bytes, but to make sure that the generated vmlinux' size was properly padded to the alignment required for DTBs. While the switch to 8-byte alignment worked for vmlinux-appended dtb blobs, it broke vmlinuz-appended dtb blobs, as the decompress routine moves the blob to a STRUCT_ALIGNMENT aligned address. Fix this by changing the raw appended dtb blob alignment from 8 bytes back to STRUCT_ALIGNMENT bytes in vmlinux.lds.S. Fixes: 6654111c893f ("MIPS: vmlinux.lds.S: align raw appended dtb to 8 bytes") Cc: Bjørn Mork <bjorn@mork.no> Signed-off-by: Paul Cercueil <paul@crapouillou.net> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
1 parent bd67b71
File | Mode | Size |
---|---|---|
Build | -rw-r--r-- | 23 bytes |
Makefile | -rw-r--r-- | 1.4 KB |
pcitest.c | -rw-r--r-- | 5.7 KB |
pcitest.sh | -rw-r--r-- | 824 bytes |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...