Patch set updated for coreboot: b4f1b3b Declare recovery and developer modes without ChromeOS
Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4308
-gerrit
commit b4f1b3bbdeb89be170122ec586fc5f93bfa3d469 Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Thu Nov 28 18:11:49 2013 +0200
Declare recovery and developer modes without ChromeOS
Change-Id: I33335fb282de2c7bc613dc58d6912c47f3b5c06c Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/Kconfig | 4 ++ src/ec/google/chromeec/ec.c | 2 +- src/include/bootmode.h | 34 ++++++++++++++++ src/lib/Makefile.inc | 3 ++ src/lib/bootmode.c | 63 +++++++++++++++++++++++++++++ src/northbridge/intel/haswell/raminit.c | 7 +--- src/northbridge/intel/sandybridge/raminit.c | 6 +-- src/vendorcode/google/chromeos/Kconfig | 1 + src/vendorcode/google/chromeos/chromeos.c | 36 ++--------------- src/vendorcode/google/chromeos/chromeos.h | 9 ++--- 10 files changed, 115 insertions(+), 50 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig index 6356b19..cc80b43 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -300,6 +300,10 @@ config MMCONF_SUPPORT bool default n
+config BOOTMODE_STRAPS + bool + default n + source src/console/Kconfig
config HAVE_ACPI_RESUME diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c index f1cefae..c57e18b 100644 --- a/src/ec/google/chromeec/ec.c +++ b/src/ec/google/chromeec/ec.c @@ -19,6 +19,7 @@
#include <stdint.h> #include <console/console.h> +#include <bootmode.h> #include <arch/io.h> #include <delay.h> #include <arch/hlt.h> @@ -31,7 +32,6 @@ #endif #include "ec.h" #include "ec_commands.h" -#include <vendorcode/google/chromeos/chromeos.h>
uint8_t google_chromeec_calc_checksum(const uint8_t *data, int size) { diff --git a/src/include/bootmode.h b/src/include/bootmode.h new file mode 100644 index 0000000..c0d7134 --- /dev/null +++ b/src/include/bootmode.h @@ -0,0 +1,34 @@ +/* + * 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 + */ + +#ifndef __BOOTMODE_H__ +#define __BOOTMODE_H__ + +int __attribute__((weak)) get_developer_mode_switch(void); +int __attribute__((weak)) get_recovery_mode_switch(void); + +#if CONFIG_BOOTMODE_STRAPS +int developer_mode_enabled(void); +int recovery_mode_enabled(void); +#else +static inline int recovery_mode_enabled(void) { return 0; } +static inline int developer_mode_enabled(void) { return 0; } +#endif + +#endif /* __BOOTMODE_H__ */ 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 @@ smm-y += gcc.c
$(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..0001c74 --- /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 && get_developer_mode_switch()) + return 1; +#if CONFIG_VBOOT_VERIFY_FIRMWARE + if (vboot_enable_developer()) + return 1; +#endif + return 0; +} + +int recovery_mode_enabled(void) +{ + if (get_recovery_mode_switch && get_recovery_mode_switch()) + return 1; +#if CONFIG_CHROMEOS + /* + * 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. + */ + 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 */ diff --git a/src/northbridge/intel/haswell/raminit.c b/src/northbridge/intel/haswell/raminit.c index 1e020f9..4138c5f 100644 --- a/src/northbridge/intel/haswell/raminit.c +++ b/src/northbridge/intel/haswell/raminit.c @@ -18,6 +18,7 @@ */
#include <console/console.h> +#include <bootmode.h> #include <string.h> #include <arch/hlt.h> #include <arch/io.h> @@ -31,12 +32,6 @@ #include "pei_data.h" #include "haswell.h"
-#if CONFIG_CHROMEOS -#include <vendorcode/google/chromeos/chromeos.h> -#else -#define recovery_mode_enabled(x) 0 -#endif - void save_mrc_data(struct pei_data *pei_data) { struct mrc_data_container *mrcdata; diff --git a/src/northbridge/intel/sandybridge/raminit.c b/src/northbridge/intel/sandybridge/raminit.c index 61e1545..5384996 100644 --- a/src/northbridge/intel/sandybridge/raminit.c +++ b/src/northbridge/intel/sandybridge/raminit.c @@ -19,6 +19,7 @@
#include <console/console.h> #include <console/usb.h> +#include <bootmode.h> #include <string.h> #include <arch/hlt.h> #include <arch/io.h> @@ -34,11 +35,6 @@
/* Management Engine is in the southbridge */ #include "southbridge/intel/bd82x6x/me.h" -#if CONFIG_CHROMEOS -#include <vendorcode/google/chromeos/chromeos.h> -#else -#define recovery_mode_enabled(x) 0 -#endif
/* * MRC scrambler seed offsets should be reserved in diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig index ed358f8..b4838fd 100644 --- a/src/vendorcode/google/chromeos/Kconfig +++ b/src/vendorcode/google/chromeos/Kconfig @@ -26,6 +26,7 @@ config CHROMEOS bool "Build for ChromeOS" default y select TPM + select BOOTMODE_STRAPS help Enable ChromeOS specific features like the GPIO sub table in the coreboot table. NOTE: Enabling this option on an unsupported diff --git a/src/vendorcode/google/chromeos/chromeos.c b/src/vendorcode/google/chromeos/chromeos.c index e917ba1..f8dd7dc 100644 --- a/src/vendorcode/google/chromeos/chromeos.c +++ b/src/vendorcode/google/chromeos/chromeos.c @@ -27,7 +27,9 @@ #include <console/console.h>
#if CONFIG_VBOOT_VERIFY_FIRMWARE -static int vboot_enable_developer(void) +#include <payload_loader.h> + +int vboot_enable_developer(void) { struct vboot_handoff *vbho;
@@ -42,7 +44,7 @@ static int vboot_enable_developer(void) return !!(vbho->init_params.out_flags & VB_INIT_OUT_ENABLE_DEVELOPER); }
-static int vboot_enable_recovery(void) +int vboot_enable_recovery(void) { struct vboot_handoff *vbho;
@@ -53,36 +55,6 @@ static int vboot_enable_recovery(void)
return !!(vbho->init_params.out_flags & VB_INIT_OUT_ENABLE_RECOVERY); } -#else -static inline int vboot_enable_developer(void) { return 0; } -static inline int vboot_enable_recovery(void) { return 0; } -#endif - -int developer_mode_enabled(void) -{ - return get_developer_mode_switch() || vboot_enable_developer(); -} - -int recovery_mode_enabled(void) -{ - /* - * 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. - */ - return get_recovery_mode_switch() || get_recovery_mode_from_vbnv() || - vboot_enable_recovery(); -} - -#if CONFIG_VBOOT_VERIFY_FIRMWARE -#include <payload_loader.h>
static void *vboot_get_payload(size_t *len) { diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h index f6b7dee..e501427 100644 --- a/src/vendorcode/google/chromeos/chromeos.h +++ b/src/vendorcode/google/chromeos/chromeos.h @@ -22,10 +22,9 @@
#include <stddef.h> #include <stdint.h> +#include <bootmode.h>
/* functions implemented per mainboard: */ -int get_developer_mode_switch(void); -int get_recovery_mode_switch(void); int get_write_protect_state(void); #ifdef __PRE_RAM__ void save_chromeos_gpios(void); @@ -38,16 +37,14 @@ int vboot_wants_oprom(void); void read_vbnv(uint8_t *vbnv_copy); void save_vbnv(const uint8_t *vbnv_copy);
-/* functions implemented in chromeos.c: */ -int developer_mode_enabled(void); -int recovery_mode_enabled(void); - /* functions implemented in vboot.c */ void init_chromeos(int bootmode);
#if CONFIG_VBOOT_VERIFY_FIRMWARE /* Returns 0 on success < 0 on error. */ int vboot_get_handoff_info(void **addr, uint32_t *size); +int vboot_enable_developer(void); +int vboot_enable_recovery(void); #endif
#include "gnvs.h"
-
Kyösti Mälkki