infrastructure: Remove hwmv1 support

Removes support for the deprecated hardware model version 1

Signed-off-by: Jamie McCrae <[email protected]>

Author: nordicjm

arch/Kconfig

@@ -8,7 +8,7 @@
 # Include these first so that any properties (e.g. defaults) below can be
 # overridden (by defining symbols in multiple locations)
 
-source "$(ARCH_DIR)/Kconfig.$(HWM_SCHEME)"
+source "$(KCONFIG_BINARY_DIR)/arch/Kconfig"
 
 # ToDo: Generate a Kconfig.arch for loading of additional arch in HWMv2.
 osource "$(KCONFIG_BINARY_DIR)/Kconfig.arch"

arch/Kconfig.v1

@@ -2,8 +2,7 @@
 
 config BOARD
 	string
-	# When using hw model v2, then the board is inherited from CMake.
-	default "$(BOARD)" if "$(HWM_SCHEME)" = "v2"
+	default "$(BOARD)"
 	help
 	  This option holds the name of the board and is used to locate the files
 	  related to the board in the source tree (under boards/).
@@ -53,7 +52,7 @@ config NET_DRIVERS
 	  When building for a qemu target then NET_DRIVERS will be default
 	  enabled to allow for easy use of SLIP or PPP
 
-rsource "Kconfig.$(HWM_SCHEME)"
+rsource "Kconfig.v2"
 
 # Parse shields references
 # Don't do it as a menuconfig, as shield selection is a CMake feature.

arch/Kconfig.v2

@@ -141,8 +141,7 @@ Hints:
   endif()
 endforeach()
 
-if((HWMv1 AND NOT EXISTS ${BOARD_DIR}/${BOARD}_defconfig)
-   OR (HWMv2 AND NOT EXISTS ${BOARD_DIR}/board.yml))
+if(HWMv2 AND NOT EXISTS ${BOARD_DIR}/board.yml)
   message(WARNING "BOARD_DIR: ${BOARD_DIR} has been moved or deleted. "
                   "Trying to find new location."
   )
@@ -209,9 +208,8 @@ if(NOT "${ret_board}" STREQUAL "")
   endforeach()
 
   # Create two CMake variables identifying the hw model.
-  # CMake variable: HWM=[v1,v2]
-  # CMake variable: HWMv1=True, when HWMv1 is in use.
-  # CMake variable: HWMv2=True, when HWMv2 is in use.
+  # 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")
 elseif(BOARD_DIR)
@@ -228,86 +226,67 @@ else()
   message(FATAL_ERROR "Invalid BOARD; see above.")
 endif()
 
-if(HWMv1 AND DEFINED BOARD_QUALIFIERS)
-  message(FATAL_ERROR
-          "Board '${BOARD}' does not support board qualifiers, ${BOARD}${BOARD_QUALIFIERS}.\n"
-          "Please specify board without qualifiers.\n"
-  )
-endif()
-
 cmake_path(IS_PREFIX ZEPHYR_BASE "${BOARD_DIR}" NORMALIZE in_zephyr_tree)
 if(NOT in_zephyr_tree)
   set(USING_OUT_OF_TREE_BOARD 1)
 endif()
 
-if(HWMv1)
-  if(EXISTS ${BOARD_DIR}/revision.cmake)
-    # Board provides revision handling.
+if(LIST_BOARD_REVISION_FORMAT)
+  if(LIST_BOARD_REVISION_FORMAT STREQUAL "custom")
     include(${BOARD_DIR}/revision.cmake)
-  elseif(BOARD_REVISION)
-    message(WARNING "Board revision ${BOARD_REVISION} specified for ${BOARD}, \
-                     but board has no revision so revision will be ignored.")
-  endif()
-elseif(HWMv2)
-  if(LIST_BOARD_REVISION_FORMAT)
-    if(LIST_BOARD_REVISION_FORMAT STREQUAL "custom")
-      include(${BOARD_DIR}/revision.cmake)
-    else()
-      if(EXISTS ${BOARD_DIR}/revision.cmake)
-        message(WARNING
-          "revision.cmake ignored, revision.cmake is only used for revision format: 'custom'"
-        )
-      endif()
-
-      string(TOUPPER "${LIST_BOARD_REVISION_FORMAT}" rev_format)
-      if(LIST_BOARD_REVISION_EXACT)
-        set(rev_exact EXACT)
-      endif()
-
-      board_check_revision(
-        FORMAT ${rev_format}
-        DEFAULT_REVISION ${LIST_BOARD_REVISION_DEFAULT}
-        VALID_REVISIONS ${LIST_BOARD_REVISIONS}
-        ${rev_exact}
-      )
-    endif()
-  elseif(DEFINED BOARD_REVISION)
+  else()
     if(EXISTS ${BOARD_DIR}/revision.cmake)
       message(WARNING
-        "revision.cmake is not used, revisions must be defined in '${BOARD_DIR}/board.yml'"
+        "revision.cmake ignored, revision.cmake is only used for revision format: 'custom'"
       )
     endif()
 
