aboutsummaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorMarshall Dawson <marshalldawson3rd@gmail.com>2019-05-03 12:42:29 -0600
committerMartin Roth <martinroth@google.com>2019-06-06 18:51:15 +0000
commit43c26cb07fa42e6d5013f2e6bcb4e05522d24c1b (patch)
tree91aa7b2b36118a71f042e9f6d4e960bee1d61799 /src/soc
parent4ee83b2f9435fe08cb73ba818b567597cafd973d (diff)
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>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/amd/common/block/hda/Kconfig6
-rw-r--r--src/soc/amd/common/block/hda/Makefile.inc1
-rw-r--r--src/soc/amd/common/block/hda/hda.c (renamed from src/soc/amd/stoneyridge/hda.c)1
-rw-r--r--src/soc/amd/stoneyridge/Kconfig1
-rw-r--r--src/soc/amd/stoneyridge/Makefile.inc1
5 files changed, 8 insertions, 2 deletions
diff --git a/src/soc/amd/common/block/hda/Kconfig b/src/soc/amd/common/block/hda/Kconfig
new file mode 100644
index 0000000000..775de2fd8c
--- /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 0000000000..d6f1b3275a
--- /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
index 0ab2f91ee7..f4ea732fba 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 ed9aaf05ba..d386012a86 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -51,6 +51,7 @@ config CPU_SPECIFIC_OPTIONS
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 e235adaab2..7c4e875130 100644
--- a/src/soc/amd/stoneyridge/Makefile.inc
+++ b/src/soc/amd/stoneyridge/Makefile.inc
@@ -99,7 +99,6 @@ ramstage-y += mca.c
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