Change in coreboot[master]: mb/google/herobrine: Fix board id

[Shelley Chen (Code Review)]

Shelley Chen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60805 )

Change subject: mb/google/herobrine: Fix board id
......................................................................

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.  Fixing 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.

Change-Id: I6dab994e65eadff303eb88a63b8dd81e19694678
Signed-off-by: Shelley Chen 
---
M src/mainboard/google/herobrine/boardid.c
1 file changed, 4 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/60805/1

diff --git a/src/mainboard/google/herobrine/boardid.c b/src/mainboard/google/herobrine/boardid.c
index 07ea362..4f11a4d 100644
--- a/src/mainboard/google/herobrine/boardid.c
+++ b/src/mainboard/google/herobrine/boardid.c
@@ -9,14 +9,13 @@

uint32_t board_id(void)
 {
-	static uint32_t id = UNDEFINED_STRAPPING_ID;
+	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);
@@ -35,7 +34,7 @@

uint32_t ram_code(void)
 {
-	static uint32_t id = UNDEFINED_STRAPPING_ID;
+	uint32_t id = UNDEFINED_STRAPPING_ID;

return id;
 }