michael/zephyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linker: llext: move #ifdef CONFIG_LLEXT guard inside common file

Browse Source 
LLEXT-related sections should only be added to the linker script when the
associated CONFIG_LLEXT is enabled. This has been done by checking for this
Kconfig symbol in every linker file, but this creates a lot of boilerplate
for no good reason.

Use the much simpler solution: move the check inside the common linker file
and remove existing "#ifdef CONFIG_LLEXT" checks in all linker files.

Signed-off-by: Mathieu Choplain <mathieu.choplain-ext@st.com>
This commit is contained in:
Mathieu Choplain
2025-11-06 17:23:10 +01:00
committed by Johan Hedberg
parent bfc69ad935
commit 947749abfc
40 changed files with 12 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
boards/qemu/x86/qemu_x86_tiny.ld
View File

@@ -253,10 +253,7 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/DISCARD/ :
{

3
include/zephyr/arch/arc/v2/linker.ld
View File

@@ -80,10 +80,7 @@ MEMORY {
SECTIONS {
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
GROUP_START(ROMABLE_REGION)

3
include/zephyr/arch/arm/cortex_a_r/scripts/linker.ld
View File

@@ -97,10 +97,7 @@ ENTRY(CONFIG_KERNEL_ENTRY)
SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/*
* .plt and .iplt are here according to 'arm-zephyr-elf-ld --verbose',

3
include/zephyr/arch/arm/cortex_m/scripts/linker.ld
View File

@@ -101,10 +101,7 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/*
* .plt and .iplt are here according to 'arm-zephyr-elf-ld --verbose',

3
include/zephyr/arch/arm64/scripts/linker.ld
View File

@@ -81,10 +81,7 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/*
* .plt and .iplt are here according to 'arm-zephyr-elf-ld --verbose',

3
include/zephyr/arch/mips/linker.ld
View File

@@ -45,10 +45,7 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
SECTION_PROLOGUE(_VECTOR_SECTION_NAME,,)
{

3
include/zephyr/arch/posix/linker.ld
View File

@@ -20,10 +20,7 @@
SECTIONS
{
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
SECTION_PROLOGUE(rom_start,,)
{

3
include/zephyr/arch/riscv/common/linker.ld
View File

@@ -126,10 +126,7 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/*
* The .plt and .iplt are here according to

3
include/zephyr/arch/rx/linker.ld
View File

@@ -66,10 +66,7 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
GROUP_START(ROMABLE_REGION)
. = ROM_START; /* for kernel logging */

3
include/zephyr/arch/sparc/linker.ld
View File

@@ -22,10 +22,7 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
__rom_region_start = .;

3
include/zephyr/arch/x86/ia32/linker.ld
View File

@@ -76,10 +76,7 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/DISCARD/ :
{

4
include/zephyr/arch/x86/intel64/linker.ld
View File

@@ -262,7 +262,5 @@ SECTION_PROLOGUE(.x86shadowstack.arr,,)
.shstrtab 0 : { *(.shstrtab) }
#endif
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
#include <zephyr/linker/llext-sections.ld>
}

6
include/zephyr/linker/llext-sections.ld
View File

@@ -1,5 +1,10 @@
/* SPDX-License-Identifier: Apache-2.0 */
/*
* Only define LLEXT sections if the subsystem is enabled.
* Check here to avoid duplication in every linker script.
*/
#ifdef CONFIG_LLEXT
/*
* Save the current address to avoid changing it in this file.
*/
@@ -35,3 +40,4 @@
#endif
. = __llext_current_addr;
#endif /* CONFIG_LLEXT */

3
soc/cdns/dc233c/include/xtensa-dc233c.ld
View File

@@ -112,10 +112,7 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
#ifdef CONFIG_GEN_ISR_TABLES
#include <zephyr/linker/intlist.ld>

3
soc/cdns/xtensa_sample_controller/include/xtensa-sample-controller.ld
View File

@@ -176,10 +176,7 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
#ifdef CONFIG_GEN_ISR_TABLES
#include <zephyr/linker/intlist.ld>

3
soc/espressif/esp32/default.ld
View File

@@ -199,10 +199,7 @@ SECTIONS
#endif /* CONFIG_BOOTLOADER_MCUBOOT */
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/* --- RTC BEGIN --- */

3
soc/espressif/esp32/default_appcpu.ld
View File

@@ -115,10 +115,7 @@ SECTIONS
} > metadata
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/* --- START OF IRAM --- */

3
soc/espressif/esp32c2/default.ld
View File

@@ -173,10 +173,7 @@ SECTIONS
dram_size_field = LOADADDR(.dram0.end) - LOADADDR(.dram0.data);
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/* --- START OF IRAM --- */

3
soc/espressif/esp32c3/default.ld
View File

@@ -178,10 +178,7 @@ SECTIONS
#endif /* CONFIG_BOOTLOADER_MCUBOOT */
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/* --- START OF RTC --- */

3
soc/espressif/esp32c6/default.ld
View File

@@ -185,10 +185,7 @@ SECTIONS
#endif /* CONFIG_BOOTLOADER_MCUBOOT */
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/* --- START OF RTC --- */
.rtc.text :

3
soc/espressif/esp32h2/default.ld
View File

@@ -181,10 +181,7 @@ SECTIONS
#endif /* CONFIG_BOOTLOADER_MCUBOOT */
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/* --- START OF RTC --- */
.rtc.text :

3
soc/espressif/esp32s2/default.ld
View File

@@ -196,10 +196,7 @@ SECTIONS
/* Virtual non-loadable sections */
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/* --- START OF RTC --- */

3
soc/espressif/esp32s3/default.ld
View File

@@ -209,10 +209,7 @@ SECTIONS
/* Virtual non-loadable sections */
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/* --- START OF RTC --- */

3
soc/espressif/esp32s3/default_appcpu.ld
View File

@@ -156,10 +156,7 @@ SECTIONS
} > metadata
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/* --- START OF IRAM --- */

3
soc/infineon/cat1b/cyw20829/linker.ld
View File

@@ -120,10 +120,7 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/*
* .plt and .iplt are here according to 'arm-zephyr-elf-ld --verbose',

3
soc/infineon/edge/pse84/linker_exclude_syslib.ld
View File

@@ -102,10 +102,7 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/*
* .plt and .iplt are here according to 'arm-zephyr-elf-ld --verbose',

3
soc/intel/intel_adsp/ace/ace-link.ld
View File

@@ -610,8 +610,5 @@ SECTIONS {
#ifdef CONFIG_GEN_ISR_TABLES
#include <zephyr/linker/intlist.ld>
#endif
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
}

3
soc/intel/intel_adsp/cavs/include/xtensa-cavs-linker.ld
View File

@@ -507,8 +507,5 @@ SECTIONS {
#ifdef CONFIG_GEN_ISR_TABLES
#include <zephyr/linker/intlist.ld>
#endif
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
}

3
soc/ite/ec/it51xxx/linker.ld
View File

@@ -130,10 +130,7 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/*
* The .plt and .iplt are here according to

3
soc/ite/ec/it8xxx2/linker.ld
View File

@@ -90,10 +90,7 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
/*
* The .plt and .iplt are here according to

3
soc/mediatek/mt8xxx/linker.ld
View File

@@ -155,9 +155,6 @@ SECTIONS {
* just dump it in an unreadable area at the top of memory.
*/
#include <zephyr/linker/intlist.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
} /* SECTIONS */

