diff options
Diffstat (limited to 'src/soc/amd')
| -rw-r--r-- | src/soc/amd/common/block/include/amdblocks/chip.h | 4 | ||||
| -rw-r--r-- | src/soc/amd/picasso/acpi.c | 3 | ||||
| -rw-r--r-- | src/soc/amd/picasso/chip.h | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/soc/amd/common/block/include/amdblocks/chip.h b/src/soc/amd/common/block/include/amdblocks/chip.h index c1820e2659..b365e4d5d0 100644 --- a/src/soc/amd/common/block/include/amdblocks/chip.h +++ b/src/soc/amd/common/block/include/amdblocks/chip.h @@ -20,6 +20,10 @@ struct soc_amd_common_config { /* eSPI configuration */ struct espi_config espi_config; + + /* Options for these are in src/include/acpi/acpi.h */ + uint16_t fadt_boot_arch; + uint32_t fadt_flags; }; /* diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index 5cee2039e8..a6bc97b361 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -19,6 +19,7 @@ #include <device/pci.h> #include <amdblocks/acpimmio.h> #include <amdblocks/acpi.h> +#include <amdblocks/chip.h> #include <amdblocks/cpu.h> #include <soc/acpi.h> #include <soc/pci_devs.h> @@ -80,7 +81,7 @@ unsigned long acpi_fill_madt(unsigned long current) */ void acpi_fill_fadt(acpi_fadt_t *fadt) { - const struct soc_amd_picasso_config *cfg = config_of_soc(); + const struct soc_amd_common_config *cfg = soc_get_common_config(); printk(BIOS_DEBUG, "pm_base: 0x%04x\n", ACPI_IO_BASE); diff --git a/src/soc/amd/picasso/chip.h b/src/soc/amd/picasso/chip.h index 313b6c3abf..a66d77c89e 100644 --- a/src/soc/amd/picasso/chip.h +++ b/src/soc/amd/picasso/chip.h @@ -131,10 +131,6 @@ struct soc_amd_picasso_config { uint8_t flags; } irq_override[16]; - /* Options for these are in src/arch/x86/include/acpi/acpi.h */ - uint16_t fadt_boot_arch; - uint32_t fadt_flags; - /* System config index */ uint8_t system_config; |