Factor xlat_table sections in linker scripts out into a header file

TF-A has so many linker scripts, at least one linker script for each BL image, and some platforms have their own ones. They duplicate quite similar code (and comments). When we add some changes to linker scripts, we end up with touching so many files. This is not nice in the maintainability perspective. When you look at Linux kernel, the common code is macrofied in include/asm-generic/vmlinux.lds.h, which is included from each arch linker script, arch/*/kernel/vmlinux.lds.S TF-A can follow this approach. Let's factor out the common code into include/common/bl_common.ld.h As a start point, this commit factors out the xlat_table section. Change-Id: Ifa369e9b48e8e12702535d721cc2a16d12397895 Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2020-03-09 17:39:48 +09:00 · 2020-03-09 17:39:48 +09:00 · 665e71b8ea
parent e28224583e
commit 665e71b8ea
9 changed files with 42 additions and 77 deletions
--- a/bl1/bl1.ld.S
+++ b/bl1/bl1.ld.S
@ -1,11 +1,12 @@
 /*
- * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */

 #include <platform_def.h>

+#include <common/bl_common.ld.h>
 #include <lib/xlat_tables/xlat_tables_defs.h>

 OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
@ -148,15 +149,7 @@ SECTIONS
        __BSS_END__ = .;
    } >RAM

-    /*
-     * The xlat_table section is for full, aligned page tables (4K).
-     * Removing them from .bss avoids forcing 4K alignment on
-     * the .bss section. The tables are initialized to zero by the translation
-     * tables library.
-     */
-    xlat_table (NOLOAD) : {
-        *(xlat_table)
-    } >RAM
+    XLAT_TABLE_SECTION >RAM

 #if USE_COHERENT_MEM
    /*
--- a/bl2/bl2.ld.S
+++ b/bl2/bl2.ld.S
@ -6,6 +6,7 @@

 #include <platform_def.h>

+#include <common/bl_common.ld.h>
 #include <lib/xlat_tables/xlat_tables_defs.h>

 OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
@ -125,15 +126,7 @@ SECTIONS
        __BSS_END__ = .;
    } >RAM

-    /*
-     * The xlat_table section is for full, aligned page tables (4K).
-     * Removing them from .bss avoids forcing 4K alignment on
-     * the .bss section. The tables are initialized to zero by the translation
-     * tables library.
-     */
-    xlat_table (NOLOAD) : {
-        *(xlat_table)
-    } >RAM
+    XLAT_TABLE_SECTION >RAM

 #if USE_COHERENT_MEM
    /*
--- a/bl2/bl2_el3.ld.S
+++ b/bl2/bl2_el3.ld.S
@ -1,11 +1,12 @@
 /*
- * Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */

 #include <platform_def.h>

+#include <common/bl_common.ld.h>
 #include <lib/xlat_tables/xlat_tables_defs.h>

 OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
@ -188,15 +189,7 @@ SECTIONS
        __BSS_END__ = .;
    } >RAM

-    /*
-     * The xlat_table section is for full, aligned page tables (4K).
-     * Removing them from .bss avoids forcing 4K alignment on
-     * the .bss section. The tables are initialized to zero by the translation
-     * tables library.
-     */
-    xlat_table (NOLOAD) : {
-        *(xlat_table)
-    } >RAM
+    XLAT_TABLE_SECTION >RAM

 #if USE_COHERENT_MEM
    /*
--- a/bl2u/bl2u.ld.S
+++ b/bl2u/bl2u.ld.S
@ -1,11 +1,12 @@
 /*
- * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */

 #include <platform_def.h>

+#include <common/bl_common.ld.h>
 #include <lib/xlat_tables/xlat_tables_defs.h>

 OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
@ -102,15 +103,7 @@ SECTIONS
        __BSS_END__ = .;
    } >RAM

