cmake: Remove HWMv1 checks

Removes checks for HWMv1 as the code for HWMv1 was removed from
Zephyr some time ago and these checks are not needed

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

Author: nordicjm

boards/common/openocd-nrf5.board.cmake

@@ -9,7 +9,7 @@
 if(NOT DEFINED OPENOCD_NRF5_SUBFAMILY)
   string(REGEX MATCH nrf5. OPENOCD_NRF5_SUBFAMILY "${BOARD}")
 
-  if(HWMv2 AND "${OPENOCD_NRF5_SUBFAMILY}" STREQUAL "")
+  if("${OPENOCD_NRF5_SUBFAMILY}" STREQUAL "")
     string(REGEX MATCH nrf5. OPENOCD_NRF5_SUBFAMILY "${BOARD_QUALIFIERS}")
   endif()
 endif()

cmake/modules/arch.cmake

@@ -25,24 +25,22 @@
 
 include_guard(GLOBAL)
 
-if(HWMv2)
-  # HWMv2 obtains arch from Kconfig for the given Board / SoC variant because
-  # the Board / SoC path is no longer sufficient for determine the arch
-  # (read: multi-core and multi-arch SoC).
-  set(ARCH ${CONFIG_ARCH})
-  string(TOUPPER "${ARCH}" arch_upper)
+# HWMv2 obtains arch from Kconfig for the given Board / SoC variant because
+# the Board / SoC path is no longer sufficient for determine the arch
+# (read: multi-core and multi-arch SoC).
+set(ARCH ${CONFIG_ARCH})
+string(TOUPPER "${ARCH}" arch_upper)
 
-  if(NOT ARCH)
-    message(FATAL_ERROR "ARCH not defined. Check that BOARD=${BOARD}, is selecting "
-            "an appropriate SoC in Kconfig, SoC=${CONFIG_SOC}, and that the SoC "
-            "is selecting the correct architecture."
-    )
-  endif()
+if(NOT ARCH)
+  message(FATAL_ERROR "ARCH not defined. Check that BOARD=${BOARD}, is selecting "
+          "an appropriate SoC in Kconfig, SoC=${CONFIG_SOC}, and that the SoC "
+          "is selecting the correct architecture."
+  )
+endif()
 
