linker: Remove deprecated Kconfig options related to linker scripts
Remove Kconfig, linker script, and related bits associated with CUSTOM_RODATA_LD, CUSTOM_RWDATA_LD, CUSTOM_SECTIONS_LD, SOC_NOINIT_LD, SOC_RODATA_LD, and SOC_RWDATA_LD options that have been deprecated since Zephyr 2.2. Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
parent
428799295d
commit
9ca541a504
13 changed files with 0 additions and 234 deletions
|
@ -376,13 +376,6 @@ if(NOT EXISTS ${LINKER_SCRIPT})
|
|||
message(FATAL_ERROR "Could not find linker script: '${LINKER_SCRIPT}'. Corrupted configuration?")
|
||||
endif()
|
||||
|
||||
# Custom section support in linker scripts requires that the application source
|
||||
# directory is in the preprocessor search path, in order to find the custom
|
||||
# linker script fragments.
|
||||
if(CONFIG_CUSTOM_RODATA_LD OR CONFIG_CUSTOM_RWDATA_LD OR CONFIG_CUSTOM_SECTIONS_LD)
|
||||
zephyr_include_directories(${APPLICATION_SOURCE_DIR})
|
||||
endif()
|
||||
|
||||
configure_file(version.h.in ${PROJECT_BINARY_DIR}/include/generated/version.h)
|
||||
|
||||
# Error-out when the deprecated naming convention is found (until
|
||||
|
|
|
@ -153,27 +153,6 @@ config CUSTOM_LINKER_SCRIPT
|
|||
linker script and avoid having to change the script provided by
|
||||
Zephyr.
|
||||
|
||||
config CUSTOM_RODATA_LD
|
||||
bool "(DEPRECATED) Include custom-rodata.ld"
|
||||
help
|
||||
Note: This is deprecated, use Cmake function zephyr_linker_sources() instead.
|
||||
Include a customized linker script fragment for inserting additional
|
||||
data and linker directives into the rodata section.
|
||||
|
||||
config CUSTOM_RWDATA_LD
|
||||
bool "(DEPRECATED) Include custom-rwdata.ld"
|
||||
help
|
||||
Note: This is deprecated, use Cmake function zephyr_linker_sources() instead.
|
||||
Include a customized linker script fragment for inserting additional
|
||||
data and linker directives into the data section.
|
||||
|
||||
config CUSTOM_SECTIONS_LD
|
||||
bool "(DEPRECATED) Include custom-sections.ld"
|
||||
help
|
||||
Note: This is deprecated, use Cmake function zephyr_linker_sources() instead.
|
||||
Include a customized linker script fragment for inserting additional
|
||||
arbitrary sections.
|
||||
|
||||
config KERNEL_ENTRY
|
||||
string "Kernel entry symbol"
|
||||
default "__start"
|
||||
|
|
|
@ -116,14 +116,6 @@ SECTIONS {
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-rodata.ld>
|
||||
#ifdef CONFIG_SOC_RODATA_LD
|
||||
#include <soc-rodata.ld>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CUSTOM_RODATA_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-rodata.ld>
|
||||
#endif
|
||||
|
||||
#include <linker/kobject-rom.ld>
|
||||
|
||||
|
@ -193,9 +185,6 @@ SECTIONS {
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-noinit.ld>
|
||||
#ifdef CONFIG_SOC_NOINIT_LD
|
||||
#include <soc-noinit.ld>
|
||||
#endif
|
||||
|
||||
} GROUP_LINK_IN(RAMABLE_REGION)
|
||||
|
||||
|
@ -211,14 +200,6 @@ SECTIONS {
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-rwdata.ld>
|
||||
#ifdef CONFIG_SOC_RWDATA_LD
|
||||
#include <soc-rwdata.ld>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CUSTOM_RWDATA_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-rwdata.ld>
|
||||
#endif
|
||||
|
||||
} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
|
||||
|
||||
|
@ -241,10 +222,6 @@ SECTIONS {
|
|||
|
||||
GROUP_END(RAMABLE_REGION)
|
||||
|
||||
#ifdef CONFIG_CUSTOM_SECTIONS_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-sections.ld>
|
||||
#endif
|
||||
/* Located in generated directory. This file is populated by the
|
||||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
|
|
|
@ -185,14 +185,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-rodata.ld>
|
||||
#ifdef CONFIG_SOC_RODATA_LD
|
||||
#include <soc-rodata.ld>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CUSTOM_RODATA_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-rodata.ld>
|
||||
#endif
|
||||
|
||||
#include <linker/kobject-rom.ld>
|
||||
|
||||
|
@ -293,9 +285,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-noinit.ld>
|
||||
#ifdef CONFIG_SOC_NOINIT_LD
|
||||
#include <soc-noinit.ld>
|
||||
#endif
|
||||
|
||||
} GROUP_LINK_IN(RAMABLE_REGION)
|
||||
|
||||
|
@ -310,14 +299,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-rwdata.ld>
|
||||
#ifdef CONFIG_SOC_RWDATA_LD
|
||||
#include <soc-rwdata.ld>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CUSTOM_RWDATA_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-rwdata.ld>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CODE_DATA_RELOCATION
|
||||
#include <linker_sram_data_relocate.ld>
|
||||
|
@ -344,11 +325,6 @@ SECTIONS
|
|||
|
||||
GROUP_END(RAMABLE_REGION)
|
||||
|
||||
#ifdef CONFIG_CUSTOM_SECTIONS_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-sections.ld>
|
||||
#endif
|
||||
|
||||
/* Located in generated directory. This file is populated by the
|
||||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
|
|
|
@ -211,14 +211,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-rodata.ld>
|
||||
#ifdef CONFIG_SOC_RODATA_LD
|
||||
#include <soc-rodata.ld>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CUSTOM_RODATA_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-rodata.ld>
|
||||
#endif
|
||||
|
||||
#include <linker/kobject-rom.ld>
|
||||
|
||||
|
@ -335,9 +327,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-noinit.ld>
|
||||
#ifdef CONFIG_SOC_NOINIT_LD
|
||||
#include <soc-noinit.ld>
|
||||
#endif
|
||||
|
||||
} GROUP_LINK_IN(RAMABLE_REGION)
|
||||
|
||||
|
@ -354,14 +343,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-rwdata.ld>
|
||||
#ifdef CONFIG_SOC_RWDATA_LD
|
||||
#include <soc-rwdata.ld>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CUSTOM_RWDATA_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-rwdata.ld>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CODE_DATA_RELOCATION
|
||||
#include <linker_sram_data_relocate.ld>
|
||||
|
@ -419,9 +400,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-noinit.ld>
|
||||
#ifdef CONFIG_SOC_NOINIT_LD
|
||||
#include <soc-noinit.ld>
|
||||
#endif
|
||||
|
||||
} GROUP_LINK_IN(RAMABLE_REGION)
|
||||
#endif /* CONFIG_USERSPACE */
|
||||
|
@ -472,10 +450,6 @@ GROUP_START(DTCM)
|
|||
|
||||
GROUP_END(DTCM)
|
||||
#endif
|
||||
#ifdef CONFIG_CUSTOM_SECTIONS_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-sections.ld>
|
||||
#endif
|
||||
|
||||
/* Located in generated directory. This file is populated by the
|
||||
* zephyr_linker_sources() Cmake function.
|
||||
|
|
|
@ -181,14 +181,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-rodata.ld>
|
||||
#ifdef CONFIG_SOC_RODATA_LD
|
||||
#include <soc-rodata.ld>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CUSTOM_RODATA_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-rodata.ld>
|
||||
#endif
|
||||
|
||||
#include <linker/kobject-rom.ld>
|
||||
|
||||
|
@ -279,9 +271,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-noinit.ld>
|
||||
#ifdef CONFIG_SOC_NOINIT_LD
|
||||
#include <soc-noinit.ld>
|
||||
#endif
|
||||
|
||||
} GROUP_LINK_IN(RAMABLE_REGION)
|
||||
|
||||
|
@ -296,14 +285,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-rwdata.ld>
|
||||
#ifdef CONFIG_SOC_RWDATA_LD
|
||||
#include <soc-rwdata.ld>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CUSTOM_RWDATA_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-rwdata.ld>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CODE_DATA_RELOCATION
|
||||
#include <linker_sram_data_relocate.ld>
|
||||
|
@ -330,11 +311,6 @@ SECTIONS
|
|||
|
||||
GROUP_END(RAMABLE_REGION)
|
||||
|
||||
#ifdef CONFIG_CUSTOM_SECTIONS_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-sections.ld>
|
||||
#endif
|
||||
|
||||
/* Located in generated directory. This file is populated by the
|
||||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
|
|
|
@ -149,14 +149,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-rodata.ld>
|
||||
#ifdef CONFIG_SOC_RODATA_LD
|
||||
#include <soc-rodata.ld>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CUSTOM_RODATA_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-rodata.ld>
|
||||
#endif
|
||||
|
||||
. = ALIGN(4);
|
||||
} GROUP_LINK_IN(ROMABLE_REGION)
|
||||
|
@ -203,14 +195,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-rwdata.ld>
|
||||
#ifdef CONFIG_SOC_RWDATA_LD
|
||||
#include <soc-rwdata.ld>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CUSTOM_RWDATA_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-rwdata.ld>
|
||||
#endif
|
||||
|
||||
/* the Nios2 architecture only has 16-bit signed immediate offsets in
|
||||
* the instructions, so accessing a general address requires typically
|
||||
|
@ -270,9 +254,6 @@ SECTIONS
|
|||
*(.noinit)
|
||||
*(".noinit.*")
|
||||
|
||||
#ifdef CONFIG_SOC_NOINIT_LD
|
||||
#include <soc-noinit.ld>
|
||||
#endif
|
||||
/* Located in generated directory. This file is populated by the
|
||||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
|
@ -288,10 +269,6 @@ SECTIONS
|
|||
|
||||
GROUP_END(RAMABLE_REGION)
|
||||
|
||||
#ifdef CONFIG_CUSTOM_SECTIONS_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-sections.ld>
|
||||
#endif
|
||||
/* Located in generated directory. This file is populated by the
|
||||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
|
|
|
@ -125,9 +125,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-rodata.ld>
|
||||
#ifdef CONFIG_SOC_RODATA_LD
|
||||
#include <soc-rodata.ld>
|
||||
#endif
|
||||
|
||||
} GROUP_LINK_IN(ROMABLE_REGION)
|
||||
|
||||
|
@ -156,9 +153,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-rwdata.ld>
|
||||
#ifdef CONFIG_SOC_RWDATA_LD
|
||||
#include <soc-rwdata.ld>
|
||||
#endif
|
||||
|
||||
} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
|
||||
|
||||
|
@ -203,9 +197,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-noinit.ld>
|
||||
#ifdef CONFIG_SOC_NOINIT_LD
|
||||
#include <soc-noinit.ld>
|
||||
#endif
|
||||
|
||||
} GROUP_LINK_IN(RAMABLE_REGION)
|
||||
|
||||
|
|
|
@ -151,14 +151,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-rodata.ld>
|
||||
#ifdef CONFIG_SOC_RODATA_LD
|
||||
#include <soc-rodata.ld>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CUSTOM_RODATA_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-rodata.ld>
|
||||
#endif
|
||||
|
||||
#include <linker/kobject-rom.ld>
|
||||
} GROUP_LINK_IN(ROMABLE_REGION)
|
||||
|
@ -246,9 +238,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-noinit.ld>
|
||||
#ifdef CONFIG_SOC_NOINIT_LD
|
||||
#include <soc-noinit.ld>
|
||||
#endif
|
||||
|
||||
MMU_PAGE_ALIGN
|
||||
|
||||
|
@ -284,14 +273,6 @@ SECTIONS
|
|||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
#include <snippets-rwdata.ld>
|
||||
#ifdef CONFIG_SOC_RWDATA_LD
|
||||
#include <soc-rwdata.ld>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CUSTOM_RWDATA_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-rwdata.ld>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_X86_KPTI
|
||||
MMU_PAGE_ALIGN
|
||||
|
@ -390,10 +371,6 @@ SECTIONS
|
|||
|
||||
|
||||
|
||||
#ifdef CONFIG_CUSTOM_SECTIONS_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-sections.ld>
|
||||
#endif
|
||||
/* Located in generated directory. This file is populated by the
|
||||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
|
|
|
@ -105,10 +105,6 @@ SECTIONS
|
|||
|
||||
#include <snippets-rodata.ld>
|
||||
|
||||
#ifdef CONFIG_CUSTOM_RODATA_LD
|
||||
#include <custom-rodata.ld>
|
||||
#endif /* CONFIG_CUSTOM_RODATA_LD */
|
||||
|
||||
#ifdef CONFIG_X86_MMU
|
||||
. = ALIGN(8);
|
||||
_mmu_region_list_start = .;
|
||||
|
@ -165,18 +161,12 @@ SECTIONS
|
|||
} GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
|
||||
|
||||
#include <snippets-sections.ld>
|
||||
#ifdef CONFIG_CUSTOM_SECTIONS_LD
|
||||
#include <custom-sections.ld>
|
||||
#endif /* CONFIG_CUSTOM_SECTIONS_LD */
|
||||
|
||||
SECTION_PROLOGUE(_DATA_SECTION_NAME,,ALIGN(16))
|
||||
{
|
||||
*(.data)
|
||||
*(.data.*)
|
||||
#include <snippets-rwdata.ld>
|
||||
#ifdef CONFIG_CUSTOM_RWDATA_LD
|
||||
#include <custom-rwdata.ld>
|
||||
#endif /* CONFIG_CUSTOM_RWDATA_LD */
|
||||
} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
|
||||
|
||||
#include <snippets-ram-sections.ld>
|
||||
|
|
|
@ -33,9 +33,6 @@ TEST,n
|
|||
TEST_SHELL,n
|
||||
TEST_EXTRA_STACKSIZE,0
|
||||
TEST_USERSPACE,n
|
||||
CUSTOM_RODATA_LD,n
|
||||
CUSTOM_RWDATA_LD,n
|
||||
CUSTOM_SECTIONS_LD,n
|
||||
BUILD_OUTPUT_STRIPPED,y
|
||||
SOC_ATMEL_SAME70_DISABLE_ERASE_PIN,y
|
||||
SOC_ATMEL_SAME70_WAIT_MODE,n
|
||||
|
|
|
37
soc/Kconfig
37
soc/Kconfig
|
@ -35,43 +35,6 @@ config SOC_COMPATIBLE_NRF52832
|
|||
# SOC_*_LD: SoC specific Linker script additions
|
||||
#
|
||||
|
||||
if ARC || ARM || X86 || NIOS2 || RISCV
|
||||
|
||||
config SOC_NOINIT_LD
|
||||
bool
|
||||
help
|
||||
Note: This is deprecated, use Cmake function zephyr_linker_sources() instead.
|
||||
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
|
||||
help
|
||||
Note: This is deprecated, use Cmake function zephyr_linker_sources() instead.
|
||||
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
|
||||
help
|
||||
Note: This is deprecated, use Cmake function zephyr_linker_sources() instead.
|
||||
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/.
|
||||
|
||||
endif # ARC || ARM || X86 || NIOS2 || RISCV
|
||||
|
||||
config SOC_DEPRECATED_RELEASE
|
||||
string
|
||||
help
|
||||
|
|
|
@ -228,10 +228,6 @@ SECTIONS
|
|||
|
||||
GROUP_END(RAM)
|
||||
|
||||
#ifdef CONFIG_CUSTOM_SECTIONS_LD
|
||||
/* Located in project source directory */
|
||||
#include <custom-sections.ld>
|
||||
#endif
|
||||
/* Located in generated directory. This file is populated by the
|
||||
* zephyr_linker_sources() Cmake function.
|
||||
*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue