diff options
| author | Simon Glass <sjg@chromium.org> | 2020-07-09 18:43:16 -0600 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2020-07-17 14:32:24 +0800 |
| commit | ef5f5f6ca691ac0b08dfae45f8723668a9fc46b6 (patch) | |
| tree | 510738a8a2f0665bdb0ef9dd61faee9c5f3b16e0 /arch/x86/include/asm/global_data.h | |
| parent | d450ce10cc7527c651c7d81b87cb82f1f37416c9 (diff) | |
| download | u-boot-ef5f5f6ca691ac0b08dfae45f8723668a9fc46b6.zip u-boot-ef5f5f6ca691ac0b08dfae45f8723668a9fc46b6.tar.gz u-boot-ef5f5f6ca691ac0b08dfae45f8723668a9fc46b6.tar.bz2 | |
x86: Avoid #ifdef with CONFIG_HAVE_ACPI_RESUME
At present this enables a few arch-specific members of the global_data
struct which are otherwise not part of the struct. As a result we have to
use #ifdef in various places.
The cost of always having these in the struct is small. Adjust things so
that we can use compile-time code instead of #ifdefs.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'arch/x86/include/asm/global_data.h')
| -rw-r--r-- | arch/x86/include/asm/global_data.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index 4aee2f3..0e64c8a 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -116,10 +116,8 @@ struct arch_global_data { u32 high_table_ptr; u32 high_table_limit; #endif -#ifdef CONFIG_HAVE_ACPI_RESUME int prev_sleep_state; /* Previous sleep state ACPI_S0/1../5 */ ulong backup_mem; /* Backup memory address for S3 */ -#endif #ifdef CONFIG_FSP_VERSION2 struct fsp_header *fsp_s_hdr; /* Pointer to FSP-S header */ #endif |