patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

scripts: remove boards_legacy sub-folder from list_boards.py

Browse source 
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>
This commit is contained in:
Torsten Rasmussen 2024-03-05 09:29:48 +01:00 committed by Carles Cufí
parent 0186a96419
commit fd772f8e77
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmake/modules/kconfig.cmake
View file

@ -35,13 +35,13 @@ if(HWMv1)
set(OPERATION WRITE) set(OPERATION WRITE)
foreach(root ${kconfig_soc_root}) foreach(root ${kconfig_soc_root})
file(APPEND ${soc_defconfig_file} 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 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 file(${OPERATION} ${KCONFIG_BINARY_DIR}/soc/Kconfig.soc.arch
"osource \"${root}/soc/soc_legacy/$(ARCH)/Kconfig\"\n" "osource \"${root}/soc/$(ARCH)/Kconfig\"\n"
"osource \"${root}/soc/soc_legacy/$(ARCH)/*/Kconfig\"\n" "osource \"${root}/soc/$(ARCH)/*/Kconfig\"\n"
) )
set(OPERATION APPEND) set(OPERATION APPEND)
endforeach() endforeach()

6
scripts/list_boards.py
View file

@ -156,17 +156,17 @@ def find_arch2board_set_in(root, arches, board_dir):
boards = root / 'boards' boards = root / 'boards'
for arch in arches: for arch in arches:
if not (boards / "boards_legacy" / arch).is_dir(): if not (boards / arch).is_dir():
continue continue
for maybe_board in (boards / "boards_legacy" / arch).iterdir(): for maybe_board in (boards / arch).iterdir():
if not maybe_board.is_dir(): if not maybe_board.is_dir():
continue continue
if board_dir is not None and board_dir != maybe_board: if board_dir is not None and board_dir != maybe_board:
continue continue
for maybe_defconfig in maybe_board.iterdir(): for maybe_defconfig in maybe_board.iterdir():
file_name = maybe_defconfig.name 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')] board_name = file_name[:-len('_defconfig')]
ret[arch].add(Board(board_name, maybe_board, 'v1', arch=arch)) ret[arch].add(Board(board_name, maybe_board, 'v1', arch=arch))

2
soc/Kconfig.v1
View file

@ -23,5 +23,3 @@ config SOC_FAMILY
# This loads custom SoC root Kconfig (only available if custom SoC root are defined) # This loads custom SoC root Kconfig (only available if custom SoC root are defined)
osource "$(KCONFIG_BINARY_DIR)/soc/Kconfig.soc.arch" osource "$(KCONFIG_BINARY_DIR)/soc/Kconfig.soc.arch"
# This loads Zephyr base SoC Kconfigs
osource "soc/soc_legacy/$(ARCH)/*/Kconfig"