Introduction of board and SoC scheme v2.

Kconfig.zephyr

@@ -21,12 +21,11 @@ osource "$(KCONFIG_BINARY_DIR)/Kconfig.shield.defconfig"
 # This loads Zephyr base shield defconfigs
 source "boards/shields/*/Kconfig.defconfig"
 
-source "$(BOARD_DIR)/Kconfig.defconfig"
+osource "$(BOARD_DIR)/Kconfig.defconfig"
+
+# This loads Zephyr specific SoC root defconfigs
+source "$(KCONFIG_BINARY_DIR)/soc/Kconfig.defconfig"
 
-# This loads custom SoC root defconfigs
-osource "$(KCONFIG_BINARY_DIR)/Kconfig.soc.defconfig"
-# This loads Zephyr base SoC root defconfigs
-osource "soc/$(ARCH)/*/Kconfig.defconfig"
 # This loads the toolchain defconfigs
 osource "$(TOOLCHAIN_KCONFIG_DIR)/Kconfig.defconfig"
 # This loads the testsuite defconfig

MAINTAINERS.yml

@@ -418,7 +418,7 @@ Board/SoC configuration:
     - nordicjm
     - "57300"
   files:
-    - soc/Kconfig
+    - soc/Kconfig*
     - boards/Kconfig
   labels:
     - "area: Board/SoC configuration"

arch/Kconfig

@@ -8,8 +8,10 @@
 # Include these first so that any properties (e.g. defaults) below can be
 # overridden (by defining symbols in multiple locations)
 
-# Note: $ARCH might be a glob pattern
-source "$(ARCH_DIR)/$(ARCH)/Kconfig"
+source "$(ARCH_DIR)/Kconfig.$(HWM_SCHEME)"
+
+# ToDo: Generate a Kconfig.arch for loading of additional arch in HWMv2.
+osource "$(KCONFIG_BINARY_DIR)/Kconfig.arch"
 
 # Architecture symbols
 #
@@ -979,27 +981,6 @@ config ARCH
 	help
 	  System architecture string.
 
-config SOC
-	string
-	help
-	  SoC name which can be found under soc/<arch>/<soc name>.
-	  This option holds the directory name used by the build system to locate
-	  the correct linker and header files for the SoC.
-
-config SOC_SERIES
-	string
-	help
-	  SoC series name which can be found under soc/<arch>/<family>/<series>.
-	  This option holds the directory name used by the build system to locate
-	  the correct linker and header files.
-
-config SOC_FAMILY
-	string
-	help
-	  SoC family name which can be found under soc/<arch>/<family>.
-	  This option holds the directory name used by the build system to locate
-	  the correct linker and header files.
-
 config TOOLCHAIN_HAS_BUILTIN_FFS
 	bool
 	default y if !(64BIT && RISCV)

arch/Kconfig.v1

@@ -0,0 +1,5 @@
+# Copyright (c) 2023 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Note: $ARCH might be a glob pattern
+source "$(ARCH_DIR)/$(ARCH)/Kconfig"

arch/Kconfig.v2

@@ -0,0 +1,5 @@
+# Copyright (c) 2023 Nordic Semiconductor ASA
+
+# SPDX-License-Identifier: Apache-2.0
+
+source "$(KCONFIG_BINARY_DIR)/arch/Kconfig"

arch/archs.yml

@@ -0,0 +1,21 @@
+archs:
+  - name: arc
+    path: arc
+  - name: arm
+    path: arm
+  - name: arm64
+    path: arm64
+  - name: mips
+    path: mips
+  - name: nios2
+    path: nios2
+  - name: posix
+    path: posix
+  - name: riscv
+    path: riscv
+  - name: sparc
+    path: sparc
+  - name: xtensa
+    path: xtensa
+  - name: x86
+    path: x86

boards/Kconfig

@@ -2,6 +2,8 @@
 
 config BOARD
 	string
+	# When using hw model v2, then the board is inherited from CMake.
+	default "$(BOARD)" if "$(HWM_SCHEME)" = "v2"
 	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/).
