mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-02 09:46:37 +03:00
powerpc: Update linker scripts to ensure appended device tree is aligned
With commit0535e46d55("scripts/dtc: Update to upstream version v1.7.2-35-g52f07dcca47c") it is now a fatal error to U-Boot if our device tree is not 8-byte aligned. In commit85f586035d("ARM: OMAP2+: Pad SPL binary to 8-byte alignment before DTB") Beleswar Padhi explains that we must have ALIGN(x) statements inside of a section to ensure that padding is included and not simply that the linker address counter is incremented. To that end, this patch: - Aligns the final section before _end by 8-bytes by adding '. = ALIGN(8);' or changing an existing ALIGN(4) statement. - Ensure that we do have alignment by adding an ASSERT so that when not aligned we fail to link (and explain why). Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -56,6 +56,7 @@ SECTIONS
|
||||
* _end - This is end of u-boot.bin image.
|
||||
* dtb will be appended here to make u-boot-dtb.bin
|
||||
*/
|
||||
. = ALIGN(8);
|
||||
_end = .;
|
||||
|
||||
. = ALIGN(4096);
|
||||
@@ -77,3 +78,5 @@ SECTIONS
|
||||
PROVIDE (end = .);
|
||||
}
|
||||
ENTRY(_start)
|
||||
|
||||
ASSERT(_end % 8 == 0, "_end must be 8-byte aligned for device tree");
|
||||
|
||||
@@ -78,7 +78,7 @@ SECTIONS
|
||||
__init_begin = .;
|
||||
.text.init : { *(.text.init) }
|
||||
.data.init : { *(.data.init) }
|
||||
. = ALIGN(4);
|
||||
. = ALIGN(8);
|
||||
__init_end = .;
|
||||
_end = .;
|
||||
|
||||
@@ -119,3 +119,5 @@ SECTIONS
|
||||
__bss_end = . ;
|
||||
PROVIDE (end = .);
|
||||
}
|
||||
|
||||
ASSERT(_end % 8 == 0, "_end must be 8-byte aligned for device tree");
|
||||
|
||||
@@ -72,6 +72,7 @@ SECTIONS
|
||||
* _end - This is end of u-boot.bin image.
|
||||
* dtb will be appended here to make u-boot-dtb.bin
|
||||
*/
|
||||
. = ALIGN(8);
|
||||
_end = .;
|
||||
|
||||
. = ALIGN(4096);
|
||||
@@ -93,3 +94,5 @@ SECTIONS
|
||||
PROVIDE (end = .);
|
||||
}
|
||||
ENTRY(_start)
|
||||
|
||||
ASSERT(_end % 8 == 0, "_end must be 8-byte aligned for device tree");
|
||||
|
||||
@@ -72,6 +72,7 @@ SECTIONS
|
||||
* _end - This is end of u-boot.bin image.
|
||||
* dtb will be appended here to make u-boot-dtb.bin
|
||||
*/
|
||||
. = ALIGN(8);
|
||||
_end = .;
|
||||
|
||||
. = ALIGN(4096);
|
||||
@@ -93,3 +94,5 @@ SECTIONS
|
||||
PROVIDE (end = .);
|
||||
}
|
||||
ENTRY(_start)
|
||||
|
||||
ASSERT(_end % 8 == 0, "_end must be 8-byte aligned for device tree");
|
||||
|
||||
Reference in New Issue
Block a user