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 --- .../google/poppy/variants/baseboard/Makefile.inc | 2 -- .../google/poppy/variants/baseboard/boardid.c | 22 ---------------------- .../baseboard/include/baseboard/variants.h | 3 --- 3 files changed, 27 deletions(-) delete mode 100644 src/mainboard/google/poppy/variants/baseboard/boardid.c (limited to 'src/mainboard/google/poppy/variants/baseboard') 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 -#include - -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 #include -/* 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. -- cgit v1.2.3