ish: Trim down the release branchstabilize-wristpin-14469.59.B-ishstabilize-voshyr-14637.B-ishstabilize-quickfix-14695.187.B-ishstabilize-quickfix-14695.124.B-ishstabilize-quickfix-14526.91.B-ishstabilize-14695.85.B-ishstabilize-14695.107.B-ishstabilize-14682.B-ishstabilize-14633.B-ishstabilize-14616.B-ishstabilize-14589.B-ishstabilize-14588.98.B-ishstabilize-14588.14.B-ishstabilize-14588.123.B-ishstabilize-14536.B-ishstabilize-14532.B-ishstabilize-14528.B-ishstabilize-14526.89.B-ishstabilize-14526.84.B-ishstabilize-14526.73.B-ishstabilize-14526.67.B-ishstabilize-14526.57.B-ishstabilize-14498.B-ishstabilize-14496.B-ishstabilize-14477.B-ishstabilize-14469.9.B-ishstabilize-14469.8.B-ishstabilize-14469.58.B-ishstabilize-14469.41.B-ishstabilize-14442.B-ishstabilize-14438.B-ishstabilize-14411.B-ishstabilize-14396.B-ishstabilize-14395.B-ishstabilize-14388.62.B-ishstabilize-14388.61.B-ishstabilize-14388.52.B-ishstabilize-14385.B-ishstabilize-14345.B-ishstabilize-14336.B-ishstabilize-14333.B-ishrelease-R99-14469.B-ishrelease-R98-14388.B-ishrelease-R102-14695.B-ishrelease-R101-14588.B-ishrelease-R100-14526.B-ishfirmware-cherry-14454.B-ishfirmware-brya-14505.B-ishfirmware-brya-14505.71.B-ishfactory-kukui-14374.B-ishfactory-guybrush-14600.B-ishfactory-cherry-14455.B-ishfactory-brya-14517.B-ish

In the interest of making long-term branch maintenance incur as little
technical debt on us as possible, we should not maintain any files on
the branch we are not actually using.

This has the added effect of making it extremely clear when merging CLs
from the main branch when changes have the possibility to affect us.

The follow-on CL adds a convenience script to actually pull updates from
the main branch and generate a CL for the update.

BUG=b:204206272
BRANCH=ish
TEST=make BOARD=arcada_ish && make BOARD=drallion_ish

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

1 files changed, 0 insertions, 154 deletions

diff --git a/zephyr/zmake/zmake/toolchains.py b/zephyr/zmake/zmake/toolchains.py
deleted file mode 100644
index 924448aec5..0000000000
--- a/zephyr/zmake/zmake/toolchains.py
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""Definitions of toolchain variables."""
-
-import os
-import pathlib
-
-import zmake.build_config as build_config
-
-
-class GenericToolchain:
-    """Default toolchain if not known to zmake.
-
-    Simply pass ZEPHYR_TOOLCHAIN_VARIANT=name to the build, with
-    nothing extra.
-    """
-
-    def __init__(self, name, modules=None):
-        self.name = name
-        self.modules = modules or {}
-
-    def probe(self):
-        """Probe if the toolchain is available on the system."""
-        # Since the toolchain is not known to zmake, we have no way to
-        # know if it's installed.  Simply return False to indicate not
-        # installed.  An unknown toolchain would only be used if -t
-        # was manually passed to zmake, and is not valid to put in a
-        # zmake.yaml file.
-        return False
-
-    def get_build_config(self):
-        """Get the build configuration for the toolchain.
-
-        Returns:
-            A build_config.BuildConfig to be applied to the build.
-        """
-        return build_config.BuildConfig(
-            cmake_defs={
-                "ZEPHYR_TOOLCHAIN_VARIANT": self.name,
-            },
-        )
-
-
-class CorebootSdkToolchain(GenericToolchain):
-    def probe(self):
-        # For now, we always assume it's at /opt/coreboot-sdk, since
-        # that's where it's installed in the chroot.  We may want to
-        # consider adding support for a coreboot-sdk built in the
-        # user's home directory, for example, which happens if a
-        # "make crossgcc" is done from the coreboot repository.
-        return pathlib.Path("/opt/coreboot-sdk").is_dir()
-
-    def get_build_config(self):
-        return (
-            build_config.BuildConfig(
-                cmake_defs={
-                    "TOOLCHAIN_ROOT": str(self.modules["ec"] / "zephyr"),
-                },
-            )
-            | super().get_build_config()
-        )
-
-
-class ZephyrToolchain(GenericToolchain):
-    def __init__(self, *args, **kwargs):
-        self.zephyr_sdk_install_dir = self._find_zephyr_sdk()
-        super().__init__(*args, **kwargs)
-
-    @staticmethod
-    def _find_zephyr_sdk():
-        """Find the Zephyr SDK, if it's installed.
-
-        Returns:
-            The path to the Zephyr SDK, using the search rules defined by
-            https://docs.zephyrproject.org/latest/getting_started/installation_linux.html,
-            or None, if one cannot be found on the system.
-        """
-        from_env = os.getenv("ZEPHYR_SDK_INSTALL_DIR")
-        if from_env:
-            return pathlib.Path(from_env)
-
-        def _gen_sdk_paths():
-            for prefix in (
-                "~",
-                "~/.local",
-                "~/.local/opt",
-                "~/bin",
-                "/opt",
-                "/usr",
-                "/usr/local",
-            ):
-                prefix = pathlib.Path(os.path.expanduser(prefix))
-                yield prefix / "zephyr-sdk"
-                yield from prefix.glob("zephyr-sdk-*")
-
-        for path in _gen_sdk_paths():
-            if (path / "sdk_version").is_file():
-                return path
-
-        return None
-
-    def probe(self):
-        return bool(self.zephyr_sdk_install_dir)
-
-    def get_build_config(self):
-        assert self.zephyr_sdk_install_dir
-        tc_vars = {
-            "ZEPHYR_SDK_INSTALL_DIR": str(self.zephyr_sdk_install_dir),
-        }
-        return (
-            build_config.BuildConfig(
-                environ_defs=tc_vars,
-                cmake_defs=tc_vars,
-            )
-            | super().get_build_config()
-        )
-
-
-class LlvmToolchain(GenericToolchain):
-    def probe(self):
-        # TODO: differentiate chroot llvm path vs. something more
-        # generic?
-        return pathlib.Path("/usr/bin/x86_64-pc-linux-gnu-clang").exists()
-
-    def get_build_config(self):
-        # TODO: this contains custom settings for the chroot.  Plumb a
-        # toolchain for "generic-llvm" for external uses?
-        return (
-            build_config.BuildConfig(
-                cmake_defs={
-                    "TOOLCHAIN_ROOT": str(self.modules["ec"] / "zephyr"),
-                },
-            )
-            | super().get_build_config()
-        )
-
-
-class HostToolchain(GenericToolchain):
-    def probe(self):
-        # "host" toolchain for Zephyr means GCC.
-        for search_path in os.getenv("PATH", "/usr/bin").split(":"):
-            if (pathlib.Path(search_path) / "gcc").exists():
-                return True
-        return False
-
-
-# Mapping of toolchain names -> support class
-support_classes = {
-    "coreboot-sdk": CorebootSdkToolchain,
-    "host": HostToolchain,
-    "llvm": LlvmToolchain,
-    "zephyr": ZephyrToolchain,
-}