From 65e8f647bc55ee28bd389789788e666279537510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Mon, 27 Jun 2016 11:27:56 +0300 Subject: intel romstage: Use run_ramstage() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I22a33e6027a4e807f7157a0dfafbd6377bc1285d Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/15461 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/cpu/intel/haswell/romstage.c | 4 ++-- src/drivers/intel/fsp1_1/romstage.c | 4 ++-- src/mainboard/intel/cougar_canyon2/romstage.c | 4 ++-- src/soc/intel/baytrail/romstage/romstage.c | 4 ++-- src/soc/intel/broadwell/romstage/romstage.c | 4 ++-- src/soc/intel/fsp_baytrail/romstage/romstage.c | 4 ++-- src/soc/intel/fsp_broadwell_de/romstage/romstage.c | 4 ++-- src/southbridge/intel/fsp_i89xx/romstage.c | 4 ++-- src/southbridge/intel/fsp_rangeley/romstage.c | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c index 11d449c1ae..9cd4ae009d 100644 --- a/src/cpu/intel/haswell/romstage.c +++ b/src/cpu/intel/haswell/romstage.c @@ -26,10 +26,10 @@ #include #include #include -#include #include #include #include +#include #include #include #include @@ -283,7 +283,7 @@ void romstage_after_car(void) acpi_prepare_for_resume(); /* Load the ramstage. */ - copy_and_run(); + run_ramstage(); } diff --git a/src/drivers/intel/fsp1_1/romstage.c b/src/drivers/intel/fsp1_1/romstage.c index c380ff750f..f99c87a3c7 100644 --- a/src/drivers/intel/fsp1_1/romstage.c +++ b/src/drivers/intel/fsp1_1/romstage.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -29,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -187,7 +187,7 @@ void romstage_common(struct romstage_params *params) void after_cache_as_ram_stage(void) { /* Load the ramstage. */ - copy_and_run(); + run_ramstage(); die("ERROR - Failed to load ramstage!"); } diff --git a/src/mainboard/intel/cougar_canyon2/romstage.c b/src/mainboard/intel/cougar_canyon2/romstage.c index 094ba328ef..998528dc4f 100644 --- a/src/mainboard/intel/cougar_canyon2/romstage.c +++ b/src/mainboard/intel/cougar_canyon2/romstage.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -39,7 +40,6 @@ #include #include #include "gpio.h" -#include #define SIO_PORT 0x164e @@ -303,7 +303,7 @@ void romstage_main_continue(EFI_STATUS status, VOID *HobListPtr) { post_code(0x4f); /* Load the ramstage. */ - copy_and_run(); + run_ramstage(); while (1); } 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 #include #include -#include #include #include #include @@ -26,6 +25,7 @@ #include #endif #include +#include #include #include #include @@ -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 #include #include -#include #include #include #include @@ -26,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -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 #include #include -#include #include #include #include #include +#include #include #include #include @@ -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 #include #include -#include #include #include +#include #include #include #include @@ -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); } diff --git a/src/southbridge/intel/fsp_i89xx/romstage.c b/src/southbridge/intel/fsp_i89xx/romstage.c index f14dd5b7f8..5bcc8fa794 100644 --- a/src/southbridge/intel/fsp_i89xx/romstage.c +++ b/src/southbridge/intel/fsp_i89xx/romstage.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -31,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -214,7 +214,7 @@ void romstage_main_continue(EFI_STATUS status, VOID *HobListPtr) { timestamp_add_now(TS_END_ROMSTAGE); - copy_and_run(); + run_ramstage(); } uint64_t get_initial_timestamp(void) diff --git a/src/southbridge/intel/fsp_rangeley/romstage.c b/src/southbridge/intel/fsp_rangeley/romstage.c index 2fe7b2e31e..042aaf93dd 100644 --- a/src/southbridge/intel/fsp_rangeley/romstage.c +++ b/src/southbridge/intel/fsp_rangeley/romstage.c @@ -26,12 +26,12 @@ #include #include #include +#include #include "northbridge/intel/fsp_rangeley/northbridge.h" #include "southbridge/intel/fsp_rangeley/soc.h" #include "southbridge/intel/fsp_rangeley/gpio.h" #include "southbridge/intel/fsp_rangeley/romstage.h" #include -#include #include #include "gpio.h" @@ -129,7 +129,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); } -- cgit v1.2.3