summaryrefslogtreecommitdiff
path: root/src/mainboard/google/slippy/variants
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/slippy/variants
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/slippy/variants')
-rw-r--r--src/mainboard/google/slippy/variants/peppy/romstage.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mainboard/google/slippy/variants/peppy/romstage.c b/src/mainboard/google/slippy/variants/peppy/romstage.c
index bf21cbc6fc..e0162b311e 100644
--- a/src/mainboard/google/slippy/variants/peppy/romstage.c
+++ b/src/mainboard/google/slippy/variants/peppy/romstage.c
@@ -78,6 +78,7 @@ static void copy_spd(struct pei_data *peid)
char *spd_file;
size_t spd_file_len;
size_t spd_len = sizeof(peid->spd_data[0]);
+ uint32_t board_version = PEPPY_BOARD_VERSION_PROTO;
printk(BIOS_DEBUG, "SPD index %d\n", spd_index);
spd_file = cbfs_boot_map_with_leak("spd.bin", CBFS_TYPE_SPD,
@@ -95,7 +96,8 @@ static void copy_spd(struct pei_data *peid)
memcpy(peid->spd_data[0], spd_file + (spd_index * spd_len), spd_len);
- switch (google_chromeec_get_board_version()) {
+ google_chromeec_get_board_version(&board_version);
+ switch (board_version) {
case PEPPY_BOARD_VERSION_PROTO:
/* Index 0 is 2GB config with CH0 only. */
if (spd_index == 0)