GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix how to interpret board id read from gpios 

nyan blaze fails to boot because tristates of the board id are interpreted in
the reverse order. this change fixes it.

BUG=none
TEST=Booted Blaze to Linux. Built firmware for Storm.
Branch=none
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>

Change-Id: I4ff8a15cf62869cea22931b5255c3a408a778ed2
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 3f59b13d615a8985edf2029d89af05e95aefad33
Original-Change-Id: I6d81092becb60d12e1cd2a92fc2c261da42c60f5
Original-Reviewed-on: https://chromium-review.googlesource.com/211700
Original-Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Original-Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Original-Reviewed-by: David Hendricks <dhendrix@chromium.org>
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Original-Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: http://review.coreboot.org/8980
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Daisuke Nojiri 2014-08-08 15:38:52 -07:00 committed by Patrick Georgi
parent 3760272fb9
commit 573e21132f
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/gpiolib.h
View File

@ -31,6 +31,10 @@ typedef unsigned gpio_t;
* bit fields, each representing one GPIO value, or a number where each GPIO is * bit fields, each representing one GPIO value, or a number where each GPIO is
* included multiplied by 3^gpio_num, resulting in a true tertiary value. * included multiplied by 3^gpio_num, resulting in a true tertiary value.
* *
* gpio[]: pin positions to read. little-endian (less significant value first).
* num_gpio: number of pins to read.
* tertiary: 1: pins are interpreted as a quad coded tertiary.
* 0: pins are interpreted as a set of two bit fields.
*/ */
int gpio_get_in_tristate_values(gpio_t gpio[], int num_gpio, int tertiary); int gpio_get_in_tristate_values(gpio_t gpio[], int num_gpio, int tertiary);

2
src/lib/tristate_gpios.c
View File

@ -62,7 +62,7 @@ int gpio_get_in_tristate_values(gpio_t gpio[], int num_gpio, int tertiary)
* 1: pull up * 1: pull up
* 2: floating * 2: floating
*/ */
for (index = 0; index < num_gpio; ++index) { for (index = num_gpio - 1; index >= 0; --index) {
if (tertiary) if (tertiary)
id *= 3; id *= 3;
else else

2
src/mainboard/google/storm/boardid.c
View File

@ -40,7 +40,7 @@
uint8_t board_id(void) uint8_t board_id(void)
{ {
uint8_t bid; uint8_t bid;
gpio_t hw_rev_gpios[] = {68, 30, 29}; gpio_t hw_rev_gpios[] = {29, 30, 68};
int offset = 19; int offset = 19;
bid = gpio_get_in_tristate_values(hw_rev_gpios, bid = gpio_get_in_tristate_values(hw_rev_gpios,