diff options
author | Gerrit <chrome-bot@google.com> | 2012-03-13 14:16:44 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-03-13 14:16:44 -0700 |
commit | 221c5b8f43e958aaeeb0a9b7a39a397808e179a4 (patch) | |
tree | 0731e98eae6c7e44d408611e039fa82ff6901bf5 | |
parent | 3eafbbe360d38c9f0f5cda8a64d80965451284c6 (diff) | |
parent | a4f5e0c29cae6c998b14f5183aeaeab55a02fd51 (diff) | |
download | chrome-ec-221c5b8f43e958aaeeb0a9b7a39a397808e179a4.tar.gz |
Merge "Add vboot_init() function in correct place, make it do the switching."
-rw-r--r-- | common/main.c | 3 | ||||
-rw-r--r-- | common/vboot.c | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/common/main.c b/common/main.c index 50c5b6d63d..e8e736d155 100644 --- a/common/main.c +++ b/common/main.c @@ -72,6 +72,9 @@ int main(void) flash_init(); #endif eeprom_init(); + + vboot_init(); + #ifdef CONFIG_LPC port_80_init(); lpc_init(); diff --git a/common/vboot.c b/common/vboot.c index 6faf9cd470..307dfac2d0 100644 --- a/common/vboot.c +++ b/common/vboot.c @@ -124,7 +124,16 @@ DECLARE_HOST_COMMAND(EC_LPC_COMMAND_REBOOT_EC, vboot_command_reboot); int vboot_pre_init(void) { - /* Jump to a different image if necessary; this may not return */ + /* FIXME(wfrichar): crosbug.com/p/7453: should protect flash */ + return EC_SUCCESS; +} + + +int vboot_init(void) +{ + /* FIXME(wfrichar): placeholder for full verified boot implementation. + * TBD exactly how, but we may want to continue in RO firmware, jump + * directly to one of the RW firmwares, etc. */ jump_to_other_image(); return EC_SUCCESS; } |