diff options
| author | Furquan Shaikh <furquan@chromium.org> | 2017-09-25 08:06:56 -0700 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2017-09-26 15:20:39 +0000 |
| commit | a4ab665a556da24929ec1537901b38fbe9f4252b (patch) | |
| tree | c38de001c6207ec7745a9e5eed776d22f7eb9566 /src/mainboard/google/glados | |
| parent | a2094835b1622039d311d76d26be0b5b456ddfc9 (diff) | |
mb/google/*: Use newly added Chrome EC boardid function
Instead of duplicating code across multiple mainboards, use newly
added helper function to read boardid from Chrome EC.
Change-Id: I1671c0a0b87d0c4c45da5340e8f17a4a798317ca
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/21682
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Sumeet R Pawnikar <sumeet.r.pawnikar@intel.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/mainboard/google/glados')
| -rw-r--r-- | src/mainboard/google/glados/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/glados/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/mainboard/google/glados/boardid.c | 28 |
3 files changed, 1 insertions, 30 deletions
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index 254e54aa53..1a19fd1bfa 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -7,6 +7,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select DRIVERS_I2C_GENERIC select DRIVERS_I2C_NAU8825 select EC_GOOGLE_CHROMEEC + select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_MEC diff --git a/src/mainboard/google/glados/Makefile.inc b/src/mainboard/google/glados/Makefile.inc index e52eb7edac..91602660c4 100644 --- a/src/mainboard/google/glados/Makefile.inc +++ b/src/mainboard/google/glados/Makefile.inc @@ -17,7 +17,6 @@ subdirs-y += spd bootblock-y += bootblock_mainboard.c -romstage-y += boardid.c romstage-y += pei_data.c bootblock-$(CONFIG_CHROMEOS) += chromeos.c @@ -27,7 +26,6 @@ ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c -ramstage-y += boardid.c ramstage-y += mainboard.c ramstage-y += pei_data.c ramstage-y += ramstage.c diff --git a/src/mainboard/google/glados/boardid.c b/src/mainboard/google/glados/boardid.c deleted file mode 100644 index 4eb9f4869d..0000000000 --- a/src/mainboard/google/glados/boardid.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2015 Google Inc. - * Copyright (C) 2015 Intel Corporation - * - * 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 <boardid.h> -#include <ec/google/chromeec/ec.h> - -uint8_t board_id(void) -{ - MAYBE_STATIC int id = -1; - - if (id < 0) - id = google_chromeec_get_board_version(); - - return id; -} |