diff options
author | Jack Rosenthal <jrosenth@chromium.org> | 2021-02-17 15:35:21 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-02-18 17:24:11 +0000 |
commit | ccd2d5ac1047614ce47e393333fbbf79282d8c86 (patch) | |
tree | db5446985584aa747fe7910448692ad7ac83797a | |
parent | 805f47818176fb2e9409a5a7d3c85139aac811e0 (diff) | |
download | chrome-ec-ccd2d5ac1047614ce47e393333fbbf79282d8c86.tar.gz |
zephyr: zmake: rename "raw" packer to "npcx" packer
The "raw" packer used to be a binary packer which simply forwarded
zephyr.bin to the output directory with no modifications.
A history of CLs has repurposed this packer to be specific to binman
RO/RW format, with the RO expected to generate a Nuvoton loader at the
beginning of the image. So it's hardly "raw" anymore.
Rename it to "npcx" so we can bring back the original "raw" packer,
needed by chameleon. (Note this is done in a follow-up CL).
BUG=b:180545676
BRANCH=none
TEST=zmake testall
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I73e13426d7c87db1ccf3514dd321640ebc625068
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2702494
Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r-- | zephyr/projects/delbin/zmake.yaml | 2 | ||||
-rw-r--r-- | zephyr/projects/kohaku/zmake.yaml | 10 | ||||
-rw-r--r-- | zephyr/projects/volteer/zmake.yaml | 10 | ||||
-rw-r--r-- | zephyr/zmake/zmake/output_packers.py | 11 |
4 files changed, 11 insertions, 22 deletions
diff --git a/zephyr/projects/delbin/zmake.yaml b/zephyr/projects/delbin/zmake.yaml index 2ceb55f073..dd63310772 100644 --- a/zephyr/projects/delbin/zmake.yaml +++ b/zephyr/projects/delbin/zmake.yaml @@ -6,4 +6,4 @@ board: delbin supported-zephyr-versions: - v2.4 toolchain: coreboot-sdk -output-type: raw +output-type: npcx diff --git a/zephyr/projects/kohaku/zmake.yaml b/zephyr/projects/kohaku/zmake.yaml index 7477961500..fc8827ea44 100644 --- a/zephyr/projects/kohaku/zmake.yaml +++ b/zephyr/projects/kohaku/zmake.yaml @@ -6,12 +6,4 @@ board: kohaku supported-zephyr-versions: - v2.4 toolchain: coreboot-sdk - -# Note: below output type is not correct, but good enough for -# developing right now. We need to run ecst to pack the RO/RW binary -# into the special NPCX format, but don't do that now. -# -# So, when flashing, please flash -# build-singleimage/zephyr/zephyr_kohaku.bin instead until Zmake -# grows a configuration option to handle ecst. -output-type: raw +output-type: npcx diff --git a/zephyr/projects/volteer/zmake.yaml b/zephyr/projects/volteer/zmake.yaml index 914f8660e0..d50dae9b21 100644 --- a/zephyr/projects/volteer/zmake.yaml +++ b/zephyr/projects/volteer/zmake.yaml @@ -6,12 +6,4 @@ board: volteer supported-zephyr-versions: - v2.4 toolchain: coreboot-sdk - -# Note: below output type is not correct, but good enough for -# developing right now. We need to run ecst to pack the RO/RW binary -# into the special NPCX format, but don't do that now. -# -# So, when flashing, please flash -# build-singleimage/zephyr/zephyr_volteer.bin instead until Zmake -# grows a configuration option to handle ecst. -output-type: raw +output-type: npcx diff --git a/zephyr/zmake/zmake/output_packers.py b/zephyr/zmake/zmake/output_packers.py index d59b0e8e5d..ba7cdd9ec2 100644 --- a/zephyr/zmake/zmake/output_packers.py +++ b/zephyr/zmake/zmake/output_packers.py @@ -96,8 +96,13 @@ class ElfPacker(BasePacker): yield singleimage / 'zephyr' / 'zephyr.elf', 'zephyr.elf' -class RawBinPacker(BasePacker): - """Packer for RO/RW image to generate a .bin build using FMAP.""" +class NpcxPacker(BasePacker): + """Packer for RO/RW image to generate a .bin build using FMAP. + + This expects that the build is setup to generate a + zephyr.packed.bin for the RO image, which should be packed using + Nuvoton's loader format. + """ def __init__(self, project): self.logger = logging.getLogger(self.__class__.__name__) super().__init__(project) @@ -161,5 +166,5 @@ class RawBinPacker(BasePacker): # A dictionary mapping packer config names to classes. packer_registry = { 'elf': ElfPacker, - 'raw': RawBinPacker, + 'npcx': NpcxPacker, } |