Skip to content

Commit

Permalink
microblaze: Fix built-in DTB alignment to be 8-byte aligned
Browse files Browse the repository at this point in the history
Commit 79edff1 ("scripts/dtc: Update to upstream version
v1.6.0-51-g183df9e9c2b9") broke booting on Microblaze systems depending on
the build. The problem is libfdt gained an 8-byte starting alignment check,
but the Microblaze built-in DTB area is only 4-byte aligned. This affected
not just built-in DTBs as bootloader passed DTBs are copied into the
built-in DTB region.

Other arches using built-in DTBs use a common linker macro which has
sufficient alignment.

Fixes: 79edff1 ("scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Cc: Michal Simek <monstr@monstr.eu>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210213011624.251838-1-robh@kernel.org
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
  • Loading branch information
Rob Herring authored and Michal Simek committed Feb 16, 2021
1 parent b68c873 commit 48783be
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/microblaze/kernel/vmlinux.lds.S
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ SECTIONS {
_etext = . ;
}

. = ALIGN (4) ;
. = ALIGN (8) ;
__fdt_blob : AT(ADDR(__fdt_blob) - LOAD_OFFSET) {
_fdt_start = . ; /* place for fdt blob */
*(__fdt_blob) ; /* Any link-placed DTB */
Expand Down

0 comments on commit 48783be

Please sign in to comment.