diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2023-02-07 15:46:15 -0700 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-02-08 00:16:45 +0000 |
| commit | e4364bca6c6c3ab350236e7349d607dce08035a5 (patch) | |
| tree | 5252fe0cf44148e2e3323299f8d370f81d933cbe | |
| parent | 796e4ef43c2eb54b8d259c7c6c6a9fdf24185892 (diff) | |
| download | chrome-ec-e4364bca6c6c3ab350236e7349d607dce08035a5.tar.gz | |
zephyr: zmake: Limit modules by default
Most builds only require the EC module, and for ARM boards, they
require the CMSIS module as well.
Default to just the EC module, and turn on CMSIS for nuvoton/mchp.
BUG=b:268050548
BRANCH=none
TEST=zmake build -a
=> version strings have less modules than usual
Change-Id: Iddf24c159edf1a9c13671eaa478ea30f402d52c7
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4228737
Reviewed-by: Aaron Massey <aaronmassey@google.com>
Commit-Queue: Aaron Massey <aaronmassey@google.com>
| -rw-r--r-- | zephyr/zmake/zmake/configlib.py | 2 | ||||
| -rw-r--r-- | zephyr/zmake/zmake/project.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/zephyr/zmake/zmake/configlib.py b/zephyr/zmake/zmake/configlib.py index 139394745f..2affaf08f5 100644 --- a/zephyr/zmake/zmake/configlib.py +++ b/zephyr/zmake/zmake/configlib.py @@ -48,9 +48,11 @@ def register_binman_project(**kwargs): def register_npcx_project(**kwargs): """Register a project that uses NpcxPacker.""" kwargs.setdefault("output_packer", zmake.output_packers.NpcxPacker) + kwargs.setdefault("modules", ["ec", "cmsis"]) return register_binman_project(**kwargs) def register_mchp_project(**kwargs): kwargs.setdefault("output_packer", zmake.output_packers.MchpPacker) + kwargs.setdefault("modules", ["ec", "cmsis"]) return register_binman_project(**kwargs) diff --git a/zephyr/zmake/zmake/project.py b/zephyr/zmake/zmake/project.py index a707da2462..15974af723 100644 --- a/zephyr/zmake/zmake/project.py +++ b/zephyr/zmake/zmake/project.py @@ -1,6 +1,7 @@ # Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. + """Module for project config wrapper object.""" import dataclasses @@ -43,8 +44,8 @@ class ProjectConfig: zephyr_board: str supported_toolchains: "list[str]" output_packer: type - modules: "dict[str, typing.Any]" = dataclasses.field( - default_factory=lambda: zmake.modules.known_modules, + modules: typing.Iterable[str] = dataclasses.field( + default_factory=lambda: ["ec"], ) is_test: bool = dataclasses.field(default=False) test_args: typing.List[str] = dataclasses.field(default_factory=list) |