summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShawn Nematbakhsh <shawnn@chromium.org>2014-03-14 13:57:32 -0700
committerMarc Jones <marc.jones@se-eng.com>2014-12-17 20:50:08 +0100
commit229ad270f67af53c62b1ef6fe74bc48ef3d1ec58 (patch)
tree4c929e4e15bf0b0ddc7f2a640ccc36a71b424248 /src
parenta0b02e7127b432125979753f886cbeecbe521652 (diff)
downloadcoreboot-229ad270f67af53c62b1ef6fe74bc48ef3d1ec58.tar.xz
chromeos: vboot_loader: Add support for SW_WP_ENABLED flag
Set VB_INIT_FLAG_SW_WP_ENABLED according to the status returned by an optional platform / mainboard function vboot_get_sw_write_protect(). BUG=chrome-os-partner:26777 TEST=Manual on Rambi with all patches in sequence: `crossystem sw_wpsw_boot` prints 0 `flashrom --wp-enable` and reboot `crossystem sw_wpsw_boot` prints 1 BRANCH=Rambi Original-Change-Id: Ifb852d75cc106d10120cfee0a396b0662282051a Original-Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/190096 Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> (cherry picked from commit c4668fc8a9ab31d9cf876b3d9ad3405756d4d683) Signed-off-by: Marc Jones <marc.jones@se-eng.com> Change-Id: Idace325439958f6b490d2e6705d55e95305c4b2a Reviewed-on: http://review.coreboot.org/7750 Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src')
-rw-r--r--src/vendorcode/google/chromeos/chromeos.h4
-rw-r--r--src/vendorcode/google/chromeos/vboot_handoff.c6
-rw-r--r--src/vendorcode/google/chromeos/vboot_loader.c2
3 files changed, 12 insertions, 0 deletions
diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h
index 6e3b2dacf1..7192f3395f 100644
--- a/src/vendorcode/google/chromeos/chromeos.h
+++ b/src/vendorcode/google/chromeos/chromeos.h
@@ -35,6 +35,9 @@ void save_vbnv(const uint8_t *vbnv_copy);
void init_chromeos(int bootmode);
struct romstage_handoff;
+
+/* TODO(shawnn): Remove these CONFIGs and define default weak functions
+ * that can be overridden in the platform / MB code. */
#if CONFIG_VBOOT_VERIFY_FIRMWARE
/*
* This is a dual purpose routine. If dest is non-NULL the region at
@@ -57,6 +60,7 @@ static inline int vboot_get_handoff_info(void **addr, uint32_t *size)
}
static inline int vboot_skip_display_init(void) { return 0; }
#endif
+int vboot_get_sw_write_protect(void);
#include "gnvs.h"
struct device;
diff --git a/src/vendorcode/google/chromeos/vboot_handoff.c b/src/vendorcode/google/chromeos/vboot_handoff.c
index 71ac5cdb48..1a66f56828 100644
--- a/src/vendorcode/google/chromeos/vboot_handoff.c
+++ b/src/vendorcode/google/chromeos/vboot_handoff.c
@@ -93,6 +93,12 @@ void *vboot_get_region(uintptr_t offset_addr, size_t size, void *dest)
}
}
+int __attribute((weak)) vboot_get_sw_write_protect(void)
+{
+ // Can be implemented by a platform / mainboard
+ return 0;
+}
+
static void *vboot_get_payload(size_t *len)
{
struct vboot_handoff *vboot_handoff;
diff --git a/src/vendorcode/google/chromeos/vboot_loader.c b/src/vendorcode/google/chromeos/vboot_loader.c
index 8e0babed35..240b6b6fc5 100644
--- a/src/vendorcode/google/chromeos/vboot_loader.c
+++ b/src/vendorcode/google/chromeos/vboot_loader.c
@@ -249,6 +249,8 @@ static void vboot_invoke_wrapper(struct vboot_handoff *vboot_handoff)
*iflags |= VB_INIT_FLAG_REC_BUTTON_PRESSED;
if (get_write_protect_state())
*iflags |= VB_INIT_FLAG_WP_ENABLED;
+ if (vboot_get_sw_write_protect())
+ *iflags |= VB_INIT_FLAG_SW_WP_ENABLED;
if (CONFIG_VIRTUAL_DEV_SWITCH)
*iflags |= VB_INIT_FLAG_VIRTUAL_DEV_SWITCH;
if (CONFIG_EC_SOFTWARE_SYNC) {