Skip to content

boot: zephyr: cmake: handle devicetree compatible properties as lists #2656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
henrikbrixandersen wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −3
Open

boot: zephyr: cmake: handle devicetree compatible properties as lists #2656

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions boot/zephyr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ function(dt_get_erase_write_block_sizes node erase_block_size write_block_size)
set(current_compatible)
dt_prop(current_compatible PATH "${current_path}" PROPERTY "compatible")

if("${current_compatible}" STREQUAL "soc-nv-flash")
if("soc-nv-flash" IN_LIST current_compatible)
dt_prop(erase_size PATH "${current_path}" PROPERTY "erase-block-size")
dt_prop(write_size PATH "${current_path}" PROPERTY "write-block-size")
set(${erase_block_size} ${erase_size} PARENT_SCOPE)
Expand All @@ -461,10 +461,10 @@ function(dt_get_nvm_device node nvm_device)
set(current_compatible)
dt_prop(current_compatible PATH "${current_path}" PROPERTY "compatible")

if("${current_compatible}" STREQUAL "soc-nv-flash")
if("soc-nv-flash" IN_LIST current_compatible)
set(${nvm_device} ${current_path} PARENT_SCOPE)
break()
elseif("${current_compatible}" STREQUAL "fixed-partitions")
elseif("fixed-partitions" IN_LIST current_compatible)
string(FIND "${current_path}" "/" node_final_slash REVERSE)
string(SUBSTRING "${current_path}" 0 ${node_final_slash} current_path)
set(${nvm_device} ${current_path} PARENT_SCOPE)
Expand Down
Loading