diff --git a/src/mainboard/google/storm/mainboard.c b/src/mainboard/google/storm/mainboard.c
index 094eaef95e..32be579155 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 bb2151cd2d..b705f3e909 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,
 };