summaryrefslogtreecommitdiff
path: root/src/mainboard/google/poppy/variants/baseboard
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/poppy/variants/baseboard
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/poppy/variants/baseboard')
-rw-r--r--src/mainboard/google/poppy/variants/baseboard/Makefile.inc2
-rw-r--r--src/mainboard/google/poppy/variants/baseboard/boardid.c22
-rw-r--r--src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h3
3 files changed, 0 insertions, 27 deletions
diff --git a/src/mainboard/google/poppy/variants/baseboard/Makefile.inc b/src/mainboard/google/poppy/variants/baseboard/Makefile.inc
index b1f70b1ce1..1d25510dff 100644
--- a/src/mainboard/google/poppy/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/poppy/variants/baseboard/Makefile.inc
@@ -1,8 +1,6 @@
bootblock-y += gpio.c
-romstage-y += boardid.c
romstage-y += memory.c
-ramstage-y += boardid.c
ramstage-y += gpio.c
ramstage-y += nhlt.c
diff --git a/src/mainboard/google/poppy/variants/baseboard/boardid.c b/src/mainboard/google/poppy/variants/baseboard/boardid.c
deleted file mode 100644
index 1cb084ac50..0000000000
--- a/src/mainboard/google/poppy/variants/baseboard/boardid.c
+++ /dev/null
@@ -1,22 +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 <ec/google/chromeec/ec.h>
-
-uint8_t __attribute__((weak)) variant_board_id(void)
-{
- return google_chromeec_get_board_version();
-}
diff --git a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h
index f25d34f4ed..62389afaae 100644
--- a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h
@@ -20,9 +20,6 @@
#include <stdint.h>
#include <vendorcode/google/chromeos/chromeos.h>
-/* Return the board id for the current variant board. */
-uint8_t variant_board_id(void);
-
/*
* The next set of functions return the gpio table and fill in the number of
* entries for each table.