diff options
author | Patrick Georgi <pgeorgi@google.com> | 2017-01-30 17:53:34 +0100 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2017-01-31 19:21:22 +0100 |
commit | c09e148b381129748b8bd2df083722a027fa31f7 (patch) | |
tree | ec0c308ac5d3818354ffd133bc6841145cfde0d6 /src | |
parent | 78a5f22994da63bb02882aacb68cbbb70c2606ac (diff) | |
download | coreboot-c09e148b381129748b8bd2df083722a027fa31f7.tar.xz |
google/veyron*: mark GPIO array non-static
That status isn't needed and making it non-static helps gcc 4.9.2 (or
any compiler that insists on "standard C" behaviour with global const
initializers)
Change-Id: Ib1fbd5213d262e653f31564b106095b4a28292f6
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/18266
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/mainboard/google/veyron/boardid.c | 4 | ||||
-rw-r--r-- | src/mainboard/google/veyron_mickey/boardid.c | 4 | ||||
-rw-r--r-- | src/mainboard/google/veyron_rialto/boardid.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mainboard/google/veyron/boardid.c b/src/mainboard/google/veyron/boardid.c index d0456d7cc4..a610471b0c 100644 --- a/src/mainboard/google/veyron/boardid.c +++ b/src/mainboard/google/veyron/boardid.c @@ -21,7 +21,7 @@ uint8_t board_id(void) { static int id = -1; - static gpio_t pins[] = {[3] = GPIO(2, A, 7), [2] = GPIO(2, A, 2), + gpio_t pins[] = {[3] = GPIO(2, A, 7), [2] = GPIO(2, A, 2), [1] = GPIO(2, A, 1), [0] = GPIO(2, A, 0)}; /* GPIO2_A0 is LSB */ if (id < 0) { @@ -35,7 +35,7 @@ uint8_t board_id(void) uint32_t ram_code(void) { uint32_t code; - static gpio_t pins[] = {[3] = GPIO(8, A, 3), [2] = GPIO(8, A, 2), + gpio_t pins[] = {[3] = GPIO(8, A, 3), [2] = GPIO(8, A, 2), [1] = GPIO(8, A, 1), [0] = GPIO(8, A, 0)}; /* GPIO8_A0 is LSB */ code = gpio_base2_value(pins, ARRAY_SIZE(pins)); diff --git a/src/mainboard/google/veyron_mickey/boardid.c b/src/mainboard/google/veyron_mickey/boardid.c index d0456d7cc4..a610471b0c 100644 --- a/src/mainboard/google/veyron_mickey/boardid.c +++ b/src/mainboard/google/veyron_mickey/boardid.c @@ -21,7 +21,7 @@ uint8_t board_id(void) { static int id = -1; - static gpio_t pins[] = {[3] = GPIO(2, A, 7), [2] = GPIO(2, A, 2), + gpio_t pins[] = {[3] = GPIO(2, A, 7), [2] = GPIO(2, A, 2), [1] = GPIO(2, A, 1), [0] = GPIO(2, A, 0)}; /* GPIO2_A0 is LSB */ if (id < 0) { @@ -35,7 +35,7 @@ uint8_t board_id(void) uint32_t ram_code(void) { uint32_t code; - static gpio_t pins[] = {[3] = GPIO(8, A, 3), [2] = GPIO(8, A, 2), + gpio_t pins[] = {[3] = GPIO(8, A, 3), [2] = GPIO(8, A, 2), [1] = GPIO(8, A, 1), [0] = GPIO(8, A, 0)}; /* GPIO8_A0 is LSB */ code = gpio_base2_value(pins, ARRAY_SIZE(pins)); diff --git a/src/mainboard/google/veyron_rialto/boardid.c b/src/mainboard/google/veyron_rialto/boardid.c index d0456d7cc4..a610471b0c 100644 --- a/src/mainboard/google/veyron_rialto/boardid.c +++ b/src/mainboard/google/veyron_rialto/boardid.c @@ -21,7 +21,7 @@ uint8_t board_id(void) { static int id = -1; - static gpio_t pins[] = {[3] = GPIO(2, A, 7), [2] = GPIO(2, A, 2), + gpio_t pins[] = {[3] = GPIO(2, A, 7), [2] = GPIO(2, A, 2), [1] = GPIO(2, A, 1), [0] = GPIO(2, A, 0)}; /* GPIO2_A0 is LSB */ if (id < 0) { @@ -35,7 +35,7 @@ uint8_t board_id(void) uint32_t ram_code(void) { uint32_t code; - static gpio_t pins[] = {[3] = GPIO(8, A, 3), [2] = GPIO(8, A, 2), + gpio_t pins[] = {[3] = GPIO(8, A, 3), [2] = GPIO(8, A, 2), [1] = GPIO(8, A, 1), [0] = GPIO(8, A, 0)}; /* GPIO8_A0 is LSB */ code = gpio_base2_value(pins, ARRAY_SIZE(pins)); |