diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2011-11-17 10:48:59 -0800 |
|---|---|---|
| committer | Bill Richardson <wfrichar@chromium.org> | 2011-11-18 13:39:37 -0800 |
| commit | 7272a6951107251a5c9b26330c506319a92a54b3 (patch) | |
| tree | 48778a28259905ae1f2033b98cb8f714c67d93c6 /firmware/lib/vboot_nvstorage.c | |
| parent | b265c34321c01bd279f3a1df0a2fea3601f732ee (diff) | |
| download | vboot-7272a6951107251a5c9b26330c506319a92a54b3.tar.gz | |
Dev-mode allows booting self-signed kernels by default.
When you enter dev-mode,
Pressing Ctrl-U to boot from USB is DISABLED.
Booting any self-signed kernel from the SSD is ENABLED.
This replaces the "crossystem dev_boot_custom" argument with
"crossystem dev_boot_signed_only", which has the opposite polarity.
So if you want to dev-mode to only boot official kernels, you have to
explictly set it that way. If you leave dev-mode and then come back,
it will go back to the conditions shown above.
BUG=chrome-os-partner:5954
TEST=manual
Just run the factory flow. It was broken; this should fix it (except for any
workarounds that were added while it was broken; those may need to be
reverted).
Change-Id: I13e0edbc0e77c5d6ea609dabf771085006cd1805
Reviewed-on: https://gerrit.chromium.org/gerrit/11853
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Diffstat (limited to 'firmware/lib/vboot_nvstorage.c')
| -rw-r--r-- | firmware/lib/vboot_nvstorage.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/firmware/lib/vboot_nvstorage.c b/firmware/lib/vboot_nvstorage.c index 75910ed0..e96a17fe 100644 --- a/firmware/lib/vboot_nvstorage.c +++ b/firmware/lib/vboot_nvstorage.c @@ -28,7 +28,7 @@ #define DEV_FLAGS_OFFSET 4 #define DEV_BOOT_USB_MASK 0x01 -#define DEV_BOOT_CUSTOM_MASK 0x02 +#define DEV_BOOT_SIGNED_ONLY_MASK 0x02 #define FIRMWARE_FLAGS_OFFSET 5 #define FIRMWARE_TEST_ERR_FUNC_MASK 0x38 @@ -143,8 +143,8 @@ int VbNvGet(VbNvContext* context, VbNvParam param, uint32_t* dest) { *dest = (raw[DEV_FLAGS_OFFSET] & DEV_BOOT_USB_MASK ? 1 : 0); return 0; - case VBNV_DEV_BOOT_CUSTOM: - *dest = (raw[DEV_FLAGS_OFFSET] & DEV_BOOT_CUSTOM_MASK ? 1 : 0); + case VBNV_DEV_BOOT_SIGNED_ONLY: + *dest = (raw[DEV_FLAGS_OFFSET] & DEV_BOOT_SIGNED_ONLY_MASK ? 1 : 0); return 0; default: @@ -232,11 +232,11 @@ int VbNvSet(VbNvContext* context, VbNvParam param, uint32_t value) { raw[DEV_FLAGS_OFFSET] &= ~DEV_BOOT_USB_MASK; break; - case VBNV_DEV_BOOT_CUSTOM: + case VBNV_DEV_BOOT_SIGNED_ONLY: if (value) - raw[DEV_FLAGS_OFFSET] |= DEV_BOOT_CUSTOM_MASK; + raw[DEV_FLAGS_OFFSET] |= DEV_BOOT_SIGNED_ONLY_MASK; else - raw[DEV_FLAGS_OFFSET] &= ~DEV_BOOT_CUSTOM_MASK; + raw[DEV_FLAGS_OFFSET] &= ~DEV_BOOT_SIGNED_ONLY_MASK; break; default: |