diff options
| author | Rob Herring <robh@kernel.org> | 2021-02-12 19:16:24 -0600 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2021-02-16 07:43:36 +0100 |
| commit | 48783be427c70a377c83a17d045eee98c90220da (patch) | |
| tree | bc20f391a48f1f549fb765b5b82dbc9a63ef286b /arch/microblaze | |
| parent | b68c8736a01f5eb21e4c2461f7c3c505e845e6ab (diff) | |
| download | linux-48783be427c70a377c83a17d045eee98c90220da.tar.gz linux-48783be427c70a377c83a17d045eee98c90220da.tar.bz2 linux-48783be427c70a377c83a17d045eee98c90220da.zip | |
microblaze: Fix built-in DTB alignment to be 8-byte aligned
Commit 79edff12060f ("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: 79edff12060f ("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>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/vmlinux.lds.S b/arch/microblaze/kernel/vmlinux.lds.S index df07b3d06cd6..fb31747ec092 100644 --- a/arch/microblaze/kernel/vmlinux.lds.S +++ b/arch/microblaze/kernel/vmlinux.lds.S @@ -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 */ |