diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-09 17:05:05 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:51:06 +0000 |
| commit | 5402eb74eaec24a351e66ee6e2898db17c489923 (patch) | |
| tree | 325edd1dd82c94f1db0a9f238f3065dd44313696 /include/config.h | |
| parent | 431b1b6b8fe1162a889237b5b511400d5932e1ff (diff) | |
| download | chrome-ec-5402eb74eaec24a351e66ee6e2898db17c489923.tar.gz | |
Revert "system: update board version to return an error if encountered"
This reverts commit ff9248fbaabef72761728140c2e65d0aa02dc17c.
BUG=b:200823466
TEST=make buildall -j
Change-Id: I22ffe8ff8bc88e88c21c285ed0cc3bed432d6463
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273428
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Diffstat (limited to 'include/config.h')
| -rw-r--r-- | include/config.h | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/include/config.h b/include/config.h index db6186d47b..651b643ede 100644 --- a/include/config.h +++ b/include/config.h @@ -575,21 +575,10 @@ */ #undef CONFIG_BOARD_PRE_INIT -/* - * EC has the notion of board version either through resistors or EEPROM. - * The common CONFIG_BOARD_VERSION is defined automatically when one of the - * specific options is used. - */ +/* EC has GPIOs attached to board version stuffing resistors */ #undef CONFIG_BOARD_VERSION -/* The board version comes from Cros Board Info within EEPROM. */ -#undef CONFIG_BOARD_VERSION_CBI -/* The board version function is defined in board code. */ -#undef CONFIG_BOARD_VERSION_CUSTOM -/* - * The board version is encoded with 3 GPIO signals where GPIO_BOARD_VERSION1 - * is the LSB. - */ -#undef CONFIG_BOARD_VERSION_GPIO +/* The decoding of the GPIOs defining board version is defined in board code */ +#undef CONFIG_BOARD_SPECIFIC_VERSION /* * The board is unable to distinguish EC reset from power-on so it should treat @@ -4324,19 +4313,6 @@ #define CONFIG_CRC8 #endif /* defined(CONFIG_EXPERIMENTAL_CONSOLE) */ - -/******************************************************************************/ -/* - * Automatically define common CONFIG_BOARD_VERSION if any specific option is - * used. - */ - -#if defined(CONFIG_BOARD_VERSION_CBI) || \ - defined(CONFIG_BOARD_VERSION_CUSTOM) || \ - defined(CONFIG_BOARD_VERSION_GPIO) -#define CONFIG_BOARD_VERSION -#endif - /******************************************************************************/ /* * Thermal throttling AP must have temperature sensor enabled to get |