CMakeLists.txt: Match variants by canonical board name

Uses the HWMv2 canonical board name to determine paths under variants.

Signed-off-by: TOKITA Hiroshi <[email protected]>

Author: soburi

CMakeLists.txt

@@ -1,11 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
-if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/variants/${BOARD})
-  set(variant_dir variants/${BOARD})
-elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/variants/${BOARD}${NORMALIZED_BOARD_QUALIFIERS})
+if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/variants/${BOARD}${NORMALIZED_BOARD_QUALIFIERS})
   set(variant_dir variants/${BOARD}${NORMALIZED_BOARD_QUALIFIERS})
 else()
-  message(FATAL_ERROR "Variant dir not found: variants/${BOARD}, variants/${BOARD}${NORMALIZED_BOARD_QUALIFIERS}")
+  message(FATAL_ERROR "Variant dir not found: variants/${BOARD}${NORMALIZED_BOARD_QUALIFIERS}")
 endif()
 
 if (CONFIG_ARDUINO_API)