Message ID | 1492784689-15701-15-git-send-email-bmeng.cn@gmail.com |
---|---|
State | Accepted |
Delegated to: | Bin Meng |
Headers | show |
On Fri, Apr 21, 2017 at 10:24 PM, Bin Meng <bmeng.cn@gmail.com> wrote: > Call board_final_cleanup() before write_tables(), so that anything > done in board_final_cleanup() on a normal boot path is also done > on an S3 resume path. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v2: None > > arch/x86/cpu/cpu.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > applied to u-boot-x86/next, thanks!
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index f86eaa9..c9fc7e4 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -205,6 +205,8 @@ __weak void board_final_cleanup(void) int last_stage_init(void) { + board_final_cleanup(); + #if CONFIG_HAVE_ACPI_RESUME void *wake_vector = acpi_find_wakeup_vector(); @@ -214,8 +216,6 @@ int last_stage_init(void) write_tables(); - board_final_cleanup(); - return 0; } #endif