michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: Misc. cleanups of how BOARD_ROOT and BOARD_DIR are used

Browse source 
Misc. refactorings that clean up how BOARD_ROOT and BOARD_DIR are
used.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
This commit is contained in:
Sebastian Bøe 2018-09-27 17:15:24 +02:00 • committed by Anas Nashif
commit fd8022ae16
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
boards/CMakeLists.txt
View file

@ -3,8 +3,10 @@
if(EXISTS ${BOARD_DIR}/CMakeLists.txt) if(EXISTS ${BOARD_DIR}/CMakeLists.txt)
if(BOARD_ROOT) if(BOARD_ROOT)
add_subdirectory(${BOARD_DIR} boards/${ARCH}/${BOARD}) set(build_dir boards/${ARCH}/${BOARD})
else() else()
add_subdirectory(${BOARD_DIR}) unset(build_dir)
endif() endif()
add_subdirectory(${BOARD_DIR} ${build_dir})
endif() endif()

4
cmake/app/boilerplate.cmake
View file

@ -207,8 +207,8 @@ find_path(BOARD_DIR NAMES "${BOARD}_defconfig" PATHS ${BOARD_ROOT}/boards/*/* NO
assert_with_usage(BOARD_DIR "No board named '${BOARD}' found") assert_with_usage(BOARD_DIR "No board named '${BOARD}' found")
get_filename_component(BOARD_ARCH_DIR ${BOARD_DIR} DIRECTORY) get_filename_component(BOARD_ARCH_DIR ${BOARD_DIR} DIRECTORY)
get_filename_component(ARCH ${BOARD_ARCH_DIR} NAME) get_filename_component(BOARD_FAMILY ${BOARD_DIR} NAME )
get_filename_component(BOARD_FAMILY ${BOARD_DIR} NAME) get_filename_component(ARCH ${BOARD_ARCH_DIR} NAME)
if(CONF_FILE) if(CONF_FILE)
# CONF_FILE has either been specified on the cmake CLI or is already # CONF_FILE has either been specified on the cmake CLI or is already

4
cmake/dts.cmake
View file

@ -10,7 +10,7 @@
# See ~/zephyr/doc/dts # See ~/zephyr/doc/dts
set(GENERATED_DTS_BOARD_H ${PROJECT_BINARY_DIR}/include/generated/generated_dts_board.h) set(GENERATED_DTS_BOARD_H ${PROJECT_BINARY_DIR}/include/generated/generated_dts_board.h)
set(GENERATED_DTS_BOARD_CONF ${PROJECT_BINARY_DIR}/include/generated/generated_dts_board.conf) set(GENERATED_DTS_BOARD_CONF ${PROJECT_BINARY_DIR}/include/generated/generated_dts_board.conf)
set_ifndef(DTS_SOURCE ${BOARD_ROOT}/boards/${ARCH}/${BOARD_FAMILY}/${BOARD}.dts) set_ifndef(DTS_SOURCE ${BOARD_DIR}/${BOARD}.dts)
set_ifndef(DTS_COMMON_OVERLAYS ${ZEPHYR_BASE}/dts/common/common.dts) set_ifndef(DTS_COMMON_OVERLAYS ${ZEPHYR_BASE}/dts/common/common.dts)
set_ifndef(DTS_APP_BINDINGS ${APPLICATION_SOURCE_DIR}/dts/bindings) set_ifndef(DTS_APP_BINDINGS ${APPLICATION_SOURCE_DIR}/dts/bindings)
@ -121,7 +121,7 @@ if(CONFIG_HAS_DTS)
# Run extract_dts_includes.py for the header file # Run extract_dts_includes.py for the header file
# generated_dts_board.h # generated_dts_board.h
set_ifndef(DTS_BOARD_FIXUP_FILE ${BOARD_ROOT}/boards/${ARCH}/${BOARD_FAMILY}/dts.fixup) set_ifndef(DTS_BOARD_FIXUP_FILE ${BOARD_DIR}/dts.fixup)
set_ifndef(DTS_SOC_FIXUP_FILE ${PROJECT_SOURCE_DIR}/soc/${ARCH}/${SOC_PATH}/dts.fixup) set_ifndef(DTS_SOC_FIXUP_FILE ${PROJECT_SOURCE_DIR}/soc/${ARCH}/${SOC_PATH}/dts.fixup)
list(APPEND dts_fixups list(APPEND dts_fixups