[coreboot-gerrit] Change in coreboot[master]: mb/google/zoombini: Use Chrome EC BOARDID definition

[Karthik Ramasubramanian (Code Review)]

Karthik Ramasubramanian has uploaded this change for review. ( https://review.coreboot.org/28609


Change subject: mb/google/zoombini: Use Chrome EC BOARDID definition
......................................................................

mb/google/zoombini: Use Chrome EC BOARDID definition

The board_id() definition is the duplicate of chrome EC board_id
definition. Remove the duplicate definition and select
EC_GOOGLE_CHROMEEC_BOARDID Kconfig item.

BUG=b:114001972,b:114677884,b:114677887

Change-Id: Id8b7027d653649e8e5791e455652c4e893a746c2
Signed-off-by: Karthikeyan Ramasubramanian <kramasub at codeaurora.org>
Tested-by: Karthikeyan Ramasubramanian <kramasub at codeaurora.org>
---
M src/mainboard/google/zoombini/Kconfig
M src/mainboard/google/zoombini/Makefile.inc
D src/mainboard/google/zoombini/boardid.c
3 files changed, 1 insertion(+), 32 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/28609/1

diff --git a/src/mainboard/google/zoombini/Kconfig b/src/mainboard/google/zoombini/Kconfig
index 656d8b0..249b028 100644
--- a/src/mainboard/google/zoombini/Kconfig
+++ b/src/mainboard/google/zoombini/Kconfig
@@ -7,6 +7,7 @@
 	select DRIVERS_I2C_MAX98373
 	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/zoombini/Makefile.inc b/src/mainboard/google/zoombini/Makefile.inc
index 241cfe2..d4e9fd4 100644
--- a/src/mainboard/google/zoombini/Makefile.inc
+++ b/src/mainboard/google/zoombini/Makefile.inc
@@ -19,12 +19,10 @@
 
 verstage-$(CONFIG_CHROMEOS) += chromeos.c
 
-romstage-y += boardid.c
 romstage-$(CONFIG_CHROMEOS) += chromeos.c
 romstage-y += memory.c
 romstage-y += romstage.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/zoombini/boardid.c b/src/mainboard/google/zoombini/boardid.c
deleted file mode 100644
index 7c68265..0000000
--- a/src/mainboard/google/zoombini/boardid.c
+++ /dev/null
@@ -1,30 +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 <boardid.h>
-#include <stddef.h>
-#include <ec/google/chromeec/ec.h>
-
-uint32_t board_id(void)
-{
-	MAYBE_STATIC uint32_t id = BOARD_ID_INIT;
-
-	if (id == BOARD_ID_INIT) {
-		if (google_chromeec_get_board_version(&id))
-			id = BOARD_ID_UNKNOWN;
-	}
-
-	return id;
-}

-- 
To view, visit https://review.coreboot.org/28609
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8b7027d653649e8e5791e455652c4e893a746c2
Gerrit-Change-Number: 28609
Gerrit-PatchSet: 1
Gerrit-Owner: Karthik Ramasubramanian <kramasub at google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180914/d0928014/attachment.html>