patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

Revert "linker: allow SoC to insert linker script fragments"

Browse source 
This reverts commit 2fed930f4e.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2018-10-14 09:41:05 -04:00
parent a220e2690f
commit 1d0136ef3b
7 changed files with 0 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/arch/arc/v2/linker.ld
View file

@ -107,10 +107,6 @@ SECTIONS {
*(".rodata.*") *(".rodata.*")
*(.gnu.linkonce.r.*) *(.gnu.linkonce.r.*)
#ifdef CONFIG_SOC_RODATA_LD
#include <soc-rodata.ld>
#endif
#ifdef CONFIG_CUSTOM_RODATA_LD #ifdef CONFIG_CUSTOM_RODATA_LD
/* Located in project source directory */ /* Located in project source directory */
#include <custom-rodata.ld> #include <custom-rodata.ld>
@ -232,10 +228,6 @@ SECTIONS {
KERNEL_INPUT_SECTION(".noinit.*") KERNEL_INPUT_SECTION(".noinit.*")
*(".kernel_noinit.*") *(".kernel_noinit.*")
#ifdef CONFIG_SOC_NOINIT_LD
#include <soc-noinit.ld>
#endif
} GROUP_LINK_IN(RAMABLE_REGION) } GROUP_LINK_IN(RAMABLE_REGION)
SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,) { SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,) {
@ -246,10 +238,6 @@ SECTIONS {
KERNEL_INPUT_SECTION(".data.*") KERNEL_INPUT_SECTION(".data.*")
*(".kernel.*") *(".kernel.*")
#ifdef CONFIG_SOC_RWDATA_LD
#include <soc-rwdata.ld>
#endif
#ifdef CONFIG_CUSTOM_RWDATA_LD #ifdef CONFIG_CUSTOM_RWDATA_LD
/* Located in project source directory */ /* Located in project source directory */
#include <custom-rwdata.ld> #include <custom-rwdata.ld>

12
include/arch/arm/cortex_m/scripts/linker.ld
View file

@ -163,10 +163,6 @@ SECTIONS
*(".rodata.*") *(".rodata.*")
*(.gnu.linkonce.r.*) *(.gnu.linkonce.r.*)
#ifdef CONFIG_SOC_RODATA_LD
#include <soc-rodata.ld>
#endif
#ifdef CONFIG_CUSTOM_RODATA_LD #ifdef CONFIG_CUSTOM_RODATA_LD
/* Located in project source directory */ /* Located in project source directory */
#include <custom-rodata.ld> #include <custom-rodata.ld>
@ -334,10 +330,6 @@ SECTIONS
KERNEL_INPUT_SECTION(".noinit.*") KERNEL_INPUT_SECTION(".noinit.*")
*(".kernel_noinit.*") *(".kernel_noinit.*")
#ifdef CONFIG_SOC_NOINIT_LD
#include <soc-noinit.ld>
#endif
} GROUP_LINK_IN(RAMABLE_REGION) } GROUP_LINK_IN(RAMABLE_REGION)
SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,) SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,)
@ -347,10 +339,6 @@ SECTIONS
KERNEL_INPUT_SECTION(".data.*") KERNEL_INPUT_SECTION(".data.*")
*(".kernel.*") *(".kernel.*")
#ifdef CONFIG_SOC_RWDATA_LD
#include <soc-rwdata.ld>
#endif
#ifdef CONFIG_CUSTOM_RWDATA_LD #ifdef CONFIG_CUSTOM_RWDATA_LD
/* Located in project source directory */ /* Located in project source directory */
#include <custom-rwdata.ld> #include <custom-rwdata.ld>

13
include/arch/nios2/linker.ld
View file

@ -128,10 +128,6 @@ SECTIONS
*(".rodata.*") *(".rodata.*")
*(.gnu.linkonce.r.*) *(.gnu.linkonce.r.*)
#ifdef CONFIG_SOC_RODATA_LD
#include <soc-rodata.ld>
#endif
#ifdef CONFIG_CUSTOM_RODATA_LD #ifdef CONFIG_CUSTOM_RODATA_LD
/* Located in project source directory */ /* Located in project source directory */
#include <custom-rodata.ld> #include <custom-rodata.ld>
@ -178,10 +174,6 @@ SECTIONS
*(.data) *(.data)
*(".data.*") *(".data.*")
#ifdef CONFIG_SOC_RWDATA_LD
#include <soc-rwdata.ld>
#endif
#ifdef CONFIG_CUSTOM_RWDATA_LD #ifdef CONFIG_CUSTOM_RWDATA_LD
/* Located in project source directory */ /* Located in project source directory */
#include <custom-rwdata.ld> #include <custom-rwdata.ld>
@ -239,11 +231,6 @@ SECTIONS
*/ */
*(.noinit) *(.noinit)
*(".noinit.*") *(".noinit.*")
#ifdef CONFIG_SOC_NOINIT_LD
#include <soc-noinit.ld>
#endif
} GROUP_LINK_IN(RAMABLE_REGION) } GROUP_LINK_IN(RAMABLE_REGION)
/* Define linker symbols */ /* Define linker symbols */