4
soc/nxp/imx/imx8/adsp/linker.ld
View File

@@ -179,10 +179,8 @@ SECTIONS
#endif
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
.ResetVector.text : ALIGN(4)
{
_ResetVector_text_start = ABSOLUTE(.);

4
soc/nxp/imx/imx8m/adsp/linker.ld
View File

@@ -179,10 +179,8 @@ SECTIONS
#endif
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
.ResetVector.text : ALIGN(4)
{
_ResetVector_text_start = ABSOLUTE(.);

4
soc/nxp/imx/imx8ulp/adsp/linker.ld
View File

@@ -180,10 +180,8 @@ SECTIONS
#endif
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
.ResetVector.text : ALIGN(4)
{
_ResetVector_text_start = ABSOLUTE(.);

4
soc/nxp/imx/imx8x/adsp/linker.ld
View File

@@ -180,10 +180,8 @@ SECTIONS
#endif
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
.ResetVector.text : ALIGN(4)
{
_ResetVector_text_start = ABSOLUTE(.);

4
soc/nxp/imxrt/imxrt5xx/f1/linker.ld
View File

@@ -134,10 +134,8 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
.ResetVector.text : ALIGN(4)
{
_ResetVector_text_start = ABSOLUTE(.);

3
soc/openisa/rv32m1/linker.ld
View File

@@ -86,10 +86,7 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
SECTION_PROLOGUE(.plt,,)
{

3
soc/sensry/ganymed/sy1xx/common/linker.ld
View File

@@ -77,10 +77,7 @@ SECTIONS
} > L2_PRIV_CH0
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
SECTION_PROLOGUE(.plt,,)
{

3
soc/st/stm32/stm32mp1x/linker.ld
View File

@@ -13,10 +13,7 @@ SECTIONS
{
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
#ifdef CONFIG_OPENAMP_RSC_TABLE

3
soc/st/stm32/stm32mp2x/m33/linker.ld
View File

@@ -14,8 +14,5 @@ SECTIONS
{
/* Standard Zephyr relocation section */
#include <zephyr/linker/rel-sections.ld>
#ifdef CONFIG_LLEXT
#include <zephyr/linker/llext-sections.ld>
#endif
}