diff --git a/include/arch/arc/v2/linker.ld b/include/arch/arc/v2/linker.ld index 8702c34dbbc..67f7856d620 100644 --- a/include/arch/arc/v2/linker.ld +++ b/include/arch/arc/v2/linker.ld @@ -107,10 +107,6 @@ SECTIONS { *(".rodata.*") *(.gnu.linkonce.r.*) -#ifdef CONFIG_SOC_RODATA_LD -#include -#endif - #ifdef CONFIG_CUSTOM_RODATA_LD /* Located in project source directory */ #include @@ -232,10 +228,6 @@ SECTIONS { KERNEL_INPUT_SECTION(".noinit.*") *(".kernel_noinit.*") -#ifdef CONFIG_SOC_NOINIT_LD -#include -#endif - } GROUP_LINK_IN(RAMABLE_REGION) SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,) { @@ -246,10 +238,6 @@ SECTIONS { KERNEL_INPUT_SECTION(".data.*") *(".kernel.*") -#ifdef CONFIG_SOC_RWDATA_LD -#include -#endif - #ifdef CONFIG_CUSTOM_RWDATA_LD /* Located in project source directory */ #include diff --git a/include/arch/arm/cortex_m/scripts/linker.ld b/include/arch/arm/cortex_m/scripts/linker.ld index 90d8cca5e0e..5c665676193 100644 --- a/include/arch/arm/cortex_m/scripts/linker.ld +++ b/include/arch/arm/cortex_m/scripts/linker.ld @@ -163,10 +163,6 @@ SECTIONS *(".rodata.*") *(.gnu.linkonce.r.*) -#ifdef CONFIG_SOC_RODATA_LD -#include -#endif - #ifdef CONFIG_CUSTOM_RODATA_LD /* Located in project source directory */ #include @@ -334,10 +330,6 @@ SECTIONS KERNEL_INPUT_SECTION(".noinit.*") *(".kernel_noinit.*") -#ifdef CONFIG_SOC_NOINIT_LD -#include -#endif - } GROUP_LINK_IN(RAMABLE_REGION) SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,) @@ -347,10 +339,6 @@ SECTIONS KERNEL_INPUT_SECTION(".data.*") *(".kernel.*") -#ifdef CONFIG_SOC_RWDATA_LD -#include -#endif - #ifdef CONFIG_CUSTOM_RWDATA_LD /* Located in project source directory */ #include diff --git a/include/arch/nios2/linker.ld b/include/arch/nios2/linker.ld index a3918476c93..67c3f3239e6 100644 --- a/include/arch/nios2/linker.ld +++ b/include/arch/nios2/linker.ld @@ -128,10 +128,6 @@ SECTIONS *(".rodata.*") *(.gnu.linkonce.r.*) -#ifdef CONFIG_SOC_RODATA_LD -#include -#endif - #ifdef CONFIG_CUSTOM_RODATA_LD /* Located in project source directory */ #include @@ -178,10 +174,6 @@ SECTIONS *(.data) *(".data.*") -#ifdef CONFIG_SOC_RWDATA_LD -#include -#endif - #ifdef CONFIG_CUSTOM_RWDATA_LD /* Located in project source directory */ #include @@ -239,11 +231,6 @@ SECTIONS */ *(.noinit) *(".noinit.*") - -#ifdef CONFIG_SOC_NOINIT_LD -#include -#endif - } GROUP_LINK_IN(RAMABLE_REGION) /* Define linker symbols */ diff --git a/include/arch/riscv32/common/linker.ld b/include/arch/riscv32/common/linker.ld index ee85d6ef69d..01b6bd2c29f 100644 --- a/include/arch/riscv32/common/linker.ld +++ b/include/arch/riscv32/common/linker.ld @@ -96,11 +96,6 @@ SECTIONS *(.rodata) *(".rodata.*") *(.gnu.linkonce.r.*) - -#ifdef CONFIG_SOC_RODATA_LD -#include -#endif - } GROUP_LINK_IN(ROMABLE_REGION) _image_rom_end = .; @@ -122,10 +117,6 @@ SECTIONS *(.sdata .sdata.* .gnu.linkonce.s.*) *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) -#ifdef CONFIG_SOC_RWDATA_LD -#include -#endif - } GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION) #include @@ -160,11 +151,6 @@ SECTIONS */ *(.noinit) *(".noinit.*") - -#ifdef CONFIG_SOC_NOINIT_LD -#include -#endif - } GROUP_LINK_IN(RAMABLE_REGION) _image_ram_end = .; diff --git a/include/arch/riscv32/pulpino/linker.ld b/include/arch/riscv32/pulpino/linker.ld index c4e74a570ab..ffd473ca9d6 100644 --- a/include/arch/riscv32/pulpino/linker.ld +++ b/include/arch/riscv32/pulpino/linker.ld @@ -90,11 +90,6 @@ SECTIONS *(.rodata) *(".rodata.*") *(.gnu.linkonce.r.*) - -#ifdef CONFIG_SOC_RODATA_LD -#include -#endif - } GROUP_LINK_IN(RAMABLE_REGION) _image_ram_start = .; @@ -111,10 +106,6 @@ SECTIONS *(.sdata .sdata.* .gnu.linkonce.s.*) *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) -#ifdef CONFIG_SOC_RWDATA_LD -#include -#endif - } GROUP_LINK_IN(RAMABLE_REGION) SECTION_DATA_PROLOGUE(_BSS_SECTION_NAME,(NOLOAD),) @@ -145,11 +136,6 @@ SECTIONS */ *(.noinit) *(".noinit.*") - -#ifdef CONFIG_SOC_NOINIT_LD -#include -#endif - } GROUP_LINK_IN(RAMABLE_REGION) _image_ram_end = .; diff --git a/include/arch/x86/linker.ld b/include/arch/x86/linker.ld index f3d0e197351..184b4e1822a 100644 --- a/include/arch/x86/linker.ld +++ b/include/arch/x86/linker.ld @@ -132,10 +132,6 @@ SECTIONS #endif #endif -#ifdef CONFIG_SOC_RODATA_LD -#include -#endif - #ifdef CONFIG_CUSTOM_RODATA_LD /* Located in project source directory */ #include @@ -248,10 +244,6 @@ SECTIONS KERNEL_INPUT_SECTION(".noinit.*") *(".kernel_noinit.*") -#ifdef CONFIG_SOC_NOINIT_LD -#include -#endif - MMU_PAGE_ALIGN } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION) @@ -265,10 +257,6 @@ SECTIONS KERNEL_INPUT_SECTION(".data.*") *(".kernel.*") -#ifdef CONFIG_SOC_RWDATA_LD -#include -#endif - #ifdef CONFIG_CUSTOM_RWDATA_LD /* Located in project source directory */ #include diff --git a/soc/Kconfig b/soc/Kconfig index 5d6c580ff19..ab0c3810f74 100644 --- a/soc/Kconfig +++ b/soc/Kconfig @@ -16,39 +16,3 @@ module-str = SOC source "subsys/logging/Kconfig.template.log_config" endmenu - -# -# SOC_*_LD: SoC specific Linker script additions -# -config SOC_NOINIT_LD - bool - depends on (ARC || ARM || X86 || NIOS2 || RISCV32) - help - Include an SoC specific linker script fragment named soc-noinit.ld - for inserting additional data and linker directives into - the noinit section. - - This only has effect if the SoC uses the common linker script - under include/arch/. - -config SOC_RODATA_LD - bool - depends on (ARC || ARM || X86 || NIOS2 || RISCV32) - help - Include an SoC specific linker script fragment named soc-rodata.ld - for inserting additional data and linker directives into - the rodata section. - - This only has effect if the SoC uses the common linker script - under include/arch/. - -config SOC_RWDATA_LD - bool - depends on (ARC || ARM || X86 || NIOS2 || RISCV32) - help - Include an SoC specific linker script fragment named soc-rwdata.ld - for inserting additional data and linker directives into - the data section. - - This only has effect if the SoC uses the common linker script - under include/arch/.