Commit 438c9545 authored by Grzegorz Swiderski's avatar Grzegorz Swiderski Committed by Fabio Baltieri
Browse files

cmake: Fix doubling FILE_SUFFIX on boards/*.overlay files 

When building with `-DBOARD=plank -DFILE_SUFFIX=foo`, the build system
could set `DTC_OVERLAY_FILE` to one of:

  - boards/plank_foo_foo.overlay
  - boards/plank_foo.overlay
  - boards/plank.overlay

The first choice is a bug, as the suffix should only be applied once.

Signed-off-by: default avatarGrzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
parent 592f434d

cmake/modules/configuration_files.cmake

+9 −3
Changes for cmake/modules/configuration_files.cmake: 9 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -73,9 +73,15 @@ To change CONF_FILE, use the CONF_FILE variable." ${CONF_FILE_FORCE_CACHE}) 
# The CONF_FILE variable is now set to its final value.

zephyr_boilerplate_watch(CONF_FILE)



zephyr_file(CONF_FILES ${APPLICATION_CONFIG_DIR}/boards DTS APP_BOARD_DTS SUFFIX ${FILE_SUFFIX})



zephyr_get(DTC_OVERLAY_FILE SYSBUILD LOCAL)



# If DTC_OVERLAY_FILE is not set by the user, look for board-specific overlays

# in the 'boards' configuration subdirectory.

if(NOT DEFINED DTC_OVERLAY_FILE)

  zephyr_file(CONF_FILES ${APPLICATION_CONFIG_DIR}/boards DTS DTC_OVERLAY_FILE SUFFIX ${FILE_SUFFIX})

endif()



# If still not found, search for other overlays in the configuration directory.

if(NOT DEFINED DTC_OVERLAY_FILE)

  zephyr_build_string(board_overlay_strings

                      BOARD ${BOARD}
@@ -85,7 +91,7 @@ if(NOT DEFINED DTC_OVERLAY_FILE) 
  list(TRANSFORM board_overlay_strings APPEND ".overlay")



  zephyr_file(CONF_FILES ${APPLICATION_CONFIG_DIR} DTS DTC_OVERLAY_FILE

              NAMES "${APP_BOARD_DTS};${board_overlay_strings};app.overlay" SUFFIX ${FILE_SUFFIX})

              NAMES "${board_overlay_strings};app.overlay" SUFFIX ${FILE_SUFFIX})

endif()



set(DTC_OVERLAY_FILE ${DTC_OVERLAY_FILE} CACHE STRING "If desired, you can \

CRA Git | Maintained and supported by SUSTech CRA and CCSE