diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2016-06-27 11:27:56 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2016-06-29 07:32:43 +0200 |
| commit | 65e8f647bc55ee28bd389789788e666279537510 (patch) | |
| tree | e93254e6c05cebec7beaf698437bb576aae656b6 /src/soc/intel | |
| parent | 7b3512dde3efa3d25d715bb61326ebfc995e9a69 (diff) | |
intel romstage: Use run_ramstage()
Change-Id: I22a33e6027a4e807f7157a0dfafbd6377bc1285d
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/15461
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel')
| -rw-r--r-- | src/soc/intel/baytrail/romstage/romstage.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/broadwell/romstage/romstage.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/fsp_baytrail/romstage/romstage.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/fsp_broadwell_de/romstage/romstage.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c index d3eea26604..a167c90530 100644 --- a/src/soc/intel/baytrail/romstage/romstage.c +++ b/src/soc/intel/baytrail/romstage/romstage.c @@ -16,7 +16,6 @@ #include <stddef.h> #include <arch/cpu.h> #include <arch/io.h> -#include <arch/stages.h> #include <arch/early_variables.h> #include <console/console.h> #include <cbfs.h> @@ -26,6 +25,7 @@ #include <ec/google/chromeec/ec.h> #endif #include <elog.h> +#include <program_loading.h> #include <romstage_handoff.h> #include <stage_cache.h> #include <timestamp.h> @@ -247,7 +247,7 @@ void romstage_common(struct romstage_params *params) void asmlinkage romstage_after_car(void) { /* Load the ramstage. */ - copy_and_run(); + run_ramstage(); while (1); } diff --git a/src/soc/intel/broadwell/romstage/romstage.c b/src/soc/intel/broadwell/romstage/romstage.c index 762758dd37..c6ffe7ad68 100644 --- a/src/soc/intel/broadwell/romstage/romstage.c +++ b/src/soc/intel/broadwell/romstage/romstage.c @@ -18,7 +18,6 @@ #include <arch/cpu.h> #include <arch/io.h> #include <arch/cbfs.h> -#include <arch/stages.h> #include <arch/early_variables.h> #include <console/console.h> #include <cbfs.h> @@ -26,6 +25,7 @@ #include <cpu/x86/mtrr.h> #include <elog.h> #include <tpm.h> +#include <program_loading.h> #include <romstage_handoff.h> #include <stage_cache.h> #include <timestamp.h> @@ -129,7 +129,7 @@ void romstage_common(struct romstage_params *params) void asmlinkage romstage_after_car(void) { /* Load the ramstage. */ - copy_and_run(); + run_ramstage(); while (1); } diff --git a/src/soc/intel/fsp_baytrail/romstage/romstage.c b/src/soc/intel/fsp_baytrail/romstage/romstage.c index 385b3e4555..4de98d313a 100644 --- a/src/soc/intel/fsp_baytrail/romstage/romstage.c +++ b/src/soc/intel/fsp_baytrail/romstage/romstage.c @@ -19,11 +19,11 @@ #include <lib.h> #include <arch/io.h> #include <arch/cbfs.h> -#include <arch/stages.h> #include <arch/early_variables.h> #include <console/console.h> #include <cbmem.h> #include <cpu/x86/mtrr.h> +#include <program_loading.h> #include <romstage_handoff.h> #include <timestamp.h> #include <soc/gpio.h> @@ -267,7 +267,7 @@ void romstage_main_continue(EFI_STATUS status, void *hob_list_ptr) post_code(0x4f); /* Load the ramstage. */ - copy_and_run(); + run_ramstage(); while (1); } diff --git a/src/soc/intel/fsp_broadwell_de/romstage/romstage.c b/src/soc/intel/fsp_broadwell_de/romstage/romstage.c index dc883a4308..91c2532af0 100644 --- a/src/soc/intel/fsp_broadwell_de/romstage/romstage.c +++ b/src/soc/intel/fsp_broadwell_de/romstage/romstage.c @@ -19,9 +19,9 @@ #include <lib.h> #include <arch/io.h> #include <arch/cbfs.h> -#include <arch/stages.h> #include <console/console.h> #include <cpu/x86/mtrr.h> +#include <program_loading.h> #include <romstage_handoff.h> #include <timestamp.h> #include <version.h> @@ -110,7 +110,7 @@ void romstage_main_continue(EFI_STATUS status, void *hob_list_ptr) /* Load the ramstage. */ post_code(0x4e); - copy_and_run(); + run_ramstage(); while (1); } |