From a2094835b1622039d311d76d26be0b5b456ddfc9 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Mon, 25 Sep 2017 08:04:49 -0700 Subject: [PATCH] chromeec: Provide helper routine to read boardid from Chrome EC Instead of duplicating the code across multiple mainboards, provide a helper function to read boardid from Chrome EC. Change-Id: I2008de7032bc880e90b2c3c385b2a67bfb8724cc Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/21681 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Sumeet R Pawnikar --- src/ec/google/chromeec/Kconfig | 6 ++++++ src/ec/google/chromeec/Makefile.inc | 3 +++ src/ec/google/chromeec/ec_boardid.c | 27 +++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 src/ec/google/chromeec/ec_boardid.c diff --git a/src/ec/google/chromeec/Kconfig b/src/ec/google/chromeec/Kconfig index 3e9cb29375..f05f15749e 100644 --- a/src/ec/google/chromeec/Kconfig +++ b/src/ec/google/chromeec/Kconfig @@ -11,6 +11,12 @@ config EC_GOOGLE_CHROMEEC_ACPI_MEMMAP not defined, the memmap data is instead accessed on 900h-9ffh via the LPC bus. +config EC_GOOGLE_CHROMEEC_BOARDID + depends on EC_GOOGLE_CHROMEEC + def_bool n + help + Provides common routine for reading boardid from Chrome EC. + config EC_GOOGLE_CHROMEEC_I2C depends on EC_GOOGLE_CHROMEEC bool diff --git a/src/ec/google/chromeec/Makefile.inc b/src/ec/google/chromeec/Makefile.inc index 2fe6994884..7b43f6357d 100644 --- a/src/ec/google/chromeec/Makefile.inc +++ b/src/ec/google/chromeec/Makefile.inc @@ -1,5 +1,8 @@ ifeq ($(CONFIG_EC_GOOGLE_CHROMEEC),y) +romstage-$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDID) += ec_boardid.c +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC_BOARDID) += ec_boardid.c + bootblock-y += ec.c bootblock-$(CONFIG_EC_GOOGLE_CHROMEEC_LPC) += ec_lpc.c bootblock-$(CONFIG_EC_GOOGLE_CHROMEEC_MEC) += ec_mec.c diff --git a/src/ec/google/chromeec/ec_boardid.c b/src/ec/google/chromeec/ec_boardid.c new file mode 100644 index 0000000000..440a5a9f07 --- /dev/null +++ b/src/ec/google/chromeec/ec_boardid.c @@ -0,0 +1,27 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2017 Google Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include + +uint8_t board_id(void) +{ + MAYBE_STATIC int id = -1; + + if (id < 0) + id = google_chromeec_get_board_version(); + + return id; +}