diff options
| -rw-r--r-- | arch/x86/cpu/u-boot-64.lds | 6 | ||||
| -rw-r--r-- | arch/x86/cpu/u-boot-spl.lds | 10 | ||||
| -rw-r--r-- | arch/x86/cpu/u-boot.lds | 11 |
3 files changed, 19 insertions, 8 deletions
diff --git a/arch/x86/cpu/u-boot-64.lds b/arch/x86/cpu/u-boot-64.lds index 00a6d869121..0c353c5d740 100644 --- a/arch/x86/cpu/u-boot-64.lds +++ b/arch/x86/cpu/u-boot-64.lds @@ -86,9 +86,11 @@ SECTIONS __rel_dyn_end = .; . = ALIGN(4); - .dynamic : { *(.dynamic) } + .dynamic : { + *(.dynamic) + . = ALIGN(8); + } - . = ALIGN(4); _end = .; .bss __rel_dyn_start (OVERLAY) : { diff --git a/arch/x86/cpu/u-boot-spl.lds b/arch/x86/cpu/u-boot-spl.lds index 50b4b160855..57cdce6d751 100644 --- a/arch/x86/cpu/u-boot-spl.lds +++ b/arch/x86/cpu/u-boot-spl.lds @@ -68,7 +68,7 @@ SECTIONS __bss_start = .; *(.bss*) *(COM*) - . = ALIGN(4); + . = ALIGN(8); __bss_end = .; } __bss_size = __bss_end - __bss_start; @@ -97,3 +97,11 @@ SECTIONS #endif } + +ASSERT(_image_binary_end % 8 == 0, \ + "_image_binary_end must be 8-byte aligned for device tree"); + +#if !CONFIG_IS_ENABLED(SEPARATE_BSS) +ASSERT(__bss_end % 8 == 0, \ + "__bss_end must be 8-byte aligned for device tree"); +#endif diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds index c418ff44aa0..ea070acd6a1 100644 --- a/arch/x86/cpu/u-boot.lds +++ b/arch/x86/cpu/u-boot.lds @@ -79,13 +79,12 @@ SECTIONS . = ALIGN(4); .dynsym : { *(.dynsym*) } - . = ALIGN(4); - __rel_dyn_start = .; - .rel.dyn : { + .rel.dyn ALIGN(4) : { + __rel_dyn_start = .; *(.rel*) + __rel_dyn_end = .; + . = ALIGN(8); } - __rel_dyn_end = .; - . = ALIGN(4); _end = .; .bss __rel_dyn_start (OVERLAY) : { @@ -120,3 +119,5 @@ SECTIONS #endif } + +ASSERT(_end % 8 == 0, "_end must be 8-byte aligned for device tree"); |