diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-03-17 13:25:19 -0500 |
|---|---|---|
| committer | Aaron Durbin <adurbin@google.com> | 2015-03-20 19:28:25 +0100 |
| commit | e4f3e7a9c656356a92e827d5a39b85106cbdaf3a (patch) | |
| tree | 885e9fefb1a8ea6802b6df56fdcadcd435c5f5cd /src/mainboard/google/daisy | |
| parent | d1b0e87179ca42eadbfb36191171e0e8552c1cbe (diff) | |
romstages: use common run_ramstage()
Instead of sprinkling the cbfs calls around (as well as getting
return values incorrect) use the common run_ramstage() to perform
the necessary work to load and run ramstage.
Change-Id: I37b1e94be36ef7a43efe65b2db110742fa105169
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/8710
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/mainboard/google/daisy')
| -rw-r--r-- | src/mainboard/google/daisy/romstage.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mainboard/google/daisy/romstage.c b/src/mainboard/google/daisy/romstage.c index 46c659383d..ebd07d7c5e 100644 --- a/src/mainboard/google/daisy/romstage.c +++ b/src/mainboard/google/daisy/romstage.c @@ -37,7 +37,7 @@ #include <soc/samsung/exynos5250/trustzone.h> #include <soc/samsung/exynos5250/wakeup.h> #include <console/console.h> -#include <arch/stages.h> +#include <program_loading.h> #include <drivers/maxim/max77686/max77686.h> #include <device/i2c.h> @@ -145,7 +145,6 @@ static struct mem_timings *setup_clock(void) void main(void) { struct mem_timings *mem; - void *entry; int is_resume = (get_wakeup_state() != IS_NOT_WAKEUP); timestamp_init(timestamp_get()); @@ -182,9 +181,7 @@ void main(void) cbmem_initialize_empty(); - entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/ramstage"); - timestamp_add_now(TS_END_ROMSTAGE); - stage_exit(entry); + run_ramstage(); } |