diff options
| -rw-r--r-- | board/ryu/board.h | 2 | ||||
| -rw-r--r-- | common/system.c | 4 | ||||
| -rw-r--r-- | include/config.h | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/board/ryu/board.h b/board/ryu/board.h index cad44bc3dd..f765d1258c 100644 --- a/board/ryu/board.h +++ b/board/ryu/board.h @@ -21,6 +21,8 @@ /* Optional features */ #undef CONFIG_CMD_HASH +#define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_SPECIFIC_VERSION #define CONFIG_CHARGE_MANAGER #define CONFIG_CHARGE_MANAGER_DRP_CHARGING #define CONFIG_CHARGE_MANAGER_EXTERNAL_POWER_LIMIT diff --git a/common/system.c b/common/system.c index fa79b909a1..4e06d7abc2 100644 --- a/common/system.c +++ b/common/system.c @@ -597,6 +597,9 @@ int system_get_board_version(void) int v = 0; #ifdef CONFIG_BOARD_VERSION +#ifdef CONFIG_BOARD_SPECIFIC_VERSION + v = board_get_version(); +#else if (gpio_get_level(GPIO_BOARD_VERSION1)) v |= 0x01; if (gpio_get_level(GPIO_BOARD_VERSION2)) @@ -604,6 +607,7 @@ int system_get_board_version(void) if (gpio_get_level(GPIO_BOARD_VERSION3)) v |= 0x04; #endif +#endif return v; } diff --git a/include/config.h b/include/config.h index 9f0a10faf1..7dfd2779e1 100644 --- a/include/config.h +++ b/include/config.h @@ -251,6 +251,8 @@ /* EC has GPIOs attached to board version stuffing resistors */ #undef CONFIG_BOARD_VERSION +/* The decoding of the GPIOs defining board version is defined in board code */ +#undef CONFIG_BOARD_SPECIFIC_VERSION /* Permanent LM4 boot configuration */ #undef CONFIG_BOOTCFG_VALUE |