From a4ab665a556da24929ec1537901b38fbe9f4252b Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Mon, 25 Sep 2017 08:06:56 -0700 Subject: 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 Reviewed-on: https://review.coreboot.org/21682 Tested-by: build bot (Jenkins) Reviewed-by: Sumeet R Pawnikar Reviewed-by: Aaron Durbin --- src/mainboard/google/fizz/Kconfig | 1 + src/mainboard/google/fizz/Makefile.inc | 2 -- src/mainboard/google/fizz/boardid.c | 27 --------------------------- 3 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 src/mainboard/google/fizz/boardid.c (limited to 'src/mainboard/google/fizz') diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig index 107af9ad38..61158c91a4 100644 --- a/src/mainboard/google/fizz/Kconfig +++ b/src/mainboard/google/fizz/Kconfig @@ -7,6 +7,7 @@ config BOARD_SPECIFIC_OPTIONS select DRIVERS_I2C_GENERIC select DRIVERS_SPI_ACPI select EC_GOOGLE_CHROMEEC + select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_LPC select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES diff --git a/src/mainboard/google/fizz/Makefile.inc b/src/mainboard/google/fizz/Makefile.inc index d74b70782d..534968cbf5 100644 --- a/src/mainboard/google/fizz/Makefile.inc +++ b/src/mainboard/google/fizz/Makefile.inc @@ -18,10 +18,8 @@ bootblock-$(CONFIG_CHROMEOS) += chromeos.c verstage-$(CONFIG_CHROMEOS) += chromeos.c -romstage-y += boardid.c romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-y += boardid.c ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c ramstage-y += mainboard.c diff --git a/src/mainboard/google/fizz/boardid.c b/src/mainboard/google/fizz/boardid.c deleted file mode 100644 index 440a5a9f07..0000000000 --- a/src/mainboard/google/fizz/boardid.c +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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; -} -- cgit v1.2.3