scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-24 02:05:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up return codes for better interaction with U-Boot.

Browse Source 
BUG=none
TEST=none

Change-Id: I432de92e00444b58c20faadf8671ccc1c0056e28
Reviewed-on: https://gerrit.chromium.org/gerrit/14181
Tested-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Ready: Bill Richardson <wfrichar@chromium.org>
This commit is contained in:
Bill Richardson
2012-01-13 12:58:06 -08:00
committed by Gerrit
parent 68bd613040
commit 82e69b9f74
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/include/vboot_api.h
View File

@@ -53,7 +53,7 @@ enum VbErrorPredefined_t {
VBERROR_INIT_SHARED_DATA = 0x10001, VBERROR_INIT_SHARED_DATA = 0x10001,
/* Error resuming TPM during a S3 resume */ /* Error resuming TPM during a S3 resume */
VBERROR_TPM_S3_RESUME = 0x10002, VBERROR_TPM_S3_RESUME = 0x10002,
/* LoadFirmware() failed to find a valid firmware */ /* VbSelectFirmware() failed to find a valid firmware */
VBERROR_LOAD_FIRMWARE = 0x10003, VBERROR_LOAD_FIRMWARE = 0x10003,
/* Unable to write firmware versions to TPM */ /* Unable to write firmware versions to TPM */
VBERROR_TPM_WRITE_FIRMWARE = 0x10004, VBERROR_TPM_WRITE_FIRMWARE = 0x10004,
@@ -81,9 +81,9 @@ enum VbErrorPredefined_t {
VBERROR_NO_KERNEL_FOUND = 0x1000F, VBERROR_NO_KERNEL_FOUND = 0x1000F,
/* All OS kernels found were invalid (corrupt, improperly signed, etc.) */ /* All OS kernels found were invalid (corrupt, improperly signed, etc.) */
VBERROR_INVALID_KERNEL_FOUND = 0x10010, VBERROR_INVALID_KERNEL_FOUND = 0x10010,
/* LoadKernel() requested recovery mode */ /* VbSelectAndLoadKernel() requested recovery mode */
VBERROR_LOAD_KERNEL_RECOVERY = 0x10011, VBERROR_LOAD_KERNEL_RECOVERY = 0x10011,
/* Other error inside LoadKernel() */ /* Other error inside VbSelectAndLoadKernel() */
VBERROR_LOAD_KERNEL = 0x10012, VBERROR_LOAD_KERNEL = 0x10012,
/* Invalid Google binary block */ /* Invalid Google binary block */
VBERROR_INVALID_GBB = 0x10013, VBERROR_INVALID_GBB = 0x10013,
@@ -98,7 +98,9 @@ enum VbErrorPredefined_t {
/* VbExBeep() can't make sounds at all */ /* VbExBeep() can't make sounds at all */
VBERROR_NO_SOUND = 0x10018, VBERROR_NO_SOUND = 0x10018,
/* VbExBeep() can't make sound in the background */ /* VbExBeep() can't make sound in the background */
VBERROR_NO_BACKGROUND_SOUND = 0x10019 VBERROR_NO_BACKGROUND_SOUND = 0x10019,
/* Developer has requested a BIOS shell */
VBERROR_BIOS_SHELL_REQUESTED = 0x10020
}; };

2
firmware/lib/vboot_api_kernel.c
View File

@@ -142,7 +142,7 @@ VbError_t VbBootDeveloper(VbCommonParams* cparams, LoadKernelParams* p) {
VBDEBUG(("VbBootDeveloper() - user pressed ENTER/SPACE/ESC\n")); VBDEBUG(("VbBootDeveloper() - user pressed ENTER/SPACE/ESC\n"));
VbSetRecoveryRequest(VBNV_RECOVERY_RW_DEV_SCREEN); VbSetRecoveryRequest(VBNV_RECOVERY_RW_DEV_SCREEN);
VbAudioClose(audio); VbAudioClose(audio);
return 1; return VBERROR_LOAD_KERNEL_RECOVERY;
case 0x04: case 0x04:
/* Ctrl+D = dismiss warning; advance to timeout */ /* Ctrl+D = dismiss warning; advance to timeout */
VBDEBUG(("VbBootDeveloper() - user pressed Ctrl+D; skip delay\n")); VBDEBUG(("VbBootDeveloper() - user pressed Ctrl+D; skip delay\n"));