From 8e63716c1ce0ff5f8b5c3c2b515a3f1cda21f580 Mon Sep 17 00:00:00 2001 From: Leizheng Zhang Date: Mon, 21 Nov 2022 16:26:22 +0800 Subject: [PATCH] firmware: payloads: Optimize usage of "ALIGN" Delete the redundant "ALIGN" and adjust the position of "ALIGN" Signed-off-by: Leizheng Zhang Reviewed-by: Andrew Jones Reviewed-by: Atish Patra Reviewed-by: Bin Meng --- firmware/fw_base.ldS | 10 ++++------ firmware/payloads/test.elf.ldS | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/firmware/fw_base.ldS b/firmware/fw_base.ldS index 220c043e..563ae252 100644 --- a/firmware/fw_base.ldS +++ b/firmware/fw_base.ldS @@ -24,14 +24,12 @@ PROVIDE(_text_end = .); } - . = ALIGN(0x1000); /* Ensure next section is page aligned */ - /* End of the code sections */ - /* Beginning of the read-only data sections */ - . = ALIGN(0x1000); /* Ensure next section is page aligned */ + /* Beginning of the read-only data sections */ + .rodata : { PROVIDE(_rodata_start = .); @@ -42,10 +40,10 @@ /* End of the read-only data sections */ - /* Beginning of the read-write data sections */ - . = ALIGN(0x1000); /* Ensure next section is page aligned */ + /* Beginning of the read-write data sections */ + .data : { PROVIDE(_data_start = .); diff --git a/firmware/payloads/test.elf.ldS b/firmware/payloads/test.elf.ldS index f3f3242a..2328a1b7 100644 --- a/firmware/payloads/test.elf.ldS +++ b/firmware/payloads/test.elf.ldS @@ -33,14 +33,12 @@ SECTIONS PROVIDE(_text_end = .); } - . = ALIGN(0x1000); /* Ensure next section is page aligned */ - /* End of the code sections */ - /* Beginning of the read-only data sections */ - . = ALIGN(0x1000); /* Ensure next section is page aligned */ + /* Beginning of the read-only data sections */ + .rodata : { PROVIDE(_rodata_start = .); @@ -51,10 +49,10 @@ SECTIONS /* End of the read-only data sections */ - /* Beginning of the read-write data sections */ - . = ALIGN(0x1000); /* Ensure next section is page aligned */ + /* Beginning of the read-write data sections */ + .data : { PROVIDE(_data_start = .);