Skip to content

Commit 6da04c9

Browse files
Jordan Yatescarlescufi
authored andcommitted
cmake: zephyr_linker_dts_memory no name param
Remove the `NAME` function argument from `zephyr_linker_dts_memory` as the name is now automatically derived from the devicetree node. Signed-off-by: Jordan Yates <[email protected]>
1 parent 0d185f0 commit 6da04c9

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

cmake/extensions.cmake

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3316,9 +3316,9 @@ macro(zephyr_linker_memory_ifdef feature_toggle)
33163316
endmacro()
33173317

33183318
# Usage:
3319-
# zephyr_linker_dts_memory(NAME <name> PATH <path> FLAGS <flags>)
3320-
# zephyr_linker_dts_memory(NAME <name> NODELABEL <nodelabel> FLAGS <flags>)
3321-
# zephyr_linker_dts_memory(NAME <name> CHOSEN <prop> FLAGS <flags>)
3319+
# zephyr_linker_dts_memory(PATH <path> FLAGS <flags>)
3320+
# zephyr_linker_dts_memory(NODELABEL <nodelabel> FLAGS <flags>)
3321+
# zephyr_linker_dts_memory(CHOSEN <prop> FLAGS <flags>)
33223322
#
33233323
# Zephyr linker devicetree memory.
33243324
# This function specifies a memory region for the platform in use based on its
@@ -3329,7 +3329,6 @@ endmacro()
33293329
#
33303330
# Only one of PATH, NODELABEL, and CHOSEN parameters may be given.
33313331
#
3332-
# NAME <name> : Name of the memory region, for example FLASH.
33333332
# PATH <path> : Devicetree node identifier.
33343333
# NODELABEL <label>: Node label
33353334
# CHOSEN <prop> : Chosen property, add memory section described by the
@@ -3342,7 +3341,7 @@ endmacro()
33423341
# The flags r and x, or w and x may be combined like: rx, wx.
33433342
#
33443343
function(zephyr_linker_dts_memory)
3345-
set(single_args "CHOSEN;FLAGS;NAME;PATH;NODELABEL")
3344+
set(single_args "CHOSEN;FLAGS;PATH;NODELABEL")
33463345
cmake_parse_arguments(DTS_MEMORY "" "${single_args}" "" ${ARGN})
33473346

33483347
if(DTS_MEMORY_UNPARSED_ARGUMENTS)

cmake/linker_script/arm/linker.cmake

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ zephyr_linker_memory(NAME RAM FLAGS wx START ${RAM_ADDR} SIZE ${RAM_SIZE}
3535
zephyr_linker_memory(NAME IDT_LIST FLAGS wx START ${IDT_ADDR} SIZE 2K)
3636

3737
# TI CCFG Registers
38-
zephyr_linker_dts_memory(NAME FLASH_CCFG FLAGS rwx NODELABEL ti_ccfg_partition)
38+
zephyr_linker_dts_memory(NODELABEL ti_ccfg_partition FLAGS rwx)
3939

4040
# Data & Instruction Tightly Coupled Memory
41-
zephyr_linker_dts_memory(NAME ITCM FLAGS rw CHOSEN "zephyr,itcm")
42-
zephyr_linker_dts_memory(NAME DTCM FLAGS rw CHOSEN "zephyr,dtcm")
43-
44-
zephyr_linker_dts_memory(NAME SRAM1 FLAGS rw NODELABEL sram1)
45-
zephyr_linker_dts_memory(NAME SRAM2 FLAGS rw NODELABEL sram2)
46-
zephyr_linker_dts_memory(NAME SRAM3 FLAGS rw NODELABEL sram3)
47-
zephyr_linker_dts_memory(NAME SRAM4 FLAGS rw NODELABEL sram4)
48-
zephyr_linker_dts_memory(NAME SDRAM1 FLAGS rw NODELABEL sdram1)
49-
zephyr_linker_dts_memory(NAME SDRAM2 FLAGS rw NODELABEL sdram2)
50-
zephyr_linker_dts_memory(NAME BACKUP_SRAM FLAGS rw NODELABEL backup_sram)
41+
zephyr_linker_dts_memory(CHOSEN "zephyr,itcm" FLAGS rw)
42+
zephyr_linker_dts_memory(CHOSEN "zephyr,dtcm" FLAGS rw)
43+
44+
zephyr_linker_dts_memory(NODELABEL sram1 FLAGS rw)
45+
zephyr_linker_dts_memory(NODELABEL sram2 FLAGS rw)
46+
zephyr_linker_dts_memory(NODELABEL sram3 FLAGS rw)
47+
zephyr_linker_dts_memory(NODELABEL sram4 FLAGS rw)
48+
zephyr_linker_dts_memory(NODELABEL sdram1 FLAGS rw)
49+
zephyr_linker_dts_memory(NODELABEL sdram2 FLAGS rw)
50+
zephyr_linker_dts_memory(NODELABEL backup_sram FLAGS rw)
5151

5252
if(CONFIG_XIP)
5353
zephyr_linker_group(NAME ROM_REGION LMA FLASH)

0 commit comments

Comments
 (0)