diff options
| author | Shelley Chen <shchen@google.com> | 2022-01-05 13:02:59 -0800 |
|---|---|---|
| committer | Shelley Chen <shchen@google.com> | 2022-01-06 22:42:53 +0000 |
| commit | f58ce3bdaaf5a7fb0047433b2d7ce18690a65058 (patch) | |
| tree | dba53f27ca85098a40e95b2ba1716fc4c7275fcc | |
| parent | fc7a40fad988102711f914b45843f80ca9b090a5 (diff) | |
| download | coreboot-f58ce3bdaaf5a7fb0047433b2d7ce18690a65058.tar.gz coreboot-f58ce3bdaaf5a7fb0047433b2d7ce18690a65058.tar.bz2 coreboot-f58ce3bdaaf5a7fb0047433b2d7ce18690a65058.zip | |
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 8b63dac06184e56ce40d82d982e983ac79163551
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 8bdbe23a93008597d99472747ba3415617f8c074
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>
| -rw-r--r-- | src/mainboard/google/herobrine/boardid.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mainboard/google/herobrine/boardid.c b/src/mainboard/google/herobrine/boardid.c index 07ea362c8489..6449561e0e34 100644 --- a/src/mainboard/google/herobrine/boardid.c +++ b/src/mainboard/google/herobrine/boardid.c @@ -11,12 +11,11 @@ uint32_t board_id(void) { static uint32_t id = UNDEFINED_STRAPPING_ID; gpio_t pins[3] = { 0 }; - if (CONFIG(BOARD_GOOGLE_HEROBRINE)) { + if (CONFIG(BOARD_GOOGLE_HEROBRINE_REV0)) { pins[2] = GPIO(75); pins[1] = GPIO(74); pins[0] = GPIO(73); - } else if (CONFIG(BOARD_GOOGLE_PIGLIN) || CONFIG(BOARD_GOOGLE_HOGLIN) - || CONFIG(BOARD_GOOGLE_SENOR)) { + } else { pins[2] = GPIO(50); pins[1] = GPIO(49); pins[0] = GPIO(48); |