diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2017-06-08 21:49:00 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-06-13 21:23:59 -0700 |
| commit | 68079d94a66830ae25bb0c6d6b5ac53555e05fd9 (patch) | |
| tree | 7304fe8b7b8b9fbd243808f1e7b189014a99ec75 /include | |
| parent | 01213a574f4d8ebe6cc295d1dc614feeb3a79adb (diff) | |
| download | chrome-ec-68079d94a66830ae25bb0c6d6b5ac53555e05fd9.tar.gz | |
g: show RW headers' Board ID fields in 'version' output
The contents of the board ID fields of the Cr50 image headers is an
important piece of information which determines if an image can run on
a particular H1 chip.
This patch adds this information to the output of the 'version'
command, printing both the contents of the fields of the RW images and
if the image would run with the current INFO1 board ID contents (Yes
or NO).
The board_id feature is in fact g chipset specific, this is why
board_id support files are being moved from the cr50 board scope to
the g chip scope.
BRANCH=cr50
BUG=b:35587387,b:35587053
TEST=observed expected output in the version command:
> bid
Board ID: 000000fa, flags 000000ff
> vers
Chip: g cr50 B2-C
Board: 0
RO_A: * 0.0.10/29d77172
RO_B: 0.0.10/c2a3f8f9
RW_A: * 0.0.20/DBG/cr50_v1.1.6542-856c3aff4
RW_B: 0.0.20/DBG/cr50_v1.1.6543-2c68a2630+
BID A: 00000000:00000000:00000000 Yes
BID B: 000000ea:0000fffc:000000ff No
Build: 0.0.20/DBG/cr50_v1.1.6542-856c3aff4
tpm2:v0.0.289-cb2de5a
cryptoc:v0.0.8-6283eee
2017-06-09 15:34:19 vbendeb@eskimo.mtv.corp.google.com
>
Change-Id: I5b283abf304a7408ca8f424407044fca238185e1
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/530033
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/config.h | 12 | ||||
| -rw-r--r-- | include/system.h | 7 |
2 files changed, 19 insertions, 0 deletions
diff --git a/include/config.h b/include/config.h index cff891a433..26bf0fb8f2 100644 --- a/include/config.h +++ b/include/config.h @@ -2764,6 +2764,18 @@ */ #undef CONFIG_PWR_STATE_DISCHARGE_FULL +/* + * Define this if a chip needs to add some information to the common 'version' + * command output. + */ +#undef CONFIG_EXTENDED_VERSION_INFO + +/* + * Define this if board ID support is required. For g chip based boards it + * allows to nail different images to different boards. + */ +#undef CONFIG_BOARD_ID_SUPPORT + /*****************************************************************************/ /* * Include board and core configs, since those hold the CONFIG_ constants for a diff --git a/include/system.h b/include/system.h index 0f01907574..f40feb0e37 100644 --- a/include/system.h +++ b/include/system.h @@ -522,4 +522,11 @@ uintptr_t system_get_fw_reset_vector(uintptr_t base); */ int system_is_reboot_warm(void); +#ifdef CONFIG_EXTENDED_VERSION_INFO +void system_print_extended_version_info(void); +#else +static inline void system_print_extended_version_info(void) +{ +} +#endif #endif /* __CROS_EC_SYSTEM_H */ |