diff options
| -rw-r--r-- | src/mainboard/pcengines/apu2/Kconfig | 4 | ||||
| -rw-r--r-- | src/southbridge/amd/pi/hudson/Kconfig | 13 | ||||
| -rw-r--r-- | src/southbridge/amd/pi/hudson/fadt.c | 14 |
3 files changed, 16 insertions, 15 deletions
diff --git a/src/mainboard/pcengines/apu2/Kconfig b/src/mainboard/pcengines/apu2/Kconfig index dd6536c923..028d3b65da 100644 --- a/src/mainboard/pcengines/apu2/Kconfig +++ b/src/mainboard/pcengines/apu2/Kconfig @@ -51,10 +51,6 @@ config ONBOARD_VGA_IS_PRIMARY bool default y -config HUDSON_LEGACY_FREE - bool - default y - config AGESA_BINARY_PI_FILE string default "3rdparty/blobs/mainboard/pcengines/apu2/AGESA.bin" diff --git a/src/southbridge/amd/pi/hudson/Kconfig b/src/southbridge/amd/pi/hudson/Kconfig index 04d77fd89c..4630df9cca 100644 --- a/src/southbridge/amd/pi/hudson/Kconfig +++ b/src/southbridge/amd/pi/hudson/Kconfig @@ -129,11 +129,16 @@ comment "AHCI7804" comment "IDE to AHCI7804" depends on HUDSON_SATA_MODE = 6 -config HUDSON_LEGACY_FREE - bool "System is legacy free" +config HUDSON_FADT_LEGACY_DEVICES + bool + help + Select if there are legacy devices on the LPC bus. + +config HUDSON_FADT_8042 + bool help - Select y if there is no keyboard controller in the system. - This sets variables in AGESA and ACPI. + Select if there is an 8042-compatible keyboard controller in the + system. config AMDFW_OUTSIDE_CBFS def_bool n diff --git a/src/southbridge/amd/pi/hudson/fadt.c b/src/southbridge/amd/pi/hudson/fadt.c index 34d67b408d..f76a0549a1 100644 --- a/src/southbridge/amd/pi/hudson/fadt.c +++ b/src/southbridge/amd/pi/hudson/fadt.c @@ -11,12 +11,6 @@ #include "hudson.h" #include "smi.h" -#if CONFIG(HUDSON_LEGACY_FREE) - #define FADT_BOOT_ARCH ACPI_FADT_LEGACY_FREE -#else - #define FADT_BOOT_ARCH (ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042) -#endif - /* * Reference section 5.2.9 Fixed ACPI Description Table (FADT) * in the ACPI 3.0b specification. @@ -40,7 +34,13 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) fadt->duty_offset = 1; /* CLK_VAL bits 3:1 */ fadt->duty_width = 3; /* CLK_VAL bits 3:1 */ - fadt->iapc_boot_arch = FADT_BOOT_ARCH; /* See table 5-10 */ + + fadt->iapc_boot_arch = ACPI_FADT_LEGACY_FREE; /* See table 5-10 */ + if (CONFIG(HUDSON_FADT_LEGACY_DEVICES)) + fadt->iapc_boot_arch |= ACPI_FADT_LEGACY_DEVICES; + if (CONFIG(HUDSON_FADT_8042)) + fadt->iapc_boot_arch |= ACPI_FADT_8042; + fadt->res2 = 0; /* reserved, MUST be 0 ACPI 3.0 */ fadt->flags |= ACPI_FADT_WBINVD | /* See table 5-10 ACPI 3.0a spec */ ACPI_FADT_C1_SUPPORTED | |