aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/google/cyan
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@chromium.org>2017-09-25 08:06:56 -0700
committerAaron Durbin <adurbin@chromium.org>2017-09-26 15:20:39 +0000
commita4ab665a556da24929ec1537901b38fbe9f4252b (patch)
treec38de001c6207ec7745a9e5eed776d22f7eb9566 /src/mainboard/google/cyan
parenta2094835b1622039d311d76d26be0b5b456ddfc9 (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/cyan')
-rw-r--r--src/mainboard/google/cyan/Kconfig1
-rw-r--r--src/mainboard/google/cyan/Makefile.inc1
-rw-r--r--src/mainboard/google/cyan/boardid.c30
3 files changed, 1 insertions, 31 deletions
diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig
index a660c2f796..c02352d5e6 100644
--- a/src/mainboard/google/cyan/Kconfig
+++ b/src/mainboard/google/cyan/Kconfig
@@ -2,6 +2,7 @@ config BOARD_GOOGLE_BASEBOARD_CYAN
def_bool n
select BOARD_ROMSIZE_KB_8192
select EC_GOOGLE_CHROMEEC
+ select EC_GOOGLE_CHROMEEC_BOARDID
select EC_GOOGLE_CHROMEEC_MEC
select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP
select ENABLE_BUILTIN_COM1
diff --git a/src/mainboard/google/cyan/Makefile.inc b/src/mainboard/google/cyan/Makefile.inc
index 01c2a91099..0b11aa3b1d 100644
--- a/src/mainboard/google/cyan/Makefile.inc
+++ b/src/mainboard/google/cyan/Makefile.inc
@@ -18,7 +18,6 @@ romstage-$(CONFIG_CHROMEOS) += chromeos.c
romstage-$(CONFIG_ENABLE_BUILTIN_COM1) += com_init.c
romstage-y += spd/spd.c
-ramstage-y += boardid.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c
ramstage-y += ec.c
ramstage-y += irqroute.c
diff --git a/src/mainboard/google/cyan/boardid.c b/src/mainboard/google/cyan/boardid.c
deleted file mode 100644
index 5364bb9a0b..0000000000
--- a/src/mainboard/google/cyan/boardid.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2013 Google Inc.
- * Copyright (C) 2015 Intel Corp.
- *
- * 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 <stdlib.h>
-#include <ec/google/chromeec/ec.h>
-
-uint8_t board_id(void)
-{
- static int id = -1;
-
-#if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)
- if (id < 0)
- id = google_chromeec_get_board_version();
-#endif
- return id;
-}