x86: Avoid #ifdef with CONFIG_HAVE_ACPI_RESUME
authorSimon Glass <sjg@chromium.org>
Fri, 10 Jul 2020 00:43:16 +0000 (18:43 -0600)
committerBin Meng <bmeng.cn@gmail.com>
Fri, 17 Jul 2020 06:32:24 +0000 (14:32 +0800)
commitef5f5f6ca691ac0b08dfae45f8723668a9fc46b6
tree510738a8a2f0665bdb0ef9dd61faee9c5f3b16e0
parentd450ce10cc7527c651c7d81b87cb82f1f37416c9
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>
arch/x86/cpu/apollolake/cpu_spl.c
arch/x86/cpu/apollolake/fsp_s.c
arch/x86/cpu/baytrail/acpi.c
arch/x86/cpu/broadwell/power_state.c
arch/x86/cpu/cpu.c
arch/x86/include/asm/global_data.h
arch/x86/lib/coreboot_table.c
arch/x86/lib/fsp/fsp_common.c
arch/x86/lib/fsp/fsp_dram.c
arch/x86/lib/fsp1/fsp_common.c
arch/x86/lib/fsp2/fsp_dram.c