From 5bebf2ae5c29d7f00ba69f5bd0c5fd4f97826ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20R=C3=B8nningstad?= Date: Wed, 20 Mar 2019 13:00:39 +0100 Subject: [PATCH] soc: Port usage of soc-*.ld to use Cmake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mark the feature as deprecated Signed-off-by: Øyvind Rønningstad --- soc/Kconfig | 3 +++ soc/arm/cypress/psoc6/CMakeLists.txt | 3 +++ soc/arm/cypress/psoc6/Kconfig.series | 2 -- soc/arm/cypress/psoc6/noinit.ld | 17 +++++++++++++++++ soc/arm/cypress/psoc6/rwdata.ld | 7 +++++++ soc/arm/cypress/psoc6/soc-noinit.ld | 19 ------------------- soc/arm/cypress/psoc6/soc-rwdata.ld | 9 --------- 7 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 soc/arm/cypress/psoc6/noinit.ld create mode 100644 soc/arm/cypress/psoc6/rwdata.ld delete mode 100644 soc/arm/cypress/psoc6/soc-noinit.ld delete mode 100644 soc/arm/cypress/psoc6/soc-rwdata.ld diff --git a/soc/Kconfig b/soc/Kconfig index 7ad402682d3..c695e2db053 100644 --- a/soc/Kconfig +++ b/soc/Kconfig @@ -40,6 +40,7 @@ if ARC || ARM || X86 || NIOS2 || RISCV32 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. @@ -50,6 +51,7 @@ config SOC_NOINIT_LD 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. @@ -60,6 +62,7 @@ config SOC_RODATA_LD 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. diff --git a/soc/arm/cypress/psoc6/CMakeLists.txt b/soc/arm/cypress/psoc6/CMakeLists.txt index 13aa3eea3c7..d2e21481a1b 100644 --- a/soc/arm/cypress/psoc6/CMakeLists.txt +++ b/soc/arm/cypress/psoc6/CMakeLists.txt @@ -8,3 +8,6 @@ zephyr_include_directories(.) zephyr_sources( soc.c ) + +zephyr_linker_sources_ifdef(CONFIG_SOC_SERIES_PSOC62 NOINIT noinit.ld) +zephyr_linker_sources_ifdef(CONFIG_SOC_SERIES_PSOC62 RWDATA rwdata.ld) diff --git a/soc/arm/cypress/psoc6/Kconfig.series b/soc/arm/cypress/psoc6/Kconfig.series index ab740b40465..e9bee5061e4 100644 --- a/soc/arm/cypress/psoc6/Kconfig.series +++ b/soc/arm/cypress/psoc6/Kconfig.series @@ -10,7 +10,5 @@ config SOC_SERIES_PSOC62 select SOC_FAMILY_PSOC6 select CPU_CORTEX_M_HAS_SYSTICK select HAS_CYPRESS_DRIVERS - select SOC_NOINIT_LD - select SOC_RWDATA_LD help Enable support for Cypress PSoC6 MCU series diff --git a/soc/arm/cypress/psoc6/noinit.ld b/soc/arm/cypress/psoc6/noinit.ld new file mode 100644 index 00000000000..c1772734f3a --- /dev/null +++ b/soc/arm/cypress/psoc6/noinit.ld @@ -0,0 +1,17 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * Extracted from: + * ext/hal/cypress/.../devices/psoc6/linker/gcc/cy8c6xx6_cm0plus.ld + * + * Size of sections are calculated in the startup scripts, + * so they don't have to be specified here. + */ + +. = ALIGN(8); +KEEP(*(.ram_vectors)) + +. = ALIGN(4); +KEEP(*(.heap)) + +. = ALIGN(4); +KEEP(*(.stack)) diff --git a/soc/arm/cypress/psoc6/rwdata.ld b/soc/arm/cypress/psoc6/rwdata.ld new file mode 100644 index 00000000000..c3d1c155492 --- /dev/null +++ b/soc/arm/cypress/psoc6/rwdata.ld @@ -0,0 +1,7 @@ + +/* + * SPDX-License-Identifier: Apache-2.0 + * Extracted from: + * ext/hal/cypress/.../devices/psoc6/linker/gcc/cy8c6xx6_cm0plus.ld + */ +KEEP(*(.cy_ramfunc)) diff --git a/soc/arm/cypress/psoc6/soc-noinit.ld b/soc/arm/cypress/psoc6/soc-noinit.ld deleted file mode 100644 index aa01a4d6f75..00000000000 --- a/soc/arm/cypress/psoc6/soc-noinit.ld +++ /dev/null @@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 */ - - /* - * SPDX-License-Identifier: Apache-2.0 - * - * Extracted from: - * ext/hal/cypress/.../devices/psoc6/linker/gcc/cy8c6xx6_cm0plus.ld - * Size of sections are calculated in the startup scripts, - * so they don't have to be specified here. - */ - - . = ALIGN(8); - KEEP(*(.ram_vectors)) - - . = ALIGN(4); - KEEP(*(.heap)) - - . = ALIGN(4); - KEEP(*(.stack)) diff --git a/soc/arm/cypress/psoc6/soc-rwdata.ld b/soc/arm/cypress/psoc6/soc-rwdata.ld deleted file mode 100644 index b971d81c7d4..00000000000 --- a/soc/arm/cypress/psoc6/soc-rwdata.ld +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 */ - - /* - * SPDX-License-Identifier: Apache-2.0 - * Extracted from: - * ext/hal/cypress/.../devices/psoc6/linker/gcc/cy8c6xx6_cm0plus.ld - */ - - KEEP(*(.cy_ramfunc))