-    /*
-     * The xlat_table section is for full, aligned page tables (4K).
-     * Removing them from .bss avoids forcing 4K alignment on
-     * the .bss section. The tables are initialized to zero by the translation
-     * tables library.
-     */
-    xlat_table (NOLOAD) : {
-        *(xlat_table)
-    } >RAM
+    XLAT_TABLE_SECTION >RAM

 #if USE_COHERENT_MEM
    /*
--- a/bl31/bl31.ld.S
+++ b/bl31/bl31.ld.S
@ -6,6 +6,7 @@

 #include <platform_def.h>

+#include <common/bl_common.ld.h>
 #include <lib/xlat_tables/xlat_tables_defs.h>

 OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
@ -287,15 +288,7 @@ SECTIONS
        __BSS_END__ = .;
    } >NOBITS

-    /*
-     * The xlat_table section is for full, aligned page tables (4K).
-     * Removing them from .bss avoids forcing 4K alignment on
-     * the .bss section. The tables are initialized to zero by the translation
-     * tables library.
-     */
-    xlat_table (NOLOAD) : {
-        *(xlat_table)
-    } >NOBITS
+    XLAT_TABLE_SECTION >NOBITS

 #if USE_COHERENT_MEM
    /*
--- a/bl32/sp_min/sp_min.ld.S
+++ b/bl32/sp_min/sp_min.ld.S
@ -1,11 +1,12 @@
 /*
- * Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */

 #include <platform_def.h>

+#include <common/bl_common.ld.h>
 #include <lib/xlat_tables/xlat_tables_defs.h>

 OUTPUT_FORMAT(elf32-littlearm)
@ -196,15 +197,7 @@ SECTIONS
        __BSS_END__ = .;
    } >RAM

-    /*
-     * The xlat_table section is for full, aligned page tables (4K).
-     * Removing them from .bss avoids forcing 4K alignment on
-     * the .bss section. The tables are initialized to zero by the translation
-     * tables library.
-     */
-    xlat_table (NOLOAD) : {
-        *(xlat_table)
-    } >RAM
+    XLAT_TABLE_SECTION >RAM

     __BSS_SIZE__ = SIZEOF(.bss);

--- a/bl32/tsp/tsp.ld.S
+++ b/bl32/tsp/tsp.ld.S
@ -4,6 +4,7 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

+#include <common/bl_common.ld.h>
 #include <lib/xlat_tables/xlat_tables_defs.h>
 #include <platform_def.h>

@ -125,15 +126,7 @@ SECTIONS
        __BSS_END__ = .;
    } >RAM

-    /*
-     * The xlat_table section is for full, aligned page tables (4K).
-     * Removing them from .bss avoids forcing 4K alignment on
-     * the .bss section. The tables are initialized to zero by the translation
-     * tables library.
-     */
-    xlat_table (NOLOAD) : {
-        *(xlat_table)
-    } >RAM
+    XLAT_TABLE_SECTION >RAM

 #if USE_COHERENT_MEM
    /*
--- a/include/common/bl_common.ld.h
+++ b/include/common/bl_common.ld.h
@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2020, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef BL_COMMON_LD_H
+#define BL_COMMON_LD_H
+
+/*
+ * The xlat_table section is for full, aligned page tables (4K).
+ * Removing them from .bss avoids forcing 4K alignment on
+ * the .bss section. The tables are initialized to zero by the translation
+ * tables library.
+ */
+#define XLAT_TABLE_SECTION				\
+	xlat_table (NOLOAD) : {				\
+		*(xlat_table)				\
+	}
+
+#endif /* BL_COMMON_LD_H */
--- a/plat/mediatek/mt6795/bl31.ld.S
+++ b/plat/mediatek/mt6795/bl31.ld.S
@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved.
 *
 * SPDX-License-Identifier: BSD-3-Clause
 */

+#include <common/bl_common.ld.h>
 #include <lib/xlat_tables/xlat_tables_defs.h>
 #include <platform_def.h>

@ -131,15 +132,7 @@ SECTIONS

    ASSERT(. <= BL31_LIMIT, "BL3-1 image has exceeded its limit.")

-    /*
-     * The xlat_table section is for full, aligned page tables (4K).
-     * Removing them from .bss avoids forcing 4K alignment on
-     * the .bss section. The tables are initialized to zero by the translation
-     * tables library.
-     */
-    xlat_table (NOLOAD) : {
-        *(xlat_table)
-    } >RAM2
+    XLAT_TABLE_SECTION >RAM2

 #if USE_COHERENT_MEM
    /*