michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: Fix how usage finds board names

Browse source 
We had been search for <BOARD>.yaml, however its possible that doesn't
match anything and we actually use <BOARD>_defconfig in
boilerplate.cmake.  So search for *_defconfig instead of *.yaml to
generate the <BOARD> list.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2019-01-30 04:13:59 -06:00 • committed by Kumar Gala
commit e11314a21f
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cmake/usage/usage.cmake
View file

@ -20,21 +20,21 @@ foreach(arch ${arch_list})
foreach(root ${BOARD_ROOT}) foreach(root ${BOARD_ROOT})
set(board_arch_dir ${root}/boards/${arch}) set(board_arch_dir ${root}/boards/${arch})
# Match the .yaml files in the board directories to make sure we are # Match the _defconfig files in the board directories to make sure we are
# finding boards, e.g. qemu_xtensa/qemu_xtensa.yaml # finding boards, e.g. qemu_xtensa/qemu_xtensa_defconfig
file(GLOB_RECURSE yamls_for_${arch} file(GLOB_RECURSE defconfigs_for_${arch}
RELATIVE ${board_arch_dir} RELATIVE ${board_arch_dir}
${board_arch_dir}/*.yaml ${board_arch_dir}/*_defconfig
) )
# The above gives a list like # The above gives a list like
# nrf51_blenano/nrf51_blenano_yaml;nrf51_pca10028/nrf51_pca10028_yaml # nrf51_blenano/nrf51_blenano_defconfig;nrf51_pca10028/nrf51_pca10028_defconfig
# we construct a list of board names by removing both the .yaml # we construct a list of board names by removing both the _defconfig
# suffix and the path. # suffix and the path.
set(boards_for_${arch} "") set(boards_for_${arch} "")
foreach(yaml_path ${yamls_for_${arch}}) foreach(defconfig_path ${defconfigs_for_${arch}})
get_filename_component(board ${yaml_path} NAME_WE) get_filename_component(board ${defconfig_path} NAME)
string(REPLACE "_defconfig" "" board "${board}")
list(APPEND boards_for_${arch} ${board}) list(APPEND boards_for_${arch} ${board})
endforeach() endforeach()
endforeach() endforeach()