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, 99 deletions

diff --git a/zephyr/zmake/zmake/modules.py b/zephyr/zmake/zmake/modules.py
deleted file mode 100644
index 5ba0ef73f8..0000000000
--- a/zephyr/zmake/zmake/modules.py
+++ /dev/null
@@ -1,99 +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.
-"""Registry of known Zephyr modules."""
-
-import zmake.build_config as build_config
-import zmake.util as util
-
-
-def third_party_module(name, checkout):
-    """Common callback in registry for all third_party/zephyr modules.
-
-    Args:
-        name: The name of the module.
-        checkout: The path to the chromiumos source.
-
-    Return:
-        The path to the module module.
-    """
-    return checkout / "src" / "third_party" / "zephyr" / name
-
-
-known_modules = {
-    "hal_stm32": third_party_module,
-    "cmsis": third_party_module,
-    "ec": lambda name, checkout: (checkout / "src" / "platform" / "ec"),
-    "nanopb": third_party_module,
-}
-
-
-def locate_from_checkout(checkout_dir):
-    """Find modules from a Chrome OS checkout.
-
-    Important: this function should only conditionally be called if a
-    checkout exists.  Zmake *can* be used without a Chrome OS source
-    tree.  You should call locate_from_directory if outside of a
-    Chrome OS source tree.
-
-    Args:
-        checkout_dir: The path to the chromiumos source.
-
-    Returns:
-        A dictionary mapping module names to paths.
-    """
-    result = {}
-    for name, locator in known_modules.items():
-        result[name] = locator(name, checkout_dir)
-    return result
-
-
-def locate_from_directory(directory):
-    """Create a modules dictionary from a directory.
-
-    This takes a directory, and searches for the known module names
-    located in it.
-
-    Args:
-        directory: the directory to search in.
-
-    Returns:
-        A dictionary mapping module names to paths.
-    """
-    result = {}
-
-    for name in known_modules:
-        modpath = (directory / name).resolve()
-        if (modpath / "zephyr" / "module.yml").is_file():
-            result[name] = modpath
-
-    return result
-
-
-def setup_module_symlinks(output_dir, modules):
-    """Setup a directory with symlinks to modules.
-
-    Args:
-        output_dir: The directory to place the symlinks in.
-        modules: A dictionary of module names mapping to paths.
-
-    Returns:
-        The resultant BuildConfig that should be applied to use each
-        of these modules.
-    """
-    if not output_dir.exists():
-        output_dir.mkdir(parents=True)
-
-    module_links = []
-
-    for name, path in modules.items():
-        link_path = output_dir.resolve() / name
-        util.update_symlink(path, link_path)
-        module_links.append(link_path)
-
-    if module_links:
-        return build_config.BuildConfig(
-            cmake_defs={"ZEPHYR_MODULES": ";".join(map(str, module_links))}
-        )
-    else:
-        return build_config.BuildConfig()