-  cmake_path(GET ARCH_V2_${arch_upper}_DIR PARENT_PATH ARCH_DIR)
-  if(NOT ARCH_DIR)
-    message(FATAL_ERROR "Could not find ARCH=${ARCH} for BOARD=${BOARD}, \
+cmake_path(GET ARCH_V2_${arch_upper}_DIR PARENT_PATH ARCH_DIR)
+if(NOT ARCH_DIR)
+  message(FATAL_ERROR "Could not find ARCH=${ARCH} for BOARD=${BOARD}, \
 please check your installation. ARCH roots searched: \n\
 ${ARCH_ROOT}")
-  endif()
 endif()

cmake/modules/boards.cmake

@@ -141,7 +141,7 @@ Hints:
   endif()
 endforeach()
 
-if(HWMv2 AND NOT EXISTS ${BOARD_DIR}/board.yml)
+if(NOT EXISTS ${BOARD_DIR}/board.yml)
   message(WARNING "BOARD_DIR: ${BOARD_DIR} has been moved or deleted. "
                   "Trying to find new location."
   )
@@ -180,7 +180,7 @@ if(NOT BOARD_DIR)
   endif()
 endif()
 
-set(format_str "{NAME}\;{DIR}\;{HWM}\;")
+set(format_str "{NAME}\;{DIR}\;")
 set(format_str "${format_str}{REVISION_FORMAT}\;{REVISION_DEFAULT}\;{REVISION_EXACT}\;")
 set(format_str "${format_str}{REVISIONS}\;{SOCS}\;{QUALIFIERS}")
 
@@ -197,7 +197,7 @@ endif()
 
 if(NOT "${ret_board}" STREQUAL "")
   string(STRIP "${ret_board}" ret_board)
-  set(single_val "NAME;HWM;REVISION_FORMAT;REVISION_DEFAULT;REVISION_EXACT")
+  set(single_val "NAME;REVISION_FORMAT;REVISION_DEFAULT;REVISION_EXACT")
   set(multi_val  "DIR;REVISIONS;SOCS;QUALIFIERS")
   cmake_parse_arguments(LIST_BOARD "" "${single_val}" "${multi_val}" ${ret_board})
   list(GET LIST_BOARD_DIR 0 BOARD_DIR)
@@ -210,12 +210,12 @@ if(NOT "${ret_board}" STREQUAL "")
   # Create two CMake variables identifying the hw model.
   # CMake variable: HWM=v2
   # CMake variable: HWMv2=True
-  set(HWM       ${LIST_BOARD_HWM} CACHE INTERNAL "Zephyr hardware model version")
-  set(HWM${HWM} True   CACHE INTERNAL "Zephyr hardware model")
+  set(HWM v2 CACHE INTERNAL "Zephyr hardware model version")
+  set(HWMv2 True CACHE INTERNAL "Zephyr hardware model")
 elseif(BOARD_DIR)
   message(FATAL_ERROR "Error finding board: ${BOARD} in ${BOARD_DIR}.\n"
           "This indicates the board has been removed, renamed, or placed at a new location.\n"
-	  "Please run a pristine build."
+          "Please run a pristine build."
   )
 else()
   message("No board named '${BOARD}' found. Did you mean:\n")

cmake/modules/hwm_v2.cmake

@@ -19,10 +19,6 @@
 
 include_guard(GLOBAL)
 
-if(NOT HWMv2)
-  return()
-endif()
-
 # Internal helper function for creation of Kconfig files.
 function(kconfig_gen bin_dir file dirs comment)
   set(kconfig_header "# Load ${comment} descriptions.\n")
@@ -47,7 +43,7 @@ list(TRANSFORM SOC_ROOT PREPEND "--soc-root=" OUTPUT_VARIABLE soc_root_args)
 execute_process(COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/list_hardware.py
                 ${arch_root_args} ${soc_root_args}
                 --archs --socs
-                --cmakeformat={TYPE}\;{NAME}\;{DIR}\;{HWM}
+                --cmakeformat={TYPE}\;{NAME}\;{DIR}
                 OUTPUT_VARIABLE ret_hw
                 ERROR_VARIABLE err_hw
                 RESULT_VARIABLE ret_val
@@ -73,7 +69,7 @@ while(TRUE)
     string(TOUPPER "${ARCH_V2_NAME}" ARCH_V2_NAME_UPPER)
     set(ARCH_V2_${ARCH_V2_NAME_UPPER}_DIR ${ARCH_V2_DIR})
   elseif(HWM_TYPE MATCHES "^soc|^series|^family")
-    cmake_parse_arguments(SOC_V2 "" "NAME;HWM" "DIR" ${line})
+    cmake_parse_arguments(SOC_V2 "" "NAME" "DIR" ${line})
 
     list(APPEND kconfig_soc_source_dir "${SOC_V2_DIR}")
     string(TOUPPER "${SOC_V2_NAME}" SOC_V2_NAME_UPPER)
@@ -112,6 +108,5 @@ kconfig_gen("boards" "Kconfig.sysbuild"  "${BOARD_DIRECTORIES}"       "Sysbuild
 # Clear variables created by cmake_parse_arguments
 unset(SOC_V2_NAME)
 unset(SOC_V2_DIR)
-unset(SOC_V2_HWM)
 unset(ARCH_V2_NAME)
 unset(ARCH_V2_DIR)

cmake/modules/soc.cmake

@@ -21,17 +21,15 @@ include_guard(GLOBAL)
 
 include(kconfig)
 
-if(HWMv2)
-  set(SOC_NAME   ${CONFIG_SOC})
-  set(SOC_SERIES ${CONFIG_SOC_SERIES})
-  set(SOC_TOOLCHAIN_NAME ${CONFIG_SOC_TOOLCHAIN_NAME})
-  set(SOC_FAMILY ${CONFIG_SOC_FAMILY})
-  set(SOC_V2_DIR ${SOC_${SOC_NAME}_DIR})
-  set(SOC_FULL_DIR ${SOC_V2_DIR} CACHE PATH "Path to the SoC directory." FORCE)
-  set(SOC_DIRECTORIES ${SOC_${SOC_NAME}_DIRECTORIES} CACHE INTERNAL
-      "List of SoC directories for SoC (${SOC_NAME})" FORCE
-  )
-  foreach(dir ${SOC_DIRECTORIES})
-    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${dir}/soc.yml)
-  endforeach()
-endif()
+set(SOC_NAME   ${CONFIG_SOC})
+set(SOC_SERIES ${CONFIG_SOC_SERIES})
+set(SOC_TOOLCHAIN_NAME ${CONFIG_SOC_TOOLCHAIN_NAME})
+set(SOC_FAMILY ${CONFIG_SOC_FAMILY})
+set(SOC_V2_DIR ${SOC_${SOC_NAME}_DIR})
+set(SOC_FULL_DIR ${SOC_V2_DIR} CACHE PATH "Path to the SoC directory." FORCE)
+set(SOC_DIRECTORIES ${SOC_${SOC_NAME}_DIRECTORIES} CACHE INTERNAL
+    "List of SoC directories for SoC (${SOC_NAME})" FORCE
+)
+foreach(dir ${SOC_DIRECTORIES})
+  set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${dir}/soc.yml)
+endforeach()