Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

ARM: Align image end to 8 bytes to fit DT alignment

Browse Source 
Align U-Boot image end to 8 bytes to make sure DT alignment requirement
is fulfilled. This fixes a possible failure in fdt_find_separate() in
case the U-Boot image is aligned to 4 Bytes and DT is appended at the
end at already 8 Byte aligned offset.

Link: https://source.denx.de/u-boot/u-boot/-/issues/30
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Marek Vasut <marek.vasut@mailbox.org>
This commit is contained in:
Marek Vasut
2025-05-18 18:02:58 +02:00
committed by Tom Rini
parent d45b1d4ac9
commit 52caad0d14
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/cpu/u-boot-spl.lds
View File

@@ -53,13 +53,14 @@ SECTIONS
__rel_dyn_end = .; __rel_dyn_end = .;
} }
. = ALIGN(8);
_image_binary_end = .; _image_binary_end = .;
_end = .; _end = .;
.bss __rel_dyn_start (OVERLAY) : { .bss __rel_dyn_start (OVERLAY) : {
__bss_start = .; __bss_start = .;
*(.bss*) *(.bss*)
. = ALIGN(4); . = ALIGN(8);
__bss_end = .; __bss_end = .;
} }
__bss_size = __bss_end - __bss_start; __bss_size = __bss_end - __bss_start;

6
arch/arm/cpu/u-boot.lds
View File

@@ -153,14 +153,14 @@ SECTIONS
__efi_runtime_rel_stop = .; __efi_runtime_rel_stop = .;
} }
. = ALIGN(4); . = ALIGN(8);
__image_copy_end = .; __image_copy_end = .;
/* /*
* if CONFIG_USE_ARCH_MEMSET is not selected __bss_end - __bss_start * if CONFIG_USE_ARCH_MEMSET is not selected __bss_end - __bss_start
* needs to be a multiple of 4 and we overlay .bss with .rel.dyn * needs to be a multiple of 8 and we overlay .bss with .rel.dyn
*/ */
.rel.dyn ALIGN(4) : { .rel.dyn ALIGN(8) : {
__rel_dyn_start = .; __rel_dyn_start = .;
*(.rel*) *(.rel*)
__rel_dyn_end = .; __rel_dyn_end = .;