From: Bin Meng <bmeng.cn@gmail.com>
Date: Fri, 21 Apr 2017 14:24:41 +0000 (-0700)
Subject: x86: Adjust board_final_cleanup() order
X-Git-Tag: v2017.07-rc1~254^2~15
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bffd798136deb4622059b5aeb33c375fad554ac7;p=u-boot

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>
---

diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index f86eaa9df2..c9fc7e4ebf 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