Merge tag 'u-boot-amlogic-20201005' of https://gitlab.denx.de/u-boot/custodians/u...

[J-u-boot.git] / arch / x86 / cpu / apollolake / cpu_spl.c

diff --git a/arch/x86/cpu/apollolake/cpu_spl.c b/arch/x86/cpu/apollolake/cpu_spl.c
index 8a39c3128e0480f2c095bbcbb7f53bca504ecd3d..9f32f2e27e125e2d69a6a8b8fa820c00c571f1dd 100644 (file)
--- a/arch/x86/cpu/apollolake/cpu_spl.c
+++ b/arch/x86/cpu/apollolake/cpu_spl.c
@@ -6,13 +6,14 @@
  */
 
 #include <common.h>
-#include <acpi_s3.h>
 #include <dm.h>
 #include <ec_commands.h>
+#include <init.h>
 #include <log.h>
 #include <spi_flash.h>
 #include <spl.h>
 #include <syscon.h>
+#include <acpi/acpi_s3.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
 #include <asm/cpu_x86.h>
@@ -246,12 +247,13 @@ static int arch_cpu_init_spl(void)
        ret = pmc_init(pmc);
        if (ret < 0)
                return log_msg_ret("Could not init PMC", ret);
-#ifdef CONFIG_HAVE_ACPI_RESUME
-       ret = pmc_prev_sleep_state(pmc);
-       if (ret < 0)
-               return log_msg_ret("Could not get PMC sleep state", ret);
-       gd->arch.prev_sleep_state = ret;
-#endif
+       if (IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)) {
+               ret = pmc_prev_sleep_state(pmc);
+               if (ret < 0)
+                       return log_msg_ret("Could not get PMC sleep state",
+                                          ret);
+               gd->arch.prev_sleep_state = ret;
+       }
 
        return 0;
 }