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@chromium.org>
Original-Commit-Id: 7e055ef27ef1e07be09d80b2298384889214bf0d
Original-Change-Id: I75c7c98732c3d4569611de54d7aa149dd3b0fb7d
Original-Signed-off-by: Dan Ehrenberg <dehrenberg@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/225460
Original-Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: http://review.coreboot.org/9404
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Dan Ehrenberg 2014-10-24 13:22:05 -07:00 committed by Patrick Georgi
parent 127c3393b4
commit 644afa7047
2 changed files with 3 additions and 2 deletions

View File

@ -75,7 +75,7 @@ static void setup_mmu(void)
#define TPM_RESET_GPIO 22 #define TPM_RESET_GPIO 22
static void setup_tpm(void) 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 */ return; /* Only proto0 have TPM reset connected to GPIO22 */
gpio_tlmm_config_set(TPM_RESET_GPIO, FUNC_SEL_GPIO, GPIO_PULL_UP, 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 #define SW_RESET_GPIO 26
static void deassert_sw_reset(void) static void deassert_sw_reset(void)
{ {
if (board_id() == 0) if (board_id() == BOARD_ID_PROTO_0)
return; return;
/* /*

View File

@ -109,6 +109,7 @@ typedef struct {
enum storm_board_id { enum storm_board_id {
BOARD_ID_PROTO_0 = 0, BOARD_ID_PROTO_0 = 0,
BOARD_ID_PROTO_0_2 = 1, BOARD_ID_PROTO_0_2 = 1,
BOARD_ID_WHIRLWIND = 2,
BOARD_ID_PROTO_0_2_NAND = 26, BOARD_ID_PROTO_0_2_NAND = 26,
}; };