diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2013-07-08 14:10:38 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-07-09 15:21:26 -0700 |
| commit | aca89b05bbbdb760cf3d85d47c4e1f32371c779f (patch) | |
| tree | 9431759bdd92505d86aaf211b5b70a163c4c8af8 | |
| parent | ab59576a43a9fbfc97e382629416bdee90d1019d (diff) | |
| download | chrome-ec-aca89b05bbbdb760cf3d85d47c4e1f32371c779f.tar.gz | |
Add CONFIG_BOARD_VERSION flag for boards which have version strapping.
Rather than implementing board version only for Link, implement for each
board which has version strapping.
BUG=chrome-os-partner:20295.
TEST=Manual. Run "ver" command on Peppy, verify correct board version is
returned.
BRANCH=None.
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: I57656a645c6bcd1fdb2e7e4aba91b4ec4b8ad8ec
Reviewed-on: https://gerrit.chromium.org/gerrit/61186
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Dave Parker <dparker@chromium.org>
Tested-by: Shawn Nematbakhsh <shawnn@chromium.org>
Commit-Queue: Shawn Nematbakhsh <shawnn@chromium.org>
| -rw-r--r-- | board/falco/board.h | 1 | ||||
| -rw-r--r-- | board/link/board.h | 1 | ||||
| -rw-r--r-- | board/peppy/board.h | 1 | ||||
| -rw-r--r-- | board/slippy/board.h | 1 | ||||
| -rw-r--r-- | common/system_common.c | 2 |
5 files changed, 5 insertions, 1 deletions
diff --git a/board/falco/board.h b/board/falco/board.h index 58828c0e7c..42f64f30da 100644 --- a/board/falco/board.h +++ b/board/falco/board.h @@ -17,6 +17,7 @@ /* Optional features */ #define CONFIG_SMART_BATTERY #define CONFIG_BATTERY_FALCO +#define CONFIG_BOARD_VERSION #define CONFIG_CHARGER #define CONFIG_CHARGER_BQ24738 #ifdef HAS_TASK_CHIPSET diff --git a/board/link/board.h b/board/link/board.h index 6da09f61e5..c451d1269b 100644 --- a/board/link/board.h +++ b/board/link/board.h @@ -17,6 +17,7 @@ /* Optional features */ #define CONFIG_SMART_BATTERY #define CONFIG_BATTERY_LINK +#define CONFIG_BOARD_VERSION #define CONFIG_CHARGER #define CONFIG_CHARGER_BQ24725 #ifdef HAS_TASK_CHIPSET diff --git a/board/peppy/board.h b/board/peppy/board.h index f69effda35..efcc467198 100644 --- a/board/peppy/board.h +++ b/board/peppy/board.h @@ -17,6 +17,7 @@ /* Optional features */ #define CONFIG_SMART_BATTERY #define CONFIG_BATTERY_PEPPY +#define CONFIG_BOARD_VERSION #define CONFIG_CHARGER #define CONFIG_CHARGER_BQ24707A #ifdef HAS_TASK_CHIPSET diff --git a/board/slippy/board.h b/board/slippy/board.h index 89b69ca2e1..7ea26b4139 100644 --- a/board/slippy/board.h +++ b/board/slippy/board.h @@ -17,6 +17,7 @@ /* Optional features */ #define CONFIG_SMART_BATTERY #define CONFIG_BATTERY_SLIPPY +#define CONFIG_BOARD_VERSION #define CONFIG_CHARGER #define CONFIG_CHARGER_BQ24707A #ifdef HAS_TASK_CHIPSET diff --git a/common/system_common.c b/common/system_common.c index f13b368a28..e33cab8316 100644 --- a/common/system_common.c +++ b/common/system_common.c @@ -438,7 +438,7 @@ int system_get_board_version(void) { int v = 0; -#ifdef BOARD_link /* HEY: Slippy? */ +#ifdef CONFIG_BOARD_VERSION if (gpio_get_level(GPIO_BOARD_VERSION1)) v |= 0x01; if (gpio_get_level(GPIO_BOARD_VERSION2)) |