|
9 | 9 | import sys |
10 | 10 | import yaml |
11 | 11 |
|
12 | | -from pathlib import Path |
13 | | -from zephyr_ext_common import ZEPHYR_BASE |
14 | | -sys.path.append(os.fspath(Path(__file__).parent.parent)) |
15 | | -import zephyr_module |
16 | | - |
17 | 12 | from west import log |
18 | 13 | from west.configuration import config |
19 | 14 | from zcmake import DEFAULT_CMAKE_GENERATOR, run_cmake, run_build, CMakeCache |
@@ -580,24 +575,7 @@ def _run_cmake(self, board, origin, cmake_opts): |
580 | 575 | if user_args: |
581 | 576 | cmake_opts.extend(shlex.split(user_args)) |
582 | 577 |
|
583 | | - config_sysbuild = config_getboolean('sysbuild', None) |
584 | | - |
585 | | - if config_sysbuild is None: |
586 | | - # Check if this is an ncs-repo directory |
587 | | - allow_list = [ 'mcuboot', 'sidewalk', 'find-my', 'nrf', 'matter', 'suit-processor', |
588 | | - 'memfault-firmware-sdk', 'zscilib', 'uoscore-uedhoc', 'zcbor', |
589 | | - 'hal_nordic' ] |
590 | | - config_sysbuild = False |
591 | | - |
592 | | - for module in zephyr_module.parse_modules(ZEPHYR_BASE, self.manifest): |
593 | | - if module.meta['name'] in allow_list and Path(self.source_dir).is_relative_to(module.project): |
594 | | - config_sysbuild = True |
595 | | - break |
596 | | - |
597 | | - if config_sysbuild is False and Path(self.source_dir).is_relative_to(ZEPHYR_BASE): |
598 | | - config_sysbuild = True |
599 | | - |
600 | | - |
| 578 | + config_sysbuild = config_getboolean('sysbuild', False) |
601 | 579 | if self.args.sysbuild or (config_sysbuild and not self.args.no_sysbuild): |
602 | 580 | cmake_opts.extend(['-S{}'.format(SYSBUILD_PROJ_DIR), |
603 | 581 | '-DAPP_DIR:PATH={}'.format(self.source_dir)]) |
|
0 commit comments