diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-08-20 06:01:57 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-08-26 20:56:29 +0000 |
| commit | 117cf2bdcbbadb3b30c9c250130f82f5e6edc236 (patch) | |
| tree | b6b3ebea04e865439082118a2c5b90aec2f342c1 /src/mainboard | |
| parent | f2cc52b694d610ffc4f1edc347bf38caec2e31b6 (diff) | |
Split MAYBE_STATIC to _BSS and _NONZERO variants
These are required to cover the absensce of .data and
.bss sections in some programs, most notably ARCH_X86
in execute-in-place with cache-as-ram.
Change-Id: I80485ebac94b88c5864a949b17ad1dccdfda6a40
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35003
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/google/stout/chromeos.c | 4 | ||||
| -rw-r--r-- | src/mainboard/intel/glkrvp/boardid.c | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/glkrvp/variants/baseboard/boardid.c | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/icelake_rvp/board_id.c | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/kblrvp/board_id.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/mainboard/google/stout/chromeos.c b/src/mainboard/google/stout/chromeos.c index 44784b4fe9..09144507b8 100644 --- a/src/mainboard/google/stout/chromeos.c +++ b/src/mainboard/google/stout/chromeos.c @@ -71,8 +71,8 @@ int get_lid_switch(void) */ int get_recovery_mode_switch(void) { - MAYBE_STATIC int ec_in_rec_mode = 0; - MAYBE_STATIC int ec_rec_flag_good = 0; + MAYBE_STATIC_BSS int ec_in_rec_mode = 0; + MAYBE_STATIC_BSS int ec_rec_flag_good = 0; if (ec_rec_flag_good) return ec_in_rec_mode; diff --git a/src/mainboard/intel/glkrvp/boardid.c b/src/mainboard/intel/glkrvp/boardid.c index 0676eaca32..1a7b3e383f 100644 --- a/src/mainboard/intel/glkrvp/boardid.c +++ b/src/mainboard/intel/glkrvp/boardid.c @@ -25,7 +25,7 @@ uint32_t board_id(void) { - MAYBE_STATIC int id = -1; + MAYBE_STATIC_NONZERO int id = -1; if (id < 0) { if (CONFIG(EC_GOOGLE_CHROMEEC)) id = variant_board_id(); diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/boardid.c b/src/mainboard/intel/glkrvp/variants/baseboard/boardid.c index 69a0a9116a..89a736f1bf 100644 --- a/src/mainboard/intel/glkrvp/variants/baseboard/boardid.c +++ b/src/mainboard/intel/glkrvp/variants/baseboard/boardid.c @@ -19,7 +19,7 @@ int variant_board_id(void) { - MAYBE_STATIC uint32_t id = BOARD_ID_INIT; + MAYBE_STATIC_NONZERO uint32_t id = BOARD_ID_INIT; if (CONFIG(EC_GOOGLE_CHROMEEC)) { if (id == BOARD_ID_INIT) { diff --git a/src/mainboard/intel/icelake_rvp/board_id.c b/src/mainboard/intel/icelake_rvp/board_id.c index b56f047008..c0def22d38 100644 --- a/src/mainboard/intel/icelake_rvp/board_id.c +++ b/src/mainboard/intel/icelake_rvp/board_id.c @@ -31,7 +31,7 @@ static int get_board_id_via_ext_ec(void) /* Get Board ID via EC I/O port write/read */ int get_board_id(void) { - MAYBE_STATIC int id = -1; + MAYBE_STATIC_NONZERO int id = -1; if (id < 0) { if (CONFIG(EC_GOOGLE_CHROMEEC)) diff --git a/src/mainboard/intel/kblrvp/board_id.c b/src/mainboard/intel/kblrvp/board_id.c index a978e0ff86..dc5afcfbcf 100644 --- a/src/mainboard/intel/kblrvp/board_id.c +++ b/src/mainboard/intel/kblrvp/board_id.c @@ -22,7 +22,7 @@ */ int get_ec_boardinfo(void) { - MAYBE_STATIC int ec_info = -1; + MAYBE_STATIC_NONZERO int ec_info = -1; if (ec_info < 0) { uint8_t buffer[2]; uint8_t index; |