diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-08-17 05:28:38 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-08-20 01:16:17 +0000 |
| commit | 8d75f6c24730f6e91fe0df02c3b2641216f9358c (patch) | |
| tree | e52e60d5178cb118517f76bae77f72448fb5eca8 | |
| parent | a4e8fb2afd6ff92e84bd03c55668708e0c5d17df (diff) | |
google/butterfly: Replace use of __PRE_RAM__
Change-Id: Iae944b589d587b30826e935feae029aa8d07d5d9
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34926
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
| -rw-r--r-- | src/mainboard/google/butterfly/chromeos.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c index 2825aae553..635aaee5e4 100644 --- a/src/mainboard/google/butterfly/chromeos.c +++ b/src/mainboard/google/butterfly/chromeos.c @@ -66,18 +66,17 @@ int get_recovery_mode_switch(void) { int ec_rec_mode = 0; -#if FORCE_RECOVERY_MODE - printk(BIOS_DEBUG,"FORCING RECOVERY MODE.\n"); - return 1; -#endif + if (FORCE_RECOVERY_MODE) { + printk(BIOS_DEBUG, "FORCING RECOVERY MODE.\n"); + return 1; + } + if (ENV_RAMSTAGE) { + if (ec_mem_read(EC_CODE_STATE) == EC_COS_EC_RO) + ec_rec_mode = 1; -#ifndef __PRE_RAM__ - if (ec_mem_read(EC_CODE_STATE) == EC_COS_EC_RO) { - ec_rec_mode = 1; + printk(BIOS_DEBUG, "RECOVERY MODE FROM EC: %x\n", ec_rec_mode); } - printk(BIOS_DEBUG,"RECOVERY MODE FROM EC: %x\n", ec_rec_mode); -#endif return ec_rec_mode; } |