diff options
| author | Rob Barnes <robbarnes@google.com> | 2021-05-13 12:27:56 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-09-14 12:18:02 +0000 |
| commit | 5d157c8679880b8c86bb3944daa35ba25aece58b (patch) | |
| tree | c8285384008e6ee38b16d88e13f8f258298f3808 /include/system.h | |
| parent | da4711d25c547f760efd1b2e8df1af2957972eae (diff) | |
| download | chrome-ec-5d157c8679880b8c86bb3944daa35ba25aece58b.tar.gz | |
system: Add CrOS FWID to version output
EC version does not follow the the AP and OS version. This causes
confusion during development. This change augments the EC version output
to include the CrOS FWID when available. The CrOS FWID will be missing
when the CrOS EC is built outside of cros_sdk. When CrOS FWID is missing
'CROS_FWID_MISSING' will be used.
Zephyr/zmake support will be added later, CROS_FWID32 is set to
'CROS_FWID_MISSING' in zephyr builds until then.
BUG=b:188073399
TEST=version
21-05-20 16:43:18.627 Chip: Nuvoton NPCX993F A.00160101
21-05-20 16:43:18.631 Board: 1
21-05-20 16:43:18.631 RO: guybrush_v2.0.8770+f47439f75
21-05-20 16:43:18.634 guybrush_13983.0.21_05_20
21-05-20 16:43:18.639 RW_A: * guybrush_v2.0.8770+f47439f75
21-05-20 16:43:18.641 * guybrush_13983.0.21_05_20
21-05-20 16:43:18.644 RW_B: guybrush_v2.0.8770+f47439f75
21-05-20 16:43:18.644 guybrush_13983.0.21_05_20
21-05-20 16:43:18.647 Build: guybrush_v2.0.8770+f47439f75
21-05-20 16:43:18.651 guybrush_13983.0.21_05_20 2021-05-20
21-05-20 16:43:18.657 16:31:19 robbarnes@robbarnes0
ectool version
RO version: guybrush_v2.0.8770+f47439f75
RO cros fwid: guybrush_13983.0.21_05_20
RW version: guybrush_v2.0.8770+f47439f75
RW cros fwid: guybrush_13983.0.21_05_20
Firmware copy: RO
Build info: guybrush_v2.0.8770+f47439f75
guybrush_13983.0.21_05_20 2021-05-20 16:31:19 robbarnes@robbarnes0
Tool version: 1.1.9999-f47439f @robbarnes0
BRANCH=None
Signed-off-by: Rob Barnes <robbarnes@google.com>
Change-Id: Ief0a0c6e9d35edc72ac2d4780ee203be41d7305f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2894145
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'include/system.h')
| -rw-r--r-- | include/system.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/system.h b/include/system.h index 325d76f702..6d46392e38 100644 --- a/include/system.h +++ b/include/system.h @@ -286,6 +286,15 @@ const struct image_data *system_get_image_data(enum ec_image copy); const char *system_get_version(enum ec_image copy); /** + * Get the CrOS fwid string for an image + * + * @param copy Image copy to get version from, or SYSTEM_IMAGE_UNKNOWN + * to get the version for the currently running image. + * @return The fwid string for the image copy, or an empty string if error. + */ +const char *system_get_cros_fwid(enum ec_image copy); + +/** * Get the SKU ID for a device * * @return A value that identifies the SKU variant of a model. Its meaning and |