aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2017-04-21 07:24:41 -0700
committerBin Meng <bmeng.cn@gmail.com>2017-05-17 17:11:46 +0800
commitbffd798136deb4622059b5aeb33c375fad554ac7 (patch)
tree3a07f84534296a03714280e45ddf4770ab32ed04
parent95e50dd197cb86641a4ad06a18d5a4c57ea0a6f4 (diff)
downloadu-boot-bffd798136deb4622059b5aeb33c375fad554ac7.zip
u-boot-bffd798136deb4622059b5aeb33c375fad554ac7.tar.gz
u-boot-bffd798136deb4622059b5aeb33c375fad554ac7.tar.bz2
x86: Adjust board_final_cleanup() order
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> Tested-by: Stefan Roese <sr@denx.de>
-rw-r--r--arch/x86/cpu/cpu.c4
1 files changed, 2 insertions, 2 deletions
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