zmake: Remove options for boards or tests only

Since there are no tests in zmake, no reason to filter by boards or
tests only.

BRANCH=None
BUG=None
TEST=CQ

Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I628fa87d41d60437bdb1597111da2eb2928b2ada
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3896635
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Aaron Massey <aaronmassey@google.com>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>

3 files changed, 3 insertions, 37 deletions

diff --git a/zephyr/zmake/README.md b/zephyr/zmake/README.md
index ebae585fbc..e424b66ca0 100644
--- a/zephyr/zmake/README.md
+++ b/zephyr/zmake/README.md
@@ -35,7 +35,7 @@ Chromium OS's meta-build tool for Zephyr
 
 ### zmake configure
 
-**Usage:** `zmake configure [-h] [-t TOOLCHAIN] [--bringup] [--clobber] [--static] [--save-temps] [--allow-warnings] [-B BUILD_DIR] [-c] [--extra-cflags EXTRA_CFLAGS] [--delete-intermediates] (-a | --host-tests-only | --boards-only | project_name [project_name ...])`
+**Usage:** `zmake configure [-h] [-t TOOLCHAIN] [--bringup] [--clobber] [--static] [--save-temps] [--allow-warnings] [-B BUILD_DIR] [-c] [--extra-cflags EXTRA_CFLAGS] [--delete-intermediates] (-a | project_name [project_name ...])`
 
 #### Positional Arguments
 
@@ -59,12 +59,10 @@ Chromium OS's meta-build tool for Zephyr
 | `--extra-cflags EXTRA_CFLAGS` | Additional CFLAGS to use for target builds |
 | `--delete-intermediates` | Delete intermediate files to save disk space |
 | `-a`, `--all` | Select all projects |
-| `--host-tests-only` | Select all test projects |
-| `--boards-only` | Select all board projects (not tests) |
 
 ### zmake build
 
-**Usage:** `zmake build [-h] [-t TOOLCHAIN] [--bringup] [--clobber] [--static] [--save-temps] [--allow-warnings] [-B BUILD_DIR] [-c] [--extra-cflags EXTRA_CFLAGS] [--delete-intermediates] (-a | --host-tests-only | --boards-only | project_name [project_name ...])`
+**Usage:** `zmake build [-h] [-t TOOLCHAIN] [--bringup] [--clobber] [--static] [--save-temps] [--allow-warnings] [-B BUILD_DIR] [-c] [--extra-cflags EXTRA_CFLAGS] [--delete-intermediates] (-a | project_name [project_name ...])`
 
 #### Positional Arguments
 
@@ -88,8 +86,6 @@ Chromium OS's meta-build tool for Zephyr
 | `--extra-cflags EXTRA_CFLAGS` | Additional CFLAGS to use for target builds |
 | `--delete-intermediates` | Delete intermediate files to save disk space |
 | `-a`, `--all` | Select all projects |
-| `--host-tests-only` | Select all test projects |
-| `--boards-only` | Select all board projects (not tests) |
 
 ### zmake list-projects
 
@@ -110,7 +106,7 @@ Chromium OS's meta-build tool for Zephyr
 
 ### zmake test
 
-**Usage:** `zmake test [-h] [--no-rebuild] [-t TOOLCHAIN] [--bringup] [--clobber] [--static] [--save-temps] [--allow-warnings] [-B BUILD_DIR] [-c] [--extra-cflags EXTRA_CFLAGS] [--delete-intermediates] (-a | --host-tests-only | --boards-only | project_name [project_name ...])`
+**Usage:** `zmake test [-h] [--no-rebuild] [-t TOOLCHAIN] [--bringup] [--clobber] [--static] [--save-temps] [--allow-warnings] [-B BUILD_DIR] [-c] [--extra-cflags EXTRA_CFLAGS] [--delete-intermediates] (-a | project_name [project_name ...])`
 
 #### Positional Arguments
 
@@ -135,8 +131,6 @@ Chromium OS's meta-build tool for Zephyr
 | `--extra-cflags EXTRA_CFLAGS` | Additional CFLAGS to use for target builds |
 | `--delete-intermediates` | Delete intermediate files to save disk space |
 | `-a`, `--all` | Select all projects |
-| `--host-tests-only` | Select all test projects |
-| `--boards-only` | Select all board projects (not tests) |
 
 ### zmake testall
 
diff --git a/zephyr/zmake/zmake/__main__.py b/zephyr/zmake/zmake/__main__.py
index 680289e8b9..cc3b1708be 100644
--- a/zephyr/zmake/zmake/__main__.py
+++ b/zephyr/zmake/zmake/__main__.py
@@ -327,18 +327,6 @@ def add_common_configure_args(sub_parser: argparse.ArgumentParser):
         help="Select all projects",
     )
     group.add_argument(
-        "--host-tests-only",
-        action="store_true",
-        dest="host_tests_only",
-        help="Select all test projects",
-    )
-    group.add_argument(
-        "--boards-only",
-        action="store_true",
-        dest="boards_only",
-        help="Select all board projects (not tests)",
-    )
-    group.add_argument(
         "project_names",
         nargs="*",
         metavar="project_name",
diff --git a/zephyr/zmake/zmake/zmake.py b/zephyr/zmake/zmake/zmake.py
index ff2e50d8fd..b7a81a3b9b 100644
--- a/zephyr/zmake/zmake/zmake.py
+++ b/zephyr/zmake/zmake/zmake.py
@@ -204,8 +204,6 @@ class Zmake:
         self,
         project_names,
         all_projects=False,
-        host_tests_only=False,
-        boards_only=False,
     ) -> Set[zmake.project.Project]:
         """Finds all projects for the specified command line flags.
 
@@ -216,12 +214,6 @@ class Zmake:
         )
         if all_projects:
             projects = set(found_projects.values())
-        elif host_tests_only:
-            projects = {p for p in found_projects.values() if p.config.is_test}
-        elif boards_only:
-            projects = {
-                p for p in found_projects.values() if not p.config.is_test
-            }
         else:
             projects = set()
             for project_name in project_names:
@@ -244,10 +236,8 @@ class Zmake:
         coverage=False,
         allow_warnings=False,
         all_projects=False,
-        host_tests_only=False,
         extra_cflags=None,
         delete_intermediates=False,
-        boards_only=False,
         static_version=False,
         save_temps=False,
     ):
@@ -259,8 +249,6 @@ class Zmake:
         projects = self._resolve_projects(
             project_names,
             all_projects=all_projects,
-            host_tests_only=host_tests_only,
-            boards_only=boards_only,
         )
         for project in projects:
             project_build_dir = (
@@ -313,10 +301,8 @@ class Zmake:
         coverage=False,
         allow_warnings=False,
         all_projects=False,
-        host_tests_only=False,
         extra_cflags=None,
         delete_intermediates=False,
-        boards_only=False,
         static_version=False,
         save_temps=False,
     ):
@@ -330,11 +316,9 @@ class Zmake:
             coverage=coverage,
             allow_warnings=allow_warnings,
             all_projects=all_projects,
-            host_tests_only=host_tests_only,
             extra_cflags=extra_cflags,
             build_after_configure=True,
             delete_intermediates=delete_intermediates,
-            boards_only=boards_only,
             static_version=static_version,
             save_temps=save_temps,
         )