diff options
| author | Keith Short <keithshort@chromium.org> | 2021-08-27 00:07:21 +0000 |
|---|---|---|
| committer | David Stevens <stevensd@chromium.org> | 2021-08-27 00:39:21 +0000 |
| commit | eb67dbe36cac069f85962f9947fae27f5a2d25f1 (patch) | |
| tree | 4ffd2ef6d022f86408598110210a3439f17c8f2d | |
| parent | 91b55cd1b3242e47ee6e35f6ba34ef25d5307291 (diff) | |
| download | chrome-ec-eb67dbe36cac069f85962f9947fae27f5a2d25f1.tar.gz | |
Revert "zmake: add NPCX monitor to output packer list"
This reverts commit 769264c30d58e0b12795411e99e7d3efbbf78e2d.
Reason for revert: This CL is causing b:197899072
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
Change-Id: I6b3f08aa2a7649b06ce8059f58b0f94fe803982d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3123838
Auto-Submit: Keith Short <keithshort@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
| -rw-r--r-- | zephyr/zmake/zmake/output_packers.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/zephyr/zmake/zmake/output_packers.py b/zephyr/zmake/zmake/output_packers.py index 1ba38cf96c..049f18cbf9 100644 --- a/zephyr/zmake/zmake/output_packers.py +++ b/zephyr/zmake/zmake/output_packers.py @@ -185,7 +185,6 @@ 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 @@ -217,9 +216,6 @@ 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 = { |