brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

x86: coral: Avoid build error with !CONFIG_ACPIGEN

Browse Source 
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>
This commit is contained in:
Simon Glass 2021-03-15 18:00:30 +13:00
parent b8bcccedac
commit 2018a33cb7
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/cpu/apollolake/cpu.c
View File

@ -19,6 +19,7 @@
#include <asm/arch/iomap.h> #include <asm/arch/iomap.h>
#include <dm/acpi.h> #include <dm/acpi.h>
#ifdef CONFIG_ACPIGEN
#define CSTATE_RES(address_space, width, offset, address) \ #define CSTATE_RES(address_space, width, offset, address) \
{ \ { \
.space_id = address_space, \ .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) static int acpi_cpu_fill_ssdt(const struct udevice *dev, struct acpi_ctx *ctx)
{ {
uint core_id = dev_seq(dev); 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; 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) static void update_fixed_mtrrs(void)
{ {
@ -170,9 +172,11 @@ static int cpu_apl_probe(struct udevice *dev)
return 0; return 0;
} }
#ifdef CONFIG_ACPIGEN
struct acpi_ops apl_cpu_acpi_ops = { struct acpi_ops apl_cpu_acpi_ops = {
.fill_ssdt = acpi_cpu_fill_ssdt, .fill_ssdt = acpi_cpu_fill_ssdt,
}; };
#endif
static const struct cpu_ops cpu_x86_apl_ops = { static const struct cpu_ops cpu_x86_apl_ops = {
.get_desc = cpu_x86_get_desc, .get_desc = cpu_x86_get_desc,