cmake: move the BOARD variable watch below deprecated board handling (41e283c2) · Commits · Wenxi XU / zephyr

Fixes: #33138 Board alias and deprecated board handling is setting the BOARD variable after zephyr_boilerplate_watch(BOARD) has been executed. This results in the board changed warning. This commit moves the zephyr_boilerplate_watch(BOARD) code below the board alias and deprecation handling. Signed-off-by:

Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>

cmake/app/boilerplate.cmake

+2 −2

Original line number	Diff line number	Diff line
		@@ -224,8 +224,6 @@ if(NOT (REVISION_SEPARATOR_INDEX EQUAL -1))
		string(SUBSTRING ${BOARD} 0 ${REVISION_SEPARATOR_INDEX} BOARD)
		endif()

		zephyr_boilerplate_watch(BOARD)

		set(BOARD_MESSAGE "Board: ${BOARD}")

		if(DEFINED ENV{ZEPHYR_BOARD_ALIASES})
		@@ -243,6 +241,8 @@ if(${BOARD}_DEPRECATED)
		message(WARNING "Deprecated BOARD=${BOARD_DEPRECATED} name specified, board automatically changed to: ${BOARD}.")
		endif()

		zephyr_boilerplate_watch(BOARD)

		foreach(root ${BOARD_ROOT})
		# Check that the board root looks reasonable.
		if(NOT IS_DIRECTORY "${root}/boards")

Admin message