diff options
| author | Che-Liang Chiou <clchiou@chromium.org> | 2011-07-20 19:33:18 +0800 |
|---|---|---|
| committer | Che-Liang Chiou <clchiou@chromium.org> | 2011-07-20 16:58:49 -0700 |
| commit | 04b7978c4682c8b65aa9a212ff2a7d0071336b22 (patch) | |
| tree | 1a8753b8c4469f1af08a73956bd7f724b0c9f0fa | |
| parent | 4312770fb197c237e560d18c9247425a1df23764 (diff) | |
| download | vboot-04b7978c4682c8b65aa9a212ff2a7d0071336b22.tar.gz | |
CHROMIUM: fix incorrect crossystem recovery_reason
U-Boot should not parse the raw contents of VbNvStorage, and so cannot
read the recovery reason from the VbNvStorage. On the other hand, it is
easy for crossystem to read the recovery reason from the VbNvStorage
itself.
After this change is merged, U-Boot will stop providing the (incorrect)
recovery reason in the device tree.
BUG=chromium-os:17876,chromium-os:17852
TEST=press recovery button and see crossystem reports recovery_reason=2
Change-Id: I236667f0b4f2e25da193cf6b6f7db3871d1e093f
Reviewed-on: http://gerrit.chromium.org/gerrit/4396
Tested-by: Che-Liang Chiou <clchiou@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | host/arch/arm/lib/crossystem_arch.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/host/arch/arm/lib/crossystem_arch.c b/host/arch/arm/lib/crossystem_arch.c index c507ca85..554fe810 100644 --- a/host/arch/arm/lib/crossystem_arch.c +++ b/host/arch/arm/lib/crossystem_arch.c @@ -279,14 +279,8 @@ VbSharedDataHeader *VbSharedDataRead(void) { return (VbSharedDataHeader *)block; } -static int VbGetRecoveryReason(void) { - return ReadFdtInt("recovery-reason"); -} - int VbGetArchPropertyInt(const char* name) { - if (!strcasecmp(name, "recovery_reason")) - return VbGetRecoveryReason(); - else if (!strcasecmp(name, "fmap_base")) + if (!strcasecmp(name, "fmap_base")) return ReadFdtInt("fmap-offset"); else if (!strcasecmp(name, "devsw_boot")) return ReadFdtBool("boot-developer-switch"); |