From 1fff129e5ddfe20c2c1513835e06c4e4d8f57608 Mon Sep 17 00:00:00 2001 From: Jack Rosenthal Date: Mon, 25 Jan 2021 10:15:51 -0700 Subject: zmake: remove prefer-zephyr-sdk from project config No projects set this anymore. BUG=b:178363068 BRANCH=none TEST=zmake testall Signed-off-by: Jack Rosenthal Change-Id: Ib28017048695a5dbabaead83de49c85363fde665 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2647537 Reviewed-by: Patrick Georgi Commit-Queue: Patrick Georgi Tested-by: Patrick Georgi --- zephyr/zmake/zmake/zmake.py | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'zephyr/zmake/zmake/zmake.py') 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(): -- cgit v1.2.1