From fd772f8e774262afb57740b183cf05c679b2d1fd Mon Sep 17 00:00:00 2001
From: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date: Tue, 5 Mar 2024 09:29:48 +0100
Subject: [PATCH] scripts: remove boards_legacy sub-folder from list_boards.py

Fixes: #69785

The boards_legacy sub-folder was temporarily introduce in collab-hwm
branch during porting to HWMv2.

This should have been removed before merging collab-hwm to main as it
prevent looking up boards in oot roots.

Removing the temporary sub-folder for HWMv2.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
---
 cmake/modules/kconfig.cmake | 8 ++++----
 scripts/list_boards.py      | 6 +++---
 soc/Kconfig.v1              | 2 --
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/cmake/modules/kconfig.cmake b/cmake/modules/kconfig.cmake
index 7be286affe6..01fbdf73f3c 100644
--- a/cmake/modules/kconfig.cmake
+++ b/cmake/modules/kconfig.cmake
@@ -35,13 +35,13 @@ if(HWMv1)
   set(OPERATION WRITE)
   foreach(root ${kconfig_soc_root})
     file(APPEND ${soc_defconfig_file}
-         "osource \"${root}/soc/soc_legacy/$(ARCH)/*/Kconfig.defconfig\"\n")
+         "osource \"${root}/soc/$(ARCH)/*/Kconfig.defconfig\"\n")
     file(${OPERATION} ${KCONFIG_BINARY_DIR}/soc/Kconfig.soc.choice
-         "osource \"${root}/soc/soc_legacy/$(ARCH)/*/Kconfig.soc\"\n"
+         "osource \"${root}/soc/$(ARCH)/*/Kconfig.soc\"\n"
     )
     file(${OPERATION} ${KCONFIG_BINARY_DIR}/soc/Kconfig.soc.arch
-         "osource \"${root}/soc/soc_legacy/$(ARCH)/Kconfig\"\n"
-         "osource \"${root}/soc/soc_legacy/$(ARCH)/*/Kconfig\"\n"
+         "osource \"${root}/soc/$(ARCH)/Kconfig\"\n"
+         "osource \"${root}/soc/$(ARCH)/*/Kconfig\"\n"
     )
     set(OPERATION APPEND)
   endforeach()
diff --git a/scripts/list_boards.py b/scripts/list_boards.py
index 9a0757cc5fe..03b1adaca83 100755
--- a/scripts/list_boards.py
+++ b/scripts/list_boards.py
@@ -156,17 +156,17 @@ def find_arch2board_set_in(root, arches, board_dir):
     boards = root / 'boards'
 
     for arch in arches:
-        if not (boards / "boards_legacy" / arch).is_dir():
+        if not (boards / arch).is_dir():
             continue
 
-        for maybe_board in (boards / "boards_legacy" / arch).iterdir():
+        for maybe_board in (boards / arch).iterdir():
             if not maybe_board.is_dir():
                 continue
             if board_dir is not None and board_dir != maybe_board:
                 continue
             for maybe_defconfig in maybe_board.iterdir():
                 file_name = maybe_defconfig.name
-                if file_name.endswith('_defconfig'):
+                if file_name.endswith('_defconfig') and not (maybe_board / BOARD_YML).is_file():
                     board_name = file_name[:-len('_defconfig')]
                     ret[arch].add(Board(board_name, maybe_board, 'v1', arch=arch))
 
diff --git a/soc/Kconfig.v1 b/soc/Kconfig.v1
index f3762b8c6e2..bd7f66d77bc 100644
--- a/soc/Kconfig.v1
+++ b/soc/Kconfig.v1
@@ -23,5 +23,3 @@ config SOC_FAMILY
 
 # This loads custom SoC root Kconfig (only available if custom SoC root are defined)
 osource "$(KCONFIG_BINARY_DIR)/soc/Kconfig.soc.arch"
-# This loads Zephyr base SoC Kconfigs
-osource "soc/soc_legacy/$(ARCH)/*/Kconfig"