diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2014-10-10 10:51:06 -0700 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2015-04-10 16:46:55 +0200 |
| commit | 742fc8d768829eaa3ff1048a4b101f7fad8c8ab7 (patch) | |
| tree | f69c92a7f9585525a661498c3eb8e9ab1febf1cd /src/mainboard/google | |
| parent | b952f6b68b025bbb9d13deffd3bd621a236537c7 (diff) | |
vboot: move vboot files to designated directory
This moves vboot1 and vboot2 files to their designated directory. Common
code stays in vendorcode/google/chromeos.
BUG=none
BRANCH=none
TEST=built cosmos, veyron_pinky, rush_ryu, nyan_blaze, samus, parrot,
lumpy, daisy_spring, and storm.
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Original-Change-Id: Ia9fb41ba30930b79b222269acfade7ef44b23626
Original-Reviewed-on: https://chromium-review.googlesource.com/222874
Original-Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Original-Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Original-Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
(cherry picked from commit cbfef9ad40776d890e2149b9db788fe0b387d210)
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Change-Id: Ia73696accfd93cc14ca83516fa77f87331faef51
Reviewed-on: http://review.coreboot.org/9433
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/mainboard/google')
| -rw-r--r-- | src/mainboard/google/nyan_blaze/romstage.c | 2 | ||||
| -rw-r--r-- | src/mainboard/google/veyron_pinky/romstage.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c index 034a929944..c9510d627e 100644 --- a/src/mainboard/google/nyan_blaze/romstage.c +++ b/src/mainboard/google/nyan_blaze/romstage.c @@ -96,7 +96,7 @@ static void __attribute__((noinline)) romstage(void) early_mainboard_init(); #if CONFIG_VBOOT2_VERIFY_FIRMWARE - entry = vboot_load_ramstage(); + entry = vboot2_load_ramstage(); #else early_mainboard_init(); vboot_verify_firmware(romstage_handoff_find_or_add()); diff --git a/src/mainboard/google/veyron_pinky/romstage.c b/src/mainboard/google/veyron_pinky/romstage.c index 38166eda3f..b050228b5f 100644 --- a/src/mainboard/google/veyron_pinky/romstage.c +++ b/src/mainboard/google/veyron_pinky/romstage.c @@ -117,7 +117,7 @@ void main(void) #endif #if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE) - void *entry = vboot_load_ramstage(); + void *entry = vboot2_load_ramstage(); if (entry != NULL) stage_exit(entry); #endif |