michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: zephyr_linker_dts_memory no name param

Browse source 
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 <jordan.yates@data61.csiro.au>
This commit is contained in:
Jordan Yates 2021-12-09 21:48:40 +10:00 • committed by Carles Cufí
commit 6da04c965f
2 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cmake/extensions.cmake
View file

@ -3316,9 +3316,9 @@ macro(zephyr_linker_memory_ifdef feature_toggle)
endmacro()
# Usage:
# zephyr_linker_dts_memory(NAME <name> PATH <path> FLAGS <flags>)
# zephyr_linker_dts_memory(NAME <name> NODELABEL <nodelabel> FLAGS <flags>)
# zephyr_linker_dts_memory(NAME <name> CHOSEN <prop> FLAGS <flags>)
# zephyr_linker_dts_memory(PATH <path> FLAGS <flags>)
# zephyr_linker_dts_memory(NODELABEL <nodelabel> FLAGS <flags>)
# zephyr_linker_dts_memory(CHOSEN <prop> FLAGS <flags>)
#
# Zephyr linker devicetree memory.
# This function specifies a memory region for the platform in use based on its
@ -3329,7 +3329,6 @@ endmacro()
#
# Only one of PATH, NODELABEL, and CHOSEN parameters may be given.
#
# NAME <name> : Name of the memory region, for example FLASH.
# PATH <path> : Devicetree node identifier.
# NODELABEL <label>: Node label
# CHOSEN <prop> : Chosen property, add memory section described by the
@ -3342,7 +3341,7 @@ endmacro()
# The flags r and x, or w and x may be combined like: rx, wx.
#
function(zephyr_linker_dts_memory)
set(single_args "CHOSEN;FLAGS;NAME;PATH;NODELABEL")
set(single_args "CHOSEN;FLAGS;PATH;NODELABEL")
cmake_parse_arguments(DTS_MEMORY "" "${single_args}" "" ${ARGN})
if(DTS_MEMORY_UNPARSED_ARGUMENTS)

20
cmake/linker_script/arm/linker.cmake
View file

@ -35,19 +35,19 @@ zephyr_linker_memory(NAME RAM FLAGS wx START ${RAM_ADDR} SIZE ${RAM_SIZE}
zephyr_linker_memory(NAME IDT_LIST FLAGS wx START ${IDT_ADDR} SIZE 2K)
# TI CCFG Registers
zephyr_linker_dts_memory(NAME FLASH_CCFG FLAGS rwx NODELABEL ti_ccfg_partition)
zephyr_linker_dts_memory(NODELABEL ti_ccfg_partition FLAGS rwx)
# Data & Instruction Tightly Coupled Memory
zephyr_linker_dts_memory(NAME ITCM FLAGS rw CHOSEN "zephyr,itcm")
zephyr_linker_dts_memory(NAME DTCM FLAGS rw CHOSEN "zephyr,dtcm")
zephyr_linker_dts_memory(CHOSEN "zephyr,itcm" FLAGS rw)
zephyr_linker_dts_memory(CHOSEN "zephyr,dtcm" FLAGS rw)
zephyr_linker_dts_memory(NAME SRAM1 FLAGS rw NODELABEL sram1)
zephyr_linker_dts_memory(NAME SRAM2 FLAGS rw NODELABEL sram2)
zephyr_linker_dts_memory(NAME SRAM3 FLAGS rw NODELABEL sram3)
zephyr_linker_dts_memory(NAME SRAM4 FLAGS rw NODELABEL sram4)
zephyr_linker_dts_memory(NAME SDRAM1 FLAGS rw NODELABEL sdram1)
zephyr_linker_dts_memory(NAME SDRAM2 FLAGS rw NODELABEL sdram2)
zephyr_linker_dts_memory(NAME BACKUP_SRAM FLAGS rw NODELABEL backup_sram)
zephyr_linker_dts_memory(NODELABEL sram1 FLAGS rw)
zephyr_linker_dts_memory(NODELABEL sram2 FLAGS rw)
zephyr_linker_dts_memory(NODELABEL sram3 FLAGS rw)
zephyr_linker_dts_memory(NODELABEL sram4 FLAGS rw)
zephyr_linker_dts_memory(NODELABEL sdram1 FLAGS rw)
zephyr_linker_dts_memory(NODELABEL sdram2 FLAGS rw)
zephyr_linker_dts_memory(NODELABEL backup_sram FLAGS rw)
if(CONFIG_XIP)
zephyr_linker_group(NAME ROM_REGION LMA FLASH)