diff options
| author | Simon Glass <sjg@chromium.org> | 2021-03-15 18:00:30 +1300 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-03-27 15:04:30 +1300 |
| commit | 2018a33cb7e5adc1c71dd63ec4502b79a758757a (patch) | |
| tree | dfa69f955daa0a962b99419b6dd60ff28d80f665 /arch/x86/cpu | |
| parent | b8bcccedac91b8551bf00af724d6a5d45f47bd0f (diff) | |
| download | u-boot-2018a33cb7e5adc1c71dd63ec4502b79a758757a.zip u-boot-2018a33cb7e5adc1c71dd63ec4502b79a758757a.tar.gz u-boot-2018a33cb7e5adc1c71dd63ec4502b79a758757a.tar.bz2 | |
x86: coral: Avoid build error with !CONFIG_ACPIGEN
When CONFIG_ACPIGEN is not enabled the CPU code does not build. Fix this
by moving things around.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86/cpu')
| -rw-r--r-- | arch/x86/cpu/apollolake/cpu.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/x86/cpu/apollolake/cpu.c b/arch/x86/cpu/apollolake/cpu.c index fbc016d..647c9df 100644 --- a/arch/x86/cpu/apollolake/cpu.c +++ b/arch/x86/cpu/apollolake/cpu.c @@ -19,6 +19,7 @@ #include <asm/arch/iomap.h> #include <dm/acpi.h> +#ifdef CONFIG_ACPIGEN #define CSTATE_RES(address_space, width, offset, address) \ { \ .space_id = address_space, \ @@ -57,11 +58,6 @@ static struct acpi_cstate cstate_map[] = { }, }; -static int apl_get_info(const struct udevice *dev, struct cpu_info *info) -{ - return cpu_intel_get_info(info, INTEL_BCLK_MHZ); -} - static int acpi_cpu_fill_ssdt(const struct udevice *dev, struct acpi_ctx *ctx) { uint core_id = dev_seq(dev); @@ -89,6 +85,12 @@ static int acpi_cpu_fill_ssdt(const struct udevice *dev, struct acpi_ctx *ctx) return 0; } +#endif /* CONFIG_ACPIGEN */ + +static int apl_get_info(const struct udevice *dev, struct cpu_info *info) +{ + return cpu_intel_get_info(info, INTEL_BCLK_MHZ); +} static void update_fixed_mtrrs(void) { @@ -170,9 +172,11 @@ static int cpu_apl_probe(struct udevice *dev) return 0; } +#ifdef CONFIG_ACPIGEN struct acpi_ops apl_cpu_acpi_ops = { .fill_ssdt = acpi_cpu_fill_ssdt, }; +#endif static const struct cpu_ops cpu_x86_apl_ops = { .get_desc = cpu_x86_get_desc, |