diff options
| -rw-r--r-- | zephyr/zmake/zmake/project.py | 7 | ||||
| -rw-r--r-- | zephyr/zmake/zmake/zmake.py | 15 |
2 files changed, 0 insertions, 22 deletions
diff --git a/zephyr/zmake/zmake/project.py b/zephyr/zmake/zmake/project.py index 7bb68a7018..db8e5a2e17 100644 --- a/zephyr/zmake/zmake/project.py +++ b/zephyr/zmake/zmake/project.py @@ -38,9 +38,6 @@ class ProjectConfig: 'toolchain': { 'type': 'string', }, - 'prefer-zephyr-sdk': { - 'type': 'boolean', - }, 'is-test': { 'type': 'boolean', }, @@ -70,10 +67,6 @@ class ProjectConfig: return self.config_dict['toolchain'] @property - def zephyr_sdk_is_preferred(self): - return self.config_dict.get('prefer-zephyr-sdk', False) - - @property def is_test(self): return self.config_dict.get('is-test', False) diff --git a/zephyr/zmake/zmake/zmake.py b/zephyr/zmake/zmake/zmake.py index 5a2e0d0105..2a9587ffe5 100644 --- a/zephyr/zmake/zmake/zmake.py +++ b/zephyr/zmake/zmake/zmake.py @@ -94,21 +94,6 @@ class Zmake: if not toolchain: toolchain = project.config.toolchain - if project.config.zephyr_sdk_is_preferred: - try: - toolchains.find_zephyr_sdk() - except OSError: - self.logger.warning( - 'Unable to find the Zephyr SDK, which is the preferred ' - 'toolchain for this project (however, unavailable in ' - 'the chroot by default). Using %r instead, which ' - 'will probably compile but may not actually work at ' - 'all. See go/zephyr-care for more info.', toolchain) - else: - self.logger.info( - 'Zephyr SDK is available. Using it instead of %r.', - toolchain) - toolchain = 'zephyr' toolchain_config = toolchains.get_toolchain(toolchain, module_paths) if not build_dir.exists(): |