From 679179d7ac5d0ec062b33535b7607e48856b570a Mon Sep 17 00:00:00 2001 From: Mary Ruthven Date: Fri, 14 Jan 2022 10:54:35 -0600 Subject: H1_RED_BOARD: unconditionally use red board brdprop BUG=none TEST=cr50 uses red board straps after power-on and hard resets. Change-Id: I0ee4a48a3e8661565dede1f7686cf6b2e1181914 Signed-off-by: Mary Ruthven Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3386406 Reviewed-by: Vadim Bendebury --- board/cr50/board.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'board/cr50/board.c') diff --git a/board/cr50/board.c b/board/cr50/board.c index cfe2d9a4d7..ea90392005 100644 --- a/board/cr50/board.c +++ b/board/cr50/board.c @@ -1587,12 +1587,13 @@ static uint32_t get_properties(void) uint8_t config; uint32_t properties; + +#ifdef H1_RED_BOARD + CPRINTS("Unconditionally enabling SPI and platform reset"); + return (BOARD_PERIPH_CONFIG_SPI | BOARD_USE_PLT_RESET); +#endif if (get_strap_config(&config) != EC_SUCCESS) { flog_brdprop_event(BRDPROP_INVALID, config); -#ifdef H1_RED_BOARD - CPRINTS("Unconditionally enabling SPI and platform reset"); - return (BOARD_PERIPH_CONFIG_SPI | BOARD_USE_PLT_RESET); -#else /* * No pullups were detected on any of the strap pins so there * is no point in checking for a matching config table entry. @@ -1601,7 +1602,6 @@ static uint32_t get_properties(void) CPRINTS("Invalid strap pins! Default properties = 0x%x", BOARD_PROPERTIES_DEFAULT); return BOARD_PROPERTIES_DEFAULT; -#endif } /* Search board config table to find a matching entry */ -- cgit v1.2.1