Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32656 )
Change subject: soc/amd/stoneyridge: Move hda.c to common ......................................................................
soc/amd/stoneyridge: Move hda.c to common
BUG=b:131682806
Change-Id: I1aa869584fd6743101c07a6a508abff6426df18d Signed-off-by: Marshall Dawson marshalldawson3rd@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/32656 Reviewed-by: Furquan Shaikh furquan@google.com Reviewed-by: Richard Spiegel richard.spiegel@silverbackltd.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- A src/soc/amd/common/block/hda/Kconfig A src/soc/amd/common/block/hda/Makefile.inc R src/soc/amd/common/block/hda/hda.c M src/soc/amd/stoneyridge/Kconfig M src/soc/amd/stoneyridge/Makefile.inc 5 files changed, 8 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved Richard Spiegel: Looks good to me, approved
diff --git a/src/soc/amd/common/block/hda/Kconfig b/src/soc/amd/common/block/hda/Kconfig new file mode 100644 index 0000000..775de2f --- /dev/null +++ b/src/soc/amd/common/block/hda/Kconfig @@ -0,0 +1,6 @@ +config SOC_AMD_COMMON_BLOCK_HDA + bool + default n + help + Select this option to use AMD common High Definition Audio + driver support. diff --git a/src/soc/amd/common/block/hda/Makefile.inc b/src/soc/amd/common/block/hda/Makefile.inc new file mode 100644 index 0000000..d6f1b32 --- /dev/null +++ b/src/soc/amd/common/block/hda/Makefile.inc @@ -0,0 +1 @@ +ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_HDA) += hda.c diff --git a/src/soc/amd/stoneyridge/hda.c b/src/soc/amd/common/block/hda/hda.c similarity index 97% rename from src/soc/amd/stoneyridge/hda.c rename to src/soc/amd/common/block/hda/hda.c index 0ab2f91..f4ea732 100644 --- a/src/soc/amd/stoneyridge/hda.c +++ b/src/soc/amd/common/block/hda/hda.c @@ -17,7 +17,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> -#include <soc/southbridge.h>
static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_AMD_SB900_HDA, diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index ed9aaf0..d386012 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -51,6 +51,7 @@ select SOC_AMD_COMMON_BLOCK_ACPI select SOC_AMD_COMMON_BLOCK_LPC select SOC_AMD_COMMON_BLOCK_PCI + select SOC_AMD_COMMON_BLOCK_HDA select SOC_AMD_COMMON_BLOCK_PI select SOC_AMD_COMMON_BLOCK_PSP select SOC_AMD_COMMON_BLOCK_CAR diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc index e235ada..7c4e875 100644 --- a/src/soc/amd/stoneyridge/Makefile.inc +++ b/src/soc/amd/stoneyridge/Makefile.inc @@ -99,7 +99,6 @@ ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c ramstage-y += gpio.c -ramstage-y += hda.c ramstage-y += iommu.c ramstage-y += monotonic_timer.c ramstage-y += southbridge.c