[coreboot-gerrit] [S] Change in coreboot[main]: sb/amd/pi/hudson/Kconfig: replace HUDSON_LEGACY_FREE option

[Felix Held (Code Review)]

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/79893?usp=email )

Change subject: sb/amd/pi/hudson/Kconfig: replace HUDSON_LEGACY_FREE option
......................................................................

sb/amd/pi/hudson/Kconfig: replace HUDSON_LEGACY_FREE option

HUDSON_LEGACY_FREE controlled both if the legacy devices and the 8042
flags are set in the IA-PC boot architecture filed of the FADT. Since
some systems have legacy devices on the LPC bus, but no 8042-compatible
keyboard controller, replace this option with the two new options
HUDSON_FADT_LEGACY_DEVICES and HUDSON_FADT_8042.

TEST=The FACP table doesn't change on APU2

Signed-off-by: Felix Held 
Change-Id: Id4ff85630c90fb2ae8c8826bbc9049a08668210d
---
M src/mainboard/pcengines/apu2/Kconfig
M src/southbridge/amd/pi/hudson/Kconfig
M src/southbridge/amd/pi/hudson/fadt.c
3 files changed, 16 insertions(+), 15 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/79893/1

diff --git a/src/mainboard/pcengines/apu2/Kconfig b/src/mainboard/pcengines/apu2/Kconfig
index dd6536c..028d3b6 100644
--- a/src/mainboard/pcengines/apu2/Kconfig
+++ b/src/mainboard/pcengines/apu2/Kconfig
@@ -51,10 +51,6 @@
    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 0b90b9a..6205149 100644
--- a/src/southbridge/amd/pi/hudson/Kconfig
+++ b/src/southbridge/amd/pi/hudson/Kconfig
@@ -128,11 +128,16 @@
 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 y if there is no keyboard controller in the system.
-	  This sets variables in AGESA and ACPI.
+	  Select if there are legacy devices on the LPC bus.
+
+config HUDSON_FADT_8042
+	bool
+	help
+	  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 34d67b4..f76a054 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 @@

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 |