-    message(FATAL_ERROR "Invalid board revision: ${BOARD_REVISION}\n"
-                        "Board '${BOARD}' does not define any revisions."
+    string(TOUPPER "${LIST_BOARD_REVISION_FORMAT}" rev_format)
+    if(LIST_BOARD_REVISION_EXACT)
+      set(rev_exact EXACT)
+    endif()
+
+    board_check_revision(
+      FORMAT ${rev_format}
+      DEFAULT_REVISION ${LIST_BOARD_REVISION_DEFAULT}
+      VALID_REVISIONS ${LIST_BOARD_REVISIONS}
+      ${rev_exact}
+    )
+  endif()
+elseif(DEFINED BOARD_REVISION)
+  if(EXISTS ${BOARD_DIR}/revision.cmake)
+    message(WARNING
+      "revision.cmake is not used, revisions must be defined in '${BOARD_DIR}/board.yml'"
     )
   endif()
 
-  if(LIST_BOARD_QUALIFIERS)
-    # Allow users to omit the SoC when building for a board with a single SoC.
-    list(LENGTH LIST_BOARD_SOCS socs_length)
-    if(socs_length EQUAL 1)
-      set(BOARD_SINGLE_SOC TRUE)
-      set(BOARD_${BOARD}_SINGLE_SOC TRUE)
-      if(NOT DEFINED BOARD_QUALIFIERS)
-        set(BOARD_QUALIFIERS "/${LIST_BOARD_SOCS}")
-      elseif("${BOARD_QUALIFIERS}" MATCHES "^//.*")
-        string(REGEX REPLACE "^//" "/${LIST_BOARD_SOCS}/" BOARD_QUALIFIERS "${BOARD_QUALIFIERS}")
-      endif()
-    endif()
+  message(FATAL_ERROR "Invalid board revision: ${BOARD_REVISION}\n"
+                      "Board '${BOARD}' does not define any revisions."
+  )
+endif()
 
-    set(board_targets ${LIST_BOARD_QUALIFIERS})
-    list(TRANSFORM board_targets PREPEND "${BOARD}/")
-    if(NOT ("${BOARD}${BOARD_QUALIFIERS}" IN_LIST board_targets))
-      string(REPLACE ";" "\n" board_targets "${board_targets}")
-      unset(CACHED_BOARD CACHE)
-      message(FATAL_ERROR "Board qualifiers `${BOARD_QUALIFIERS}` for board \
-            `${BOARD}` not found. Please specify a valid board target.\n"
-            "Valid board targets for ${LIST_BOARD_NAME} are:\n${board_targets}\n")
+if(LIST_BOARD_QUALIFIERS)
+  # Allow users to omit the SoC when building for a board with a single SoC.
+  list(LENGTH LIST_BOARD_SOCS socs_length)
+  if(socs_length EQUAL 1)
+    set(BOARD_SINGLE_SOC TRUE)
+    set(BOARD_${BOARD}_SINGLE_SOC TRUE)
+    if(NOT DEFINED BOARD_QUALIFIERS)
+      set(BOARD_QUALIFIERS "/${LIST_BOARD_SOCS}")
+    elseif("${BOARD_QUALIFIERS}" MATCHES "^//.*")
+      string(REGEX REPLACE "^//" "/${LIST_BOARD_SOCS}/" BOARD_QUALIFIERS "${BOARD_QUALIFIERS}")
     endif()
   endif()
-else()
-  message(FATAL_ERROR "Unknown hw model (${HWM}) for board: ${BOARD}.")
+
+  set(board_targets ${LIST_BOARD_QUALIFIERS})
+  list(TRANSFORM board_targets PREPEND "${BOARD}/")
+  if(NOT ("${BOARD}${BOARD_QUALIFIERS}" IN_LIST board_targets))
+    string(REPLACE ";" "\n" board_targets "${board_targets}")
+    unset(CACHED_BOARD CACHE)
+    message(FATAL_ERROR "Board qualifiers `${BOARD_QUALIFIERS}` for board \
+          `${BOARD}` not found. Please specify a valid board target.\n"
+          "Valid board targets for ${LIST_BOARD_NAME} are:\n${board_targets}\n")
+  endif()
 endif()
 
 set(board_message "Board: ${BOARD}")

boards/Kconfig

@@ -24,30 +24,6 @@ set_ifndef(KCONFIG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Kconfig)
 set(KCONFIG_BOARD_DIR ${KCONFIG_BINARY_DIR}/boards)
 file(MAKE_DIRECTORY ${KCONFIG_BINARY_DIR})
 
-if(HWMv1)
-  # HWMv1 only supoorts a single board dir which points directly to the board dir.
-  set(KCONFIG_BOARD_DIR ${BOARD_DIR})
-  # Support multiple SOC_ROOT
-  file(MAKE_DIRECTORY ${KCONFIG_BINARY_DIR}/soc)
-  set(kconfig_soc_root ${SOC_ROOT})
-  list(REMOVE_ITEM kconfig_soc_root ${ZEPHYR_BASE})
-  set(soc_defconfig_file ${KCONFIG_BINARY_DIR}/soc/Kconfig.defconfig)
-
-  set(OPERATION WRITE)
-  foreach(root ${kconfig_soc_root})
-    file(APPEND ${soc_defconfig_file}
-         "osource \"${root}/soc/$(ARCH)/*/Kconfig.defconfig\"\n")
-    file(${OPERATION} ${KCONFIG_BINARY_DIR}/soc/Kconfig.soc.choice
-         "osource \"${root}/soc/$(ARCH)/*/Kconfig.soc\"\n"
-    )
-    file(${OPERATION} ${KCONFIG_BINARY_DIR}/soc/Kconfig.soc.arch
-         "osource \"${root}/soc/$(ARCH)/Kconfig\"\n"
-         "osource \"${root}/soc/$(ARCH)/*/Kconfig\"\n"
-    )
-    set(OPERATION APPEND)
-  endforeach()
-endif()
-
 # Support multiple shields in BOARD_ROOT, remove ZEPHYR_BASE as that is always sourced.
 set(kconfig_board_root ${BOARD_ROOT})
 list(REMOVE_ITEM kconfig_board_root ${ZEPHYR_BASE})
@@ -176,20 +152,13 @@ set(COMMON_KCONFIG_ENV_SETTINGS
   ${ZEPHYR_KCONFIG_MODULES_DIR}
 )
 
-if(HWMv1)
-  list(APPEND COMMON_KCONFIG_ENV_SETTINGS
-    ARCH=${ARCH}
-    ARCH_DIR=${ARCH_DIR}
-  )
-else()
-  # For HWMv2 we should in future generate a Kconfig.arch.v2 which instead
-  # glob-sources all arch roots, but for Zephyr itself, the current approach is
-  # sufficient.
-  list(APPEND COMMON_KCONFIG_ENV_SETTINGS
-    ARCH=*
-    ARCH_DIR=${ZEPHYR_BASE}/arch
-  )
-endif()
+# For HWMv2 we should in future generate a Kconfig.arch.v2 which instead
+# glob-sources all arch roots, but for Zephyr itself, the current approach is
+# sufficient.
+list(APPEND COMMON_KCONFIG_ENV_SETTINGS
+  ARCH=*
+  ARCH_DIR=${ZEPHYR_BASE}/arch
+)
 
 # Allow out-of-tree users to add their own Kconfig python frontend
 # targets by appending targets to the CMake list

boards/Kconfig.v1

@@ -60,13 +60,9 @@ function(pre_dt_module_run)
   # Finalize DTS_ROOT.
   list(REMOVE_DUPLICATES DTS_ROOT)
 
-  if(HWMv1)
-    set(arch_include dts/${ARCH})
-  else()
-    foreach(arch ${ARCH_V2_NAME_LIST})
-      list(APPEND arch_include dts/${arch})
-    endforeach()
-  endif()
+  foreach(arch ${ARCH_V2_NAME_LIST})
+    list(APPEND arch_include dts/${arch})
+  endforeach()
 
   # Finalize DTS_ROOT_SYSTEM_INCLUDE_DIRS.
   set(DTS_ROOT_SYSTEM_INCLUDE_DIRS)