summaryrefslogtreecommitdiff
path: root/src/mainboard/google/zoombini
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/zoombini
parent2beadeec3512d6087ae5057da681e50883d04acf (diff)
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/zoombini')
-rw-r--r--src/mainboard/google/zoombini/boardid.c4
-rw-r--r--src/mainboard/google/zoombini/variants/baseboard/boardid.c10
-rw-r--r--src/mainboard/google/zoombini/variants/baseboard/include/baseboard/variants.h2
3 files changed, 11 insertions, 5 deletions
diff --git a/src/mainboard/google/zoombini/boardid.c b/src/mainboard/google/zoombini/boardid.c
index 4b05c52190..4e431766b2 100644
--- a/src/mainboard/google/zoombini/boardid.c
+++ b/src/mainboard/google/zoombini/boardid.c
@@ -19,9 +19,9 @@
uint32_t board_id(void)
{
- MAYBE_STATIC int id = -1;
+ MAYBE_STATIC uint32_t id = BOARD_ID_INIT;
- if (id < 0)
+ if (id == BOARD_ID_INIT)
id = variant_board_id();
return id;
diff --git a/src/mainboard/google/zoombini/variants/baseboard/boardid.c b/src/mainboard/google/zoombini/variants/baseboard/boardid.c
index c8a5cf1073..21c39cf280 100644
--- a/src/mainboard/google/zoombini/variants/baseboard/boardid.c
+++ b/src/mainboard/google/zoombini/variants/baseboard/boardid.c
@@ -14,10 +14,16 @@
*/
#include <baseboard/variants.h>
+#include <boardid.h>
#include <compiler.h>
#include <ec/google/chromeec/ec.h>
-uint8_t __weak variant_board_id(void)
+int variant_board_id(void)
{
- return google_chromeec_get_board_version();
+ uint32_t id = BOARD_ID_INIT;
+
+ if (google_chromeec_get_board_version(&id))
+ id = BOARD_ID_UNKNOWN;
+
+ return id;
}
diff --git a/src/mainboard/google/zoombini/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/zoombini/variants/baseboard/include/baseboard/variants.h
index eac0feea6f..e8c7c20601 100644
--- a/src/mainboard/google/zoombini/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/zoombini/variants/baseboard/include/baseboard/variants.h
@@ -23,7 +23,7 @@
#include <vendorcode/google/chromeos/chromeos.h>
/* Return the board id for the current variant board. */
-uint8_t variant_board_id(void);
+int variant_board_id(void);
/*
* The next set of functions return the gpio table and fill in the number of