diff options
| author | Karthikeyan Ramasubramanian <kramasub@chromium.org> | 2018-09-14 11:44:48 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2018-09-20 17:15:53 +0000 |
| commit | e209b96e53bfdee11444ab68eefc70b1f2a3469e (patch) | |
| tree | 61f9d59e8c37602e1dfa11a08a70c81badbc0071 /src/mainboard/google/zoombini/variants | |
| parent | c80ff8437d61f0867eccc520cc68d19fe181af14 (diff) | |
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/zoombini/variants')
| -rw-r--r-- | src/mainboard/google/zoombini/variants/baseboard/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/mainboard/google/zoombini/variants/baseboard/boardid.c | 29 |
2 files changed, 0 insertions, 32 deletions
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; -} |