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>
This commit is contained in:
Karthikeyan Ramasubramanian
2018-09-17 16:19:34 -06:00
committed by Martin Roth
parent 2beadeec35
commit c80ff8437d
13 changed files with 72 additions and 22 deletions

View File

@@ -14,13 +14,21 @@
*/
#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)
{
if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC))
return google_chromeec_get_board_version();
else
MAYBE_STATIC uint32_t id = BOARD_ID_INIT;
if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)) {
if (id == BOARD_ID_INIT) {
if (google_chromeec_get_board_version(&id))
id = BOARD_ID_UNKNOWN;
}
return id;
} else {
return 0;
}
}

View File

@@ -21,8 +21,12 @@
#include <stdint.h>
#include <vendorcode/google/chromeos/chromeos.h>
/* Return the board id for the current variant board. */
uint8_t variant_board_id(void);
/**
* variant_board_id() - Get the board id for the current board variant
*
* Return: board id on success, -1 on failure/error.
*/
int variant_board_id(void);
/* The next set of functions return the gpio table and fill in the number of
* entries for each table. */