summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPatrick Rudolph <patrick.rudolph@9elements.com>2019-05-05 11:15:25 +0200
committerPatrick Georgi <pgeorgi@google.com>2019-05-08 10:27:36 +0000
commit25212117534f0cb29939a7fc6c1271ca0fa083cd (patch)
treebdf96becfdeb8543554ec840135ac8eae44d7802 /src
parent2dc00fab7c46369bffdedf3afea2af720e4add80 (diff)
downloadcoreboot-25212117534f0cb29939a7fc6c1271ca0fa083cd.tar.xz
ec/lenovo/h8: Add VBOOT board support
Use Fn-Key as recovery mode switch. Tested using Icb7b263ed86551cc53e1db7babccaca6b3ae2fe6. Change-Id: I2c682431b3f09839db265259205104bd9ef4abfc Signed-off-by: Patrick Rudolph <siro@das-labor.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32607 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/ec/lenovo/h8/Kconfig8
-rw-r--r--src/ec/lenovo/h8/Makefile.inc6
-rw-r--r--src/ec/lenovo/h8/vboot.c55
3 files changed, 69 insertions, 0 deletions
diff --git a/src/ec/lenovo/h8/Kconfig b/src/ec/lenovo/h8/Kconfig
index b109831105..d874975428 100644
--- a/src/ec/lenovo/h8/Kconfig
+++ b/src/ec/lenovo/h8/Kconfig
@@ -32,6 +32,14 @@ config H8_HAS_BAT_TRESHOLDS_IMPL
bool
default n
+config H8_FN_KEY_AS_VBOOT_RECOVERY_SW
+ bool "Enable Fn-Key as VBOOT recovery switch"
+ depends on VBOOT
+ default n
+ help
+ If VBOOT is enabled, press Fn-Key at power on to force a recovery mode
+ boot instead of regular FW_MAIN_x boot.
+
endif
config H8_DOCK_EARLY_INIT
diff --git a/src/ec/lenovo/h8/Makefile.inc b/src/ec/lenovo/h8/Makefile.inc
index bccdd91b7d..51c11be625 100644
--- a/src/ec/lenovo/h8/Makefile.inc
+++ b/src/ec/lenovo/h8/Makefile.inc
@@ -7,6 +7,12 @@ bootblock-y += sense.c
postcar-y += sense.c
smm-y += sense.c
+ramstage-$(CONFIG_VBOOT) += vboot.c
+verstage-$(CONFIG_VBOOT) += vboot.c
+romstage-$(CONFIG_VBOOT) += vboot.c
+bootblock-$(CONFIG_VBOOT) += vboot.c
+postcar-$(CONFIG_VBOOT) += vboot.c
+
ifneq ($(filter y,$(CONFIG_H8_BEEP_ON_DEATH) $(CONFIG_H8_FLASH_LEDS_ON_DEATH)),)
romstage-y += panic.c
ramstage-y += panic.c
diff --git a/src/ec/lenovo/h8/vboot.c b/src/ec/lenovo/h8/vboot.c
new file mode 100644
index 0000000000..3b9f74a117
--- /dev/null
+++ b/src/ec/lenovo/h8/vboot.c
@@ -0,0 +1,55 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2019 Patrick Rudolph <siro@das-labor.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <ec/acpi/ec.h>
+#include <bootmode.h>
+#include <timer.h>
+#include <delay.h>
+
+#include "h8.h"
+
+/**
+ * HACK: Use Fn-Key as recovery mode switch.
+ * Wait for sense register ready and read Fn-Key state.
+ */
+int get_recovery_mode_switch(void)
+{
+ struct stopwatch sw;
+
+ if (!CONFIG(H8_FN_KEY_AS_VBOOT_RECOVERY_SW))
+ return 0;
+
+ /* Tests showed that it takes:
+ * - 700msec on Lenovo T500 from AC power on
+ * - less than 150msec on Lenovo T520 from AC power on
+ */
+ stopwatch_init_msecs_expire(&sw, 1000);
+ while (!stopwatch_expired(&sw) && !h8_get_sense_ready())
+ mdelay(1);
+
+ if (!h8_get_sense_ready())
+ return 0;
+
+ return h8_get_fn_key();
+}
+
+/**
+ * Only used if CONFIG_CHROMEOS is set.
+ * Always zero as the #WP pin of the flash is tied high.
+ */
+int get_write_protect_state(void)
+{
+ return 0;
+}