@@ -38,14 +40,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
 
-# Note: $BOARD_DIR might be a glob pattern
-
-choice
-	prompt "Board Selection"
-
-source "$(BOARD_DIR)/Kconfig.board"
-
-endchoice
+rsource "Kconfig.$(HWM_SCHEME)"
 
 # Parse shields references
 # Don't do it as a menuconfig, as shield selection is a CMake feature.

boards/Kconfig.v1

@@ -0,0 +1,10 @@
+# Copyright (c) 2022 Nordic Semiconductor ASA
+
+# SPDX-License-Identifier: Apache-2.0
+
+choice
+	prompt "Board Selection"
+
+source "$(BOARD_DIR)/Kconfig.board"
+
+endchoice

boards/Kconfig.v2

@@ -0,0 +1,18 @@
+# Copyright (c) 2022 Nordic Semiconductor ASA
+
+# SPDX-License-Identifier: Apache-2.0
+
+BOARD_STRING := $(sanitize_upper,$(BOARD))
+BOARD_FULL_STRING := $(sanitize_upper,$(BOARD)$(BOARD_IDENTIFIER))
+
+config BOARD_$(BOARD_STRING)
+	def_bool y
+	help
+	  Kconfig symbol identifying the board.
+
+config BOARD_$(BOARD_FULL_STRING)
+	def_bool y
+	help
+	  Kconfig symbol identifying the board including full board identifier.
+
+osource "$(BOARD_DIR)/Kconfig.$(BOARD)"

boards/v2/arm/mps3/Kconfig

@@ -0,0 +1,5 @@
+# Copyright (c) 2021 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MPS3
+	select QEMU_TARGET

boards/arm/mps3_an547/Kconfig.defconfig → boards/v2/arm/mps3/Kconfig.defconfig

@@ -3,9 +3,6 @@
 
 if BOARD_MPS3_AN547
 
-config BOARD
-	default "mps3_an547"
-
 # MPU-based null-pointer dereferencing detection cannot
 # be applied as the (0x0 - 0x400) is unmapped but QEMU
 # will still permit bus access.

boards/v2/arm/mps3/Kconfig.mps3

@@ -0,0 +1,7 @@
+# Copyright (c) 2023 Nordic Semiconductor
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MPS3
+	select SOC_SERIES_MPS3
+	select SOC_MPS3_AN547

boards/v2/arm/mps3/board.yml

@@ -0,0 +1,7 @@
+board:
+  name: mps3
+  vendor: arm
+  socs:
+  - name: 'an547'
+    variants:
+    - name: 'ns'

boards/arm/mps3_an547/mps3_an547.yaml → boards/v2/arm/mps3/mps3_an547.yaml

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-identifier: mps3_an547
+identifier: mps3/an547
 name: Arm MPS3-AN547
 type: mcu
 arch: arm

boards/arm/mps3_an547/mps3_an547_defconfig → boards/v2/arm/mps3/mps3_an547_defconfig

@@ -4,9 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_SOC_SERIES_MPS3=y
-CONFIG_SOC_MPS3_AN547=y
-CONFIG_BOARD_MPS3_AN547=y
 CONFIG_RUNTIME_NMI=y
 CONFIG_ARM_TRUSTZONE_M=y
 CONFIG_ARM_MPU=y

boards/arm/mps3_an547/mps3_an547_ns.yaml → boards/v2/arm/mps3/mps3_an547_ns.yaml

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-identifier: mps3_an547_ns
+identifier: mps3/an547/ns
 name: Arm MPS3-AN547_ns
 type: mcu
 arch: arm

boards/arm/mps3_an547/mps3_an547_ns_defconfig → boards/v2/arm/mps3/mps3_an547_ns_defconfig

@@ -4,9 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_SOC_SERIES_MPS3=y
-CONFIG_SOC_MPS3_AN547=y
-CONFIG_BOARD_MPS3_AN547=y
 CONFIG_ARM_TRUSTZONE_M=y
 CONFIG_RUNTIME_NMI=y
 CONFIG_TRUSTED_EXECUTION_NONSECURE=y

