From c06a962271053d1fbb280e28e1cd5788132d942c Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 5 Nov 2014 14:10:56 -0600 Subject: [PATCH] ryu: update board id definitions There are changes in upcoming board revs that need to take different action depending on board revision. Update the enumeration to reflect upcoming reality. BUG=chrome-os-partner:33578 BRANCH=None TEST=Built and booted. Change-Id: Ib51393e04d3255bbd44e5d77a2a7903109beebf4 Signed-off-by: Patrick Georgi Original-Commit-Id: de8d629678c0ae17af9f7145e04d95f43c927ee0 Original-Change-Id: I64cdeab806e7a665051f1d47bbf044413f7a1196 Original-Signed-off-by: Aaron Durbin Original-Reviewed-on: https://chromium-review.googlesource.com/227681 Original-Reviewed-by: Furquan Shaikh Reviewed-on: http://review.coreboot.org/9407 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer Reviewed-by: Paul Menzel --- src/mainboard/google/rush_ryu/gpio.h | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/mainboard/google/rush_ryu/gpio.h b/src/mainboard/google/rush_ryu/gpio.h index 2792ec389f..839edc04d0 100644 --- a/src/mainboard/google/rush_ryu/gpio.h +++ b/src/mainboard/google/rush_ryu/gpio.h @@ -21,15 +21,27 @@ #define __MAINBOARD_GOOGLE_RUSH_RYU_GPIO_H__ #include +#include /* Board ID definitions. */ enum { - BOARD_ID_PROTO_0 = 0, - BOARD_ID_PROTO_1 = 1, - BOARD_ID_EVT = 2, - BOARD_ID_DVT = 3, - BOARD_ID_PVT = 4, - BOARD_ID_MP = 5, + BOARD_REV0 = BASE3(0, 0), + BOARD_REV1 = BASE3(0, 1), + BOARD_REV2 = BASE3(0, Z), + BOARD_REV3 = BASE3(1, 0), + BOARD_REV4 = BASE3(1, 1), + BOARD_REV5 = BASE3(1, Z), + BOARD_REV6 = BASE3(Z, 0), + BOARD_REV7 = BASE3(Z, 1), + BOARD_REV8 = BASE3(Z, Z), + + BOARD_ID_PROTO_0 = BOARD_REV0, + BOARD_ID_PROTO_1 = BOARD_REV1, + BOARD_ID_PROTO_3 = BOARD_REV2, + BOARD_ID_EVT = BOARD_REV3, + BOARD_ID_DVT = BOARD_REV4, + BOARD_ID_PVT = BOARD_REV5, + BOARD_ID_MP = BOARD_REV6, }; enum {