Generalize revision number calculation function

Some platforms use tertiary interpretation of GPIO input state to
increase number of distinct values represented by a limited number of
GPIOs. The three states are

- external pull down (interpreted as 0)
- external pull up (1)
- not connected (2)

This has been required by Nvidia devices so far, but Exynos and
Ipq8086 platforms need this too.

This patch moves the function reading the tertiary state into the
library and exposes the necessary GPIO API functions in a new include
file. The functions are still supposed to be provided by platform
specific modules.

The function interpreting the GPIO states has been modified to allow
to interpret the state either as a true tertiary number or as a set
two bit fields.

Since linker garbage collection is not happening when building x86
targets, a new configuration option is being added to include the new
module only when needed.

BUG=chrome-os-partner:30489
TEST=verified that nyan_big still reports proper revision ID.

Change-Id: Ib55122c359629b58288c1022da83e6c63dc2264d
Original-Change-Id: I243c9f43c82bd4a41de2154bbdbd07df0a241046
Original-Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/209673
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
(cherry picked from commit c79ef1c545d073eaad69e6c8c629f9656b8c2f3e)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-on: http://review.coreboot.org/8717
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>

2 files changed, 2 insertions, 14 deletions

diff --git a/src/mainboard/google/nyan_big/boardid.c b/src/mainboard/google/nyan_big/boardid.c
index c7bd2e6a1d..c79af45812 100644
--- a/src/mainboard/google/nyan_big/boardid.c
+++ b/src/mainboard/google/nyan_big/boardid.c
@@ -29,15 +29,9 @@ uint8_t board_id(void)
 
 	if (id < 0) {
 		gpio_t gpio[] = {GPIO(Q3), GPIO(T1), GPIO(X1), GPIO(X4)};
-		int value[ARRAY_SIZE(gpio)];
 
-		gpio_get_in_tristate_values(gpio, ARRAY_SIZE(gpio), value);
+		id = gpio_board_id(gpio, ARRAY_SIZE(gpio), 0);
 
-		/* A gpio state is encoded in every two-bit */
-		id = value[0] << 0 |
-		     value[1] << 2 |
-		     value[2] << 4 |
-		     value[3] << 6;
 		printk(BIOS_SPEW, "Board TRISTATE ID: %#x.\n", id);
 	}
 
diff --git a/src/mainboard/google/nyan_blaze/boardid.c b/src/mainboard/google/nyan_blaze/boardid.c
index c7bd2e6a1d..c79af45812 100644
--- a/src/mainboard/google/nyan_blaze/boardid.c
+++ b/src/mainboard/google/nyan_blaze/boardid.c
@@ -29,15 +29,9 @@ uint8_t board_id(void)
 
 	if (id < 0) {
 		gpio_t gpio[] = {GPIO(Q3), GPIO(T1), GPIO(X1), GPIO(X4)};
-		int value[ARRAY_SIZE(gpio)];
 
-		gpio_get_in_tristate_values(gpio, ARRAY_SIZE(gpio), value);
+		id = gpio_board_id(gpio, ARRAY_SIZE(gpio), 0);
 
-		/* A gpio state is encoded in every two-bit */
-		id = value[0] << 0 |
-		     value[1] << 2 |
-		     value[2] << 4 |
-		     value[3] << 6;
 		printk(BIOS_SPEW, "Board TRISTATE ID: %#x.\n", id);
 	}