[coreboot-gerrit] New patch to review for coreboot: 7d7667a google/storm: Minor board ID changes

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9404

-gerrit

commit 7d7667a301fdd92a977830e61024fb785d6a3410
Author: Dan Ehrenberg <dehrenberg at chromium.org>
Date:   Fri Oct 24 13:22:05 2014 -0700

    google/storm: Minor board ID changes
    
    - Add the Whirlwind board ID to the enum
    - Replace comparisons of the board ID with 0 to the proto0 constant
    
    TEST=Booted Storm with this coreboot version
    BUG=none
    BRANCH=none
    
    Change-Id: I53be0b06c3444936a8bd67653e03b93bcb87e328
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 7e055ef27ef1e07be09d80b2298384889214bf0d
    Original-Change-Id: I75c7c98732c3d4569611de54d7aa149dd3b0fb7d
    Original-Signed-off-by: Dan Ehrenberg <dehrenberg at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/225460
    Original-Reviewed-by: Vadim Bendebury <vbendeb at chromium.org>
---
 src/mainboard/google/storm/mainboard.c     | 4 ++--
 src/soc/qualcomm/ipq806x/include/soc/cdp.h | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mainboard/google/storm/mainboard.c b/src/mainboard/google/storm/mainboard.c
index 5ff0b13..0042050 100644
--- a/src/mainboard/google/storm/mainboard.c
+++ b/src/mainboard/google/storm/mainboard.c
@@ -75,7 +75,7 @@ static void setup_mmu(void)
 #define TPM_RESET_GPIO 22
 static void setup_tpm(void)
 {
-	if (board_id() != 0)
+	if (board_id() != BOARD_ID_PROTO_0)
 		return; /* Only proto0 have TPM reset connected to GPIO22 */
 
 	gpio_tlmm_config_set(TPM_RESET_GPIO, FUNC_SEL_GPIO, GPIO_PULL_UP,
@@ -93,7 +93,7 @@ static void setup_tpm(void)
 #define SW_RESET_GPIO 26
 static void deassert_sw_reset(void)
 {
-	if (board_id() == 0)
+	if (board_id() == BOARD_ID_PROTO_0)
 		return;
 
 	/*
diff --git a/src/soc/qualcomm/ipq806x/include/soc/cdp.h b/src/soc/qualcomm/ipq806x/include/soc/cdp.h
index bb2151c..b705f3e 100644
--- a/src/soc/qualcomm/ipq806x/include/soc/cdp.h
+++ b/src/soc/qualcomm/ipq806x/include/soc/cdp.h
@@ -109,6 +109,7 @@ typedef struct {
 enum storm_board_id {
 	BOARD_ID_PROTO_0 = 0,
 	BOARD_ID_PROTO_0_2 = 1,
+	BOARD_ID_WHIRLWIND = 2,
 	BOARD_ID_PROTO_0_2_NAND = 26,
 };