From 8c2852420c0f46ab3986697a93e0f941d53f49b3 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 25 Jul 2018 09:17:27 -0600 Subject: [PATCH] mb/google/octopus: remove unused variant_board_id() The variant_board_id() API was never used on octopus because all boards in the octopus family used the EC to get board id, i.e. they all use EC_GOOGLE_CHROMEEC_BOARDID. Therefore, remove the code and declarations so as not to cause confusion. BUG=b:111808427,b:111743717 TEST=built Change-Id: I4f9a24b46dd4262120075d3d42daf22015a3dd50 Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/27635 Tested-by: build bot (Jenkins) Reviewed-by: Justin TerAvest Reviewed-by: Furquan Shaikh Reviewed-by: Paul Menzel --- .../octopus/variants/baseboard/Makefile.inc | 2 -- .../octopus/variants/baseboard/boardid.c | 23 ------------------- .../baseboard/include/baseboard/variants.h | 3 --- 3 files changed, 28 deletions(-) delete mode 100644 src/mainboard/google/octopus/variants/baseboard/boardid.c diff --git a/src/mainboard/google/octopus/variants/baseboard/Makefile.inc b/src/mainboard/google/octopus/variants/baseboard/Makefile.inc index d2d344c5e0..63b03a6118 100644 --- a/src/mainboard/google/octopus/variants/baseboard/Makefile.inc +++ b/src/mainboard/google/octopus/variants/baseboard/Makefile.inc @@ -1,9 +1,7 @@ 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/octopus/variants/baseboard/boardid.c b/src/mainboard/google/octopus/variants/baseboard/boardid.c deleted file mode 100644 index 198baaa4aa..0000000000 --- a/src/mainboard/google/octopus/variants/baseboard/boardid.c +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2018 Intel Corp. - * - * 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 -#include - -uint8_t __weak variant_board_id(void) -{ - return google_chromeec_get_board_version(); -} diff --git a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h index 4c3fbbef7b..87ab7fd2a0 100644 --- a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h @@ -21,9 +21,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. */ const struct pad_config *variant_gpio_table(size_t *num);