summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2012-09-24 10:16:15 -0700
committerGerrit <chrome-bot@google.com>2012-09-24 11:36:39 -0700
commitbe94d55d4f07c5052b04ac3982314e6e588fc361 (patch)
treeb3aa8733e0b5d2b29b18edd90ef7ea8913fa6245
parenta2326ee152ab5b8aee924ccf794cee38d54909bd (diff)
downloadvboot-be94d55d4f07c5052b04ac3982314e6e588fc361.tar.gz
Rename RANDOM_POWER_OFF to a more descriptive SAVE_LOCALE_IMMEDIATELY
--snark; no functional change. BUG=none TEST=build code BRANCH=none Change-Id: Id3a8c5aaf0e5a9d0e1949af602840efcc1895f50 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/33898 Reviewed-by: Bill Richardson <wfrichar@chromium.org>
-rw-r--r--firmware/Makefile4
-rw-r--r--firmware/lib/vboot_display.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/firmware/Makefile b/firmware/Makefile
index 61ecf5ef..8d8e2ee2 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -47,7 +47,7 @@ CFLAGS += -DUNROLL_LOOPS
# without giving us a chance to react. This is not an example of the Right
# Way to do things. See chrome-os-partner:7689, and the commit message
# that made this change.
-CFLAGS += -DRANDOM_POWER_OFF
+CFLAGS += -DSAVE_LOCALE_IMMEDIATELY
# On x86 we don't actually read the GBB data into RAM until it is needed.
# Therefore it makes sense to cache it rather than reading it each time.
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
index 065eee52..bc623790 100644
--- a/firmware/lib/vboot_display.c
+++ b/firmware/lib/vboot_display.c
@@ -642,7 +642,7 @@ VbError_t VbCheckDisplayKey(VbCommonParams* cparams, uint32_t key,
VBDEBUG(("VbCheckDisplayKey() - change localization to %d\n", (int)loc));
VbNvSet(vncptr, VBNV_LOCALIZATION_INDEX, loc);
-#ifdef RANDOM_POWER_OFF
+#ifdef SAVE_LOCALE_IMMEDIATELY
VbNvTeardown(vncptr); /* really only computes checksum */
if (vncptr->raw_changed)
VbExNvStorageWrite(vncptr->raw);