diff options
| author | Keith Short <keithshort@chromium.org> | 2021-08-25 16:11:03 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-09-01 15:28:23 +0000 |
| commit | 6810cc69d0878a803c630578cd09a478d8726907 (patch) | |
| tree | b8d4a76b561b836d10f59857d96262357ef814db /zephyr/zmake | |
| parent | e46c833295e213e5fa9daa7dd84c9c0f27b60706 (diff) | |
| download | chrome-ec-6810cc69d0878a803c630578cd09a478d8726907.tar.gz | |
Reland "zmake: add NPCX monitor to output packer list"
This is a reland of commit 769264c30d58e0b12795411e99e7d3efbbf78e2d.
CL:3131701 removes the "zephyr" use flag, so the hatch and trogodr
builders will no longer build both zephyr_ec and cros_ec images.
Original change's description:
> zmake: add NPCX monitor to output packer list
>
> Add the NPCX monitor binary to the output directory when using the NPCX
> output packer.
>
> BUG=b:197162681
> BRANCH=none
> TEST=Build zephyr for volteer, verify npcx_monitor.bin is present in the
> output directory with the zephyr.bin image.
>
> Signed-off-by: Keith Short <keithshort@chromium.org>
> Change-Id: I5ab29a797830b6870df5b86e70ebe86a62ff430b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3122866
> Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
> Reviewed-by: Yuval Peress <peress@chromium.org>
BUG=b:197162681
BRANCH=none
TEST=Build zephyr for volteer, verify npcx_monitor.bin is present in the
output directory with the zephyr.bin image.
Cq-Include-Trybots: luci.chromeos.cq:cq-orchestrator
Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: Iee33430047257ab2eaf5f88252a91aca60ee60ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3133466
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'zephyr/zmake')
| -rw-r--r-- | zephyr/zmake/zmake/output_packers.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/zephyr/zmake/zmake/output_packers.py b/zephyr/zmake/zmake/output_packers.py index 049f18cbf9..1ba38cf96c 100644 --- a/zephyr/zmake/zmake/output_packers.py +++ b/zephyr/zmake/zmake/output_packers.py @@ -185,6 +185,7 @@ class NpcxPacker(BinmanPacker): """ ro_file = "zephyr.npcx.bin" + npcx_monitor = "npcx_monitor.bin" # TODO(b/192401039): CONFIG_FLASH_SIZE is nuvoton-only. Since # binman already checks sizes, perhaps we can just remove this @@ -216,6 +217,9 @@ class NpcxPacker(BinmanPacker): else: yield path, output_file + # Include the NPCX monitor file as an output artifact. + yield ro / self.npcx_monitor, self.npcx_monitor + # A dictionary mapping packer config names to classes. packer_registry = { |