summaryrefslogtreecommitdiff
path: root/src/mainboard/google/auron
diff options
context:
space:
mode:
authorKarthikeyan Ramasubramanian <kramasub@chromium.org>2018-09-17 16:19:34 -0600
committerMartin Roth <martinroth@google.com>2018-09-20 17:15:26 +0000
commitc80ff8437d61f0867eccc520cc68d19fe181af14 (patch)
treefd94a2103e48b08c5df10421952a945bc7d68a9e /src/mainboard/google/auron
parent2beadeec3512d6087ae5057da681e50883d04acf (diff)
downloadcoreboot-c80ff8437d61f0867eccc520cc68d19fe181af14.tar.xz
ec/google/chromeec: Update google_chromeec_get_board_version prototype
The helper function to get the board version from EC returns 0 on failure. But 0 is also a valid board version. Update the helper function to return -1 on failure and update the use-cases. BUG=b:114001972,b:114677884,b:114677887 Change-Id: I93e8dbce2ff26e76504b132055985f53cbf07d31 Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com> Tested-by: Karthikeyan Ramasubramanian <kramasub@google.com> Reviewed-on: https://review.coreboot.org/28576 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Jett Rink <jettrink@google.com>
Diffstat (limited to 'src/mainboard/google/auron')
-rw-r--r--src/mainboard/google/auron/variants/samus/board_version.c5
-rw-r--r--src/mainboard/google/auron/variants/samus/include/variant/board_version.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/mainboard/google/auron/variants/samus/board_version.c b/src/mainboard/google/auron/variants/samus/board_version.c
index c45b84e9e2..dfb7c248a1 100644
--- a/src/mainboard/google/auron/variants/samus/board_version.c
+++ b/src/mainboard/google/auron/variants/samus/board_version.c
@@ -18,7 +18,10 @@
const char *samus_board_version(void)
{
- switch (google_chromeec_get_board_version()) {
+ uint32_t board_version = SAMUS_EC_BOARD_VERSION_UNKNOWN;
+
+ google_chromeec_get_board_version(&board_version);
+ switch (board_version) {
case SAMUS_EC_BOARD_VERSION_EVT1:
return "EVT1";
case SAMUS_EC_BOARD_VERSION_EVT2:
diff --git a/src/mainboard/google/auron/variants/samus/include/variant/board_version.h b/src/mainboard/google/auron/variants/samus/include/variant/board_version.h
index f5371a19fa..55c8360b0a 100644
--- a/src/mainboard/google/auron/variants/samus/include/variant/board_version.h
+++ b/src/mainboard/google/auron/variants/samus/include/variant/board_version.h
@@ -16,10 +16,13 @@
#ifndef SAMUS_BOARD_VERSION_H
#define SAMUS_BOARD_VERSION_H
+#include <boardid.h>
+
#define SAMUS_EC_BOARD_VERSION_EVT1 3
#define SAMUS_EC_BOARD_VERSION_EVT2 4
#define SAMUS_EC_BOARD_VERSION_EVT3 5
#define SAMUS_EC_BOARD_VERSION_EVT4 0
+#define SAMUS_EC_BOARD_VERSION_UNKNOWN BOARD_ID_UNKNOWN
const char *samus_board_version(void);