summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
authorKarthikeyan Ramasubramanian <kramasub@chromium.org>2018-09-14 11:44:48 -0600
committerMartin Roth <martinroth@google.com>2018-09-20 17:15:53 +0000
commite209b96e53bfdee11444ab68eefc70b1f2a3469e (patch)
tree61f9d59e8c37602e1dfa11a08a70c81badbc0071 /src/mainboard/google
parentc80ff8437d61f0867eccc520cc68d19fe181af14 (diff)
downloadcoreboot-e209b96e53bfdee11444ab68eefc70b1f2a3469e.tar.xz
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@codeaurora.org> Tested-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org> Reviewed-on: https://review.coreboot.org/28609 Reviewed-by: Jett Rink <jettrink@google.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/zoombini/Kconfig1
-rw-r--r--src/mainboard/google/zoombini/Makefile.inc2
-rw-r--r--src/mainboard/google/zoombini/boardid.c28
-rw-r--r--src/mainboard/google/zoombini/variants/baseboard/Makefile.inc3
-rw-r--r--src/mainboard/google/zoombini/variants/baseboard/boardid.c29
5 files changed, 1 insertions, 62 deletions
diff --git a/src/mainboard/google/zoombini/Kconfig b/src/mainboard/google/zoombini/Kconfig
index 656d8b0b70..249b028340 100644
--- a/src/mainboard/google/zoombini/Kconfig
+++ b/src/mainboard/google/zoombini/Kconfig
@@ -7,6 +7,7 @@ config BOARD_GOOGLE_BASEBOARD_ZOOMBINI
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 241cfe251b..d4e9fd4b4f 100644
--- a/src/mainboard/google/zoombini/Makefile.inc
+++ b/src/mainboard/google/zoombini/Makefile.inc
@@ -19,12 +19,10 @@ bootblock-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
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 4e431766b2..0000000000
--- a/src/mainboard/google/zoombini/boardid.c
+++ /dev/null
@@ -1,28 +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 <baseboard/variants.h>
-#include <boardid.h>
-#include <stddef.h>
-
-uint32_t board_id(void)
-{
- MAYBE_STATIC uint32_t id = BOARD_ID_INIT;
-
- if (id == BOARD_ID_INIT)
- id = variant_board_id();
-
- return id;
-}
diff --git a/src/mainboard/google/zoombini/variants/baseboard/Makefile.inc b/src/mainboard/google/zoombini/variants/baseboard/Makefile.inc
index 66ff5f1a60..d81101ab64 100644
--- a/src/mainboard/google/zoombini/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/zoombini/variants/baseboard/Makefile.inc
@@ -15,8 +15,5 @@
bootblock-y += gpio.c
-romstage-y += boardid.c
-
-ramstage-y += boardid.c
ramstage-y += gpio.c
ramstage-y += nhlt.c
diff --git a/src/mainboard/google/zoombini/variants/baseboard/boardid.c b/src/mainboard/google/zoombini/variants/baseboard/boardid.c
deleted file mode 100644
index 21c39cf280..0000000000
--- a/src/mainboard/google/zoombini/variants/baseboard/boardid.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 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 <baseboard/variants.h>
-#include <boardid.h>
-#include <compiler.h>
-#include <ec/google/chromeec/ec.h>
-
-int variant_board_id(void)
-{
- uint32_t id = BOARD_ID_INIT;
-
- if (google_chromeec_get_board_version(&id))
- id = BOARD_ID_UNKNOWN;
-
- return id;
-}