14
include/arch/riscv32/common/linker.ld
View file

@ -96,11 +96,6 @@ SECTIONS
*(.rodata) *(.rodata)
*(".rodata.*") *(".rodata.*")
*(.gnu.linkonce.r.*) *(.gnu.linkonce.r.*)
#ifdef CONFIG_SOC_RODATA_LD
#include <soc-rodata.ld>
#endif
} GROUP_LINK_IN(ROMABLE_REGION) } GROUP_LINK_IN(ROMABLE_REGION)
_image_rom_end = .; _image_rom_end = .;
@ -122,10 +117,6 @@ SECTIONS
*(.sdata .sdata.* .gnu.linkonce.s.*) *(.sdata .sdata.* .gnu.linkonce.s.*)
*(.sdata2 .sdata2.* .gnu.linkonce.s2.*) *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
#ifdef CONFIG_SOC_RWDATA_LD
#include <soc-rwdata.ld>
#endif
} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION) } GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
#include <linker/common-ram.ld> #include <linker/common-ram.ld>
@ -160,11 +151,6 @@ SECTIONS
*/ */
*(.noinit) *(.noinit)
*(".noinit.*") *(".noinit.*")
#ifdef CONFIG_SOC_NOINIT_LD
#include <soc-noinit.ld>
#endif
} GROUP_LINK_IN(RAMABLE_REGION) } GROUP_LINK_IN(RAMABLE_REGION)
_image_ram_end = .; _image_ram_end = .;

14
include/arch/riscv32/pulpino/linker.ld
View file

@ -90,11 +90,6 @@ SECTIONS
*(.rodata) *(.rodata)
*(".rodata.*") *(".rodata.*")
*(.gnu.linkonce.r.*) *(.gnu.linkonce.r.*)
#ifdef CONFIG_SOC_RODATA_LD
#include <soc-rodata.ld>
#endif
} GROUP_LINK_IN(RAMABLE_REGION) } GROUP_LINK_IN(RAMABLE_REGION)
_image_ram_start = .; _image_ram_start = .;
@ -111,10 +106,6 @@ SECTIONS
*(.sdata .sdata.* .gnu.linkonce.s.*) *(.sdata .sdata.* .gnu.linkonce.s.*)
*(.sdata2 .sdata2.* .gnu.linkonce.s2.*) *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
#ifdef CONFIG_SOC_RWDATA_LD
#include <soc-rwdata.ld>
#endif
} GROUP_LINK_IN(RAMABLE_REGION) } GROUP_LINK_IN(RAMABLE_REGION)
SECTION_DATA_PROLOGUE(_BSS_SECTION_NAME,(NOLOAD),) SECTION_DATA_PROLOGUE(_BSS_SECTION_NAME,(NOLOAD),)
@ -145,11 +136,6 @@ SECTIONS
*/ */
*(.noinit) *(.noinit)
*(".noinit.*") *(".noinit.*")
#ifdef CONFIG_SOC_NOINIT_LD
#include <soc-noinit.ld>
#endif
} GROUP_LINK_IN(RAMABLE_REGION) } GROUP_LINK_IN(RAMABLE_REGION)
_image_ram_end = .; _image_ram_end = .;

12
include/arch/x86/linker.ld
View file

@ -132,10 +132,6 @@ SECTIONS
#endif #endif
#endif #endif
#ifdef CONFIG_SOC_RODATA_LD
#include <soc-rodata.ld>
#endif
#ifdef CONFIG_CUSTOM_RODATA_LD #ifdef CONFIG_CUSTOM_RODATA_LD
/* Located in project source directory */ /* Located in project source directory */
#include <custom-rodata.ld> #include <custom-rodata.ld>
@ -248,10 +244,6 @@ SECTIONS
KERNEL_INPUT_SECTION(".noinit.*") KERNEL_INPUT_SECTION(".noinit.*")
*(".kernel_noinit.*") *(".kernel_noinit.*")
#ifdef CONFIG_SOC_NOINIT_LD
#include <soc-noinit.ld>
#endif
MMU_PAGE_ALIGN MMU_PAGE_ALIGN
} GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION) } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
@ -265,10 +257,6 @@ SECTIONS
KERNEL_INPUT_SECTION(".data.*") KERNEL_INPUT_SECTION(".data.*")
*(".kernel.*") *(".kernel.*")
#ifdef CONFIG_SOC_RWDATA_LD
#include <soc-rwdata.ld>
#endif
#ifdef CONFIG_CUSTOM_RWDATA_LD #ifdef CONFIG_CUSTOM_RWDATA_LD
/* Located in project source directory */ /* Located in project source directory */
#include <custom-rwdata.ld> #include <custom-rwdata.ld>

36
soc/Kconfig
View file

@ -16,39 +16,3 @@ module-str = SOC
source "subsys/logging/Kconfig.template.log_config" source "subsys/logging/Kconfig.template.log_config"
endmenu 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/.