michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: Fixup shield overlay and conf file search locations

Browse source 
* Fix dir name when shield name doesn't match the dir name.  So for
  shield 'x_nucleo_iks01a3_shub' we will look in now for
  x_nucleo_iks01a3/boards/<BOARD>.{overlay,conf} instead of
  x_nucleo_iks01a3_shub/boards/<BOARD>.{overlay,conf}

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2019-09-11 12:10:19 -05:00 • committed by Kumar Gala
commit b170d829f8
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cmake/app/boilerplate.cmake
View file

@ -298,6 +298,7 @@ foreach(root ${BOARD_ROOT})
list(FIND SHIELD_LIST ${s} _idx)
if (NOT _idx EQUAL -1)
list(GET shields_refs_list ${_idx} s_path)
get_filename_component(s_dir ${s_path} DIRECTORY)
# if shield config flag is on, add shield overlay to the shield overlays
# list and dts_fixup file to the shield fixup file
@ -307,33 +308,33 @@ foreach(root ${BOARD_ROOT})
)
list(APPEND
shield_dts_fixups
${shield_dir}/${s}/dts_fixup.h
${shield_dir}/${s_dir}/dts_fixup.h
)
# search for shield/boards/board.overlay file
if(EXISTS ${shield_dir}/${s}/boards/${BOARD}.overlay)
if(EXISTS ${shield_dir}/${s_dir}/boards/${BOARD}.overlay)
# add shield/board overlay to the shield overlays list
list(APPEND
shield_dts_files
${shield_dir}/${s}/boards/${BOARD}.overlay
${shield_dir}/${s_dir}/boards/${BOARD}.overlay
)
endif()
# search for shield/shield.conf file
if(EXISTS ${shield_dir}/${s}/${s}.conf)
if(EXISTS ${shield_dir}/${s_dir}/${s}.conf)
# add shield.conf to the shield config list
list(APPEND
shield_conf_files
${shield_dir}/${s}/${s}.conf
${shield_dir}/${s_dir}/${s}.conf
)
endif()
# search for shield/boards/board.conf file
if(EXISTS ${shield_dir}/${s}/boards/${BOARD}.conf)
if(EXISTS ${shield_dir}/${s_dir}/boards/${BOARD}.conf)
# add HW specific board.conf to the shield config list
list(APPEND
shield_conf_files
${shield_dir}/${s}/boards/${BOARD}.conf
${shield_dir}/${s_dir}/boards/${BOARD}.conf
)
endif()
else()