x86: baytrail: Conditionally report S3 in the ACPI table

When U-Boot is built without ACPI S3 support, it should not report
S3 in the ACPI table otherwise when kernel does STR it won't work.

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/include/asm/arch-baytrail/acpi/sleepstates.asl b/arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl
index eb5ae76186f1d61286fb6cdee185e6e298510930..56007230843a496907b143157b64c54ef4efde0e 100644 (file)
--- a/arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl
+++ b/arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl
@@ -8,6 +8,8 @@
  */
 
 Name(\_S0, Package() {0x0, 0x0, 0x0, 0x0})
+#ifdef CONFIG_HAVE_ACPI_RESUME
 Name(\_S3, Package() {0x5, 0x0, 0x0, 0x0})
+#endif
 Name(\_S4, Package() {0x6, 0x0, 0x0, 0x0})
 Name(\_S5, Package() {0x7, 0x0, 0x0, 0x0})

diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index 7d5efea224ccc93375a2107c5b07ef07067943dc..b4ca4731a547fb77850bc065abe91b60f85c766b 100644 (file)
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -100,7 +100,7 @@ struct arch_global_data {
        u32 high_table_limit;
 #endif
 #ifdef CONFIG_HAVE_ACPI_RESUME
-       int prev_sleep_state;           /* Previous sleep state */
+       int prev_sleep_state;           /* Previous sleep state ACPI_S0/1../5 */
 #endif
 };