boards/v2/renesas/rzt2m_starterkit/Kconfig.rzt2m_starter_kit

@@ -0,0 +1,6 @@
+# Copyright (c) 2023 Nordic Semiconductor ASA
+
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_RZT2M_STARTER_KIT
+	select SOC_RENESAS_RZT2M

boards/v2/renesas/rzt2m_starterkit/board.yml

@@ -0,0 +1,3 @@
+board:
+  name: rzt2m_starter_kit
+  vendor: Renesas

boards/arm/rzt2m_starterkit/rzt2m_starter_kit_defconfig → boards/v2/renesas/rzt2m_starterkit/rzt2m_starter_kit_defconfig

@@ -1,9 +1,6 @@
 # Copyright (c) 2023 Antmicro <www.antmicro.com>
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_RENESAS_RZT2M=y
-CONFIG_BOARD_RZT2M_STARTER_KIT=y
-
 CONFIG_SERIAL=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y

cmake/modules/arch.cmake → cmake/modules/arch_v1.cmake

@@ -2,6 +2,10 @@
 #
 # Copyright (c) 2022, Nordic Semiconductor ASA
 
+#
+# This CMake module is only valid for hw model v1.
+# In hw model v1, then arch is determined by the board folder structure.
+#
 # Configure ARCH settings based on board directory and arch root.
 #
 # This CMake module will set the following variables in the build system based
@@ -25,24 +29,26 @@
 
 include_guard(GLOBAL)
 
-# 'ARCH_ROOT' is a prioritized list of directories where archs may be
-# found. It always includes ${ZEPHYR_BASE} at the lowest priority (except for unittesting).
-if(NOT unittest IN_LIST Zephyr_FIND_COMPONENTS)
-  list(APPEND ARCH_ROOT ${ZEPHYR_BASE})
-endif()
+if(HWMv1)
+  # 'ARCH_ROOT' is a prioritized list of directories where archs may be
+  # found. It always includes ${ZEPHYR_BASE} at the lowest priority (except for unittesting).
+  if(NOT unittest IN_LIST Zephyr_FIND_COMPONENTS)
+    list(APPEND ARCH_ROOT ${ZEPHYR_BASE})
+  endif()
 
-cmake_path(GET BOARD_DIR PARENT_PATH board_arch_dir)
-cmake_path(GET board_arch_dir FILENAME ARCH)
+  cmake_path(GET BOARD_DIR PARENT_PATH board_arch_dir)
+  cmake_path(GET board_arch_dir FILENAME ARCH)
 
-foreach(root ${ARCH_ROOT})
-  if(EXISTS ${root}/arch/${ARCH}/CMakeLists.txt)
-    set(ARCH_DIR ${root}/arch)
-    break()
-  endif()
-endforeach()
+  foreach(root ${ARCH_ROOT})
+    if(EXISTS ${root}/arch/${ARCH}/CMakeLists.txt)
+      set(ARCH_DIR ${root}/arch)
+      break()
+    endif()
+  endforeach()
 
-if(NOT ARCH_DIR)
-  message(FATAL_ERROR "Could not find ARCH=${ARCH} for BOARD=${BOARD}, \
+  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/arch_v2.cmake

@@ -0,0 +1,41 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2023, Nordic Semiconductor ASA
+
+#
+# Configure ARCH settings based on KConfig settings and arch root.
+#
+# This CMake module will set the following variables in the build system based
+# on board directory and arch root.
+#
+# If no implementation is available for the current arch an error will be raised.
+#
+# Outcome:
+# The following variables will be defined when this CMake module completes:
+#
+# - ARCH:      Name of the arch in use.
+# - ARCH_DIR:  Directory containing the arch implementation.
+# - ARCH_ROOT: ARCH_ROOT with ZEPHYR_BASE appended
+#
+# Variable dependencies:
+# - ARCH_ROOT: CMake list of arch roots containing arch implementations
+#
+# Variables set by this module and not mentioned above are considered internal
+# use only and may be removed, renamed, or re-purposed without prior notice.
+
+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)
+  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()