firmware: payloads: Optimize usage of "ALIGN"

Delete the redundant "ALIGN" and adjust the position of "ALIGN"

Signed-off-by: Leizheng Zhang <zhangleizheng@eswincomputing.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
Reviewed-by: Bin Meng <bmeng@tinylab.org>

diff --git a/firmware/fw_base.ldS b/firmware/fw_base.ldS
index 220c043e9d3d7d7daa682f3485cf86b8ad9be663..563ae252a3d3335e76da32fdb0159da4ead75609 100644 (file)
--- 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 f3f3242abc840cc02a314a61fba05b51dac70ed1..2328a1b782dae068f5f0a5f1233c52338ea41538 100644 (file)
--- 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 = .);