From 8d75f6c24730f6e91fe0df02c3b2641216f9358c Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sat, 17 Aug 2019 05:28:38 +0300 Subject: google/butterfly: Replace use of __PRE_RAM__ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iae944b589d587b30826e935feae029aa8d07d5d9 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/34926 Tested-by: build bot (Jenkins) Reviewed-by: Marshall Dawson --- src/mainboard/google/butterfly/chromeos.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/mainboard') 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; } -- cgit v1.2.3