GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/herobrine: Fix board id 

The board id assignment CL (CB:56642) landed after
BOARD_GOOGLE_HEROBRINE has been deprecated to
BOARD_GOOGLE_HEROBRINE_REV0 (CB:60284). Fix it to accomodate for the
GOOGLE_HEROBRINE_REV0 board updates.

BUG=b:211644878
BRANCH=None
TEST=built all variants of herobrine to make sure it compiles.

For reference:
=============
CB:56642:

commit 8b63dac061
Author: Ravi Kumar Bokka <rbokka@codeaurora.org>
Date:   Tue Jul 27 19:29:18 2021 +0530

google/herobrine: configure gpio to detect board ID
=============
CB:60284:

commit 8bdbe23a93
Author: Shelley Chen <shchen@google.com>
Date:   Tue Dec 21 13:17:33 2021 -0800

mb/google/herobrine: Transition BOARD_HEROBRINE to BOARD_HEROBRINE_REV0
=============

Change-Id: I6dab994e65eadff303eb88a63b8dd81e19694678
Signed-off-by: Shelley Chen <shchen@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60805
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Shelley Chen 2022-01-05 13:02:59 -08:00
parent fc7a40fad9
commit f58ce3bdaa
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mainboard/google/herobrine/boardid.c
View File

@ -11,12 +11,11 @@ uint32_t board_id(void)
{ {
static uint32_t id = UNDEFINED_STRAPPING_ID; static uint32_t id = UNDEFINED_STRAPPING_ID;
gpio_t pins[3] = { 0 }; gpio_t pins[3] = { 0 };
if (CONFIG(BOARD_GOOGLE_HEROBRINE)) { if (CONFIG(BOARD_GOOGLE_HEROBRINE_REV0)) {
pins[2] = GPIO(75); pins[2] = GPIO(75);
pins[1] = GPIO(74); pins[1] = GPIO(74);
pins[0] = GPIO(73); pins[0] = GPIO(73);
} else if (CONFIG(BOARD_GOOGLE_PIGLIN) || CONFIG(BOARD_GOOGLE_HOGLIN) } else {
|| CONFIG(BOARD_GOOGLE_SENOR)) {
pins[2] = GPIO(50); pins[2] = GPIO(50);
pins[1] = GPIO(49); pins[1] = GPIO(49);
pins[0] = GPIO(48); pins[0] = GPIO(48);