diff options
Diffstat (limited to 'src/mainboard/google/zoombini')
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 |