diff options
Diffstat (limited to 'src/mainboard/intel/strago')
| -rw-r--r-- | src/mainboard/intel/strago/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/intel/strago/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/strago/boardid.c | 30 |
3 files changed, 1 insertions, 32 deletions
diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig index 44ca249dc9..bef0e63c78 100644 --- a/src/mainboard/intel/strago/Kconfig +++ b/src/mainboard/intel/strago/Kconfig @@ -4,6 +4,7 @@ config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC + select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP select ENABLE_BUILTIN_COM1 diff --git a/src/mainboard/intel/strago/Makefile.inc b/src/mainboard/intel/strago/Makefile.inc index 5ba7bcce8d..bbef8b956e 100644 --- a/src/mainboard/intel/strago/Makefile.inc +++ b/src/mainboard/intel/strago/Makefile.inc @@ -14,11 +14,9 @@ ## GNU General Public License for more details. ## -romstage-y += boardid.c romstage-$(CONFIG_MAINBOARD_HAS_CHROMEOS) += chromeos.c romstage-$(CONFIG_ENABLE_BUILTIN_COM1) += com_init.c -ramstage-y += boardid.c ramstage-$(CONFIG_MAINBOARD_HAS_CHROMEOS) += chromeos.c ramstage-$(CONFIG_MAINBOARD_HAS_CHROMEOS) += ec.c ramstage-$(CONFIG_MAINBOARD_HAS_CHROMEOS) += gpio.c diff --git a/src/mainboard/intel/strago/boardid.c b/src/mainboard/intel/strago/boardid.c deleted file mode 100644 index b531778531..0000000000 --- a/src/mainboard/intel/strago/boardid.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright(C) 2013 Google Inc. - * Copyright (C) 2015 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 <boardid.h> -#include <stdlib.h> -#include "ec/google/chromeec/ec.h" - -uint8_t board_id(void) -{ - MAYBE_STATIC int id = -1; - -#if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC) - if (id < 0) - id = google_chromeec_get_board_version(); -#endif - return id; -} |