diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index f8cf3b1..8a82058 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -128,6 +128,9 @@
 
 $(obj)/lib/version.ramstage.o : $(obj)/build.h
 
+romstage-y += bootmode.c
+ramstage-y += bootmode.c
+
 ifeq ($(CONFIG_RELOCATABLE_MODULES),y)
 ramstage-y += rmodule.c
 romstage-$(CONFIG_RELOCATABLE_RAMSTAGE) += rmodule.c
diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c
new file mode 100644
index 0000000..156321f
--- /dev/null
+++ b/src/lib/bootmode.c
@@ -0,0 +1,63 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2011 The ChromiumOS Authors.  All rights reserved.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <bootmode.h>
+#if CONFIG_CHROMEOS || CONFIG_VBOOT_VERIFY_FIRMWARE
+#include <vendorcode/google/chromeos/chromeos.h>
+#endif
+
+#if CONFIG_BOOTMODE_STRAPS
+int developer_mode_enabled(void)
+{
+	if (get_developer_mode_switch())
+		return 1;
+#if CONFIG_VBOOT_VERIFY_FIRMWARE
+	if (vboot_enable_developer())
+		return 1;
+#endif
+	return 0;
+}
+
+/*
+ * This is called in multiple places and has to detect
+ * recovery mode triggered from the EC and via shared
+ * recovery reason set with crossystem.
+ *
+ * If shared recovery reason is set:
+ * - before VbInit then get_recovery_mode_from_vbnv() is true
+ * - after VbInit then vboot_enable_recovery() is true
+ *
+ * Otherwise the mainboard handler for get_recovery_mode_switch()
+ * will detect recovery mode initiated by the EC.
+ */
+int recovery_mode_enabled(void)
+{
+	if (get_recovery_mode_switch())
+		return 1;
+#if CONFIG_CHROMEOS
+	if (get_recovery_mode_from_vbnv())
+		return 1;
+#endif
+#if CONFIG_VBOOT_VERIFY_FIRMWARE
+	if (vboot_enable_recovery())
+		return 1;
+#endif
+	return 0;
+}
+#endif /* CONFIG_BOOTMODE_STRAPS */