diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2017-04-21 07:24:33 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2017-05-17 17:11:46 +0800 |
| commit | e652e1304a9f3b59b3e47005ea19b5b6a3e799d1 (patch) | |
| tree | 9652805e802f3b8e91a11363b5285c416e31af39 /arch/x86 | |
| parent | b727961b0706df57d408fe609cfe098a91626da3 (diff) | |
| download | u-boot-e652e1304a9f3b59b3e47005ea19b5b6a3e799d1.tar.gz u-boot-e652e1304a9f3b59b3e47005ea19b5b6a3e799d1.tar.xz u-boot-e652e1304a9f3b59b3e47005ea19b5b6a3e799d1.zip | |
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>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/global_data.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl b/arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl index eb5ae76186..5600723084 100644 --- 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 7d5efea224..b4ca4731a5 100644 --- 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 }; |