aboutsummaryrefslogtreecommitdiff
path: root/src/soc/amd/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/amd/common')
-rw-r--r--src/soc/amd/common/block/pci/Kconfig7
-rw-r--r--src/soc/amd/common/block/pci/Makefile.inc1
-rw-r--r--src/soc/amd/common/fsp/pci/Kconfig7
-rw-r--r--src/soc/amd/common/fsp/pci/Makefile.inc5
-rw-r--r--src/soc/amd/common/fsp/pci/pcie_clk_req.c (renamed from src/soc/amd/common/block/pci/pcie_clk_req.c)0
5 files changed, 9 insertions, 11 deletions
diff --git a/src/soc/amd/common/block/pci/Kconfig b/src/soc/amd/common/block/pci/Kconfig
index 1c21833bd2..302a6b8497 100644
--- a/src/soc/amd/common/block/pci/Kconfig
+++ b/src/soc/amd/common/block/pci/Kconfig
@@ -16,10 +16,3 @@ config SOC_AMD_COMMON_BLOCK_PCIE_GPP_DRIVER
depends on SOC_AMD_COMMON_BLOCK_PCI
help
Select this option to use AMD common PCIe GPP driver.
-
-config SOC_AMD_COMMON_BLOCK_PCIE_CLK_REQ
- bool
- depends on SOC_AMD_COMMON_BLOCK_PCIE_GPP_DRIVER
- help
- This option includes code to disable PCIe clock request if the corresponding
- PCIe device is disabled.
diff --git a/src/soc/amd/common/block/pci/Makefile.inc b/src/soc/amd/common/block/pci/Makefile.inc
index 372c6ce411..ece43cb67e 100644
--- a/src/soc/amd/common/block/pci/Makefile.inc
+++ b/src/soc/amd/common/block/pci/Makefile.inc
@@ -5,7 +5,6 @@ ramstage-y += amd_pci_util.c
ramstage-y += pci_routing_info.c
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi_prt.c
ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_PCIE_GPP_DRIVER) += pcie_gpp.c
-ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_PCIE_CLK_REQ) += pcie_clk_req.c
endif # CONFIG_SOC_AMD_COMMON_BLOCK_PCI
diff --git a/src/soc/amd/common/fsp/pci/Kconfig b/src/soc/amd/common/fsp/pci/Kconfig
index 9d6596cc89..dce2c66562 100644
--- a/src/soc/amd/common/fsp/pci/Kconfig
+++ b/src/soc/amd/common/fsp/pci/Kconfig
@@ -3,3 +3,10 @@ config SOC_AMD_COMMON_FSP_PCI
select SOC_AMD_COMMON_BLOCK_PCI
help
This option enabled FSP to provide common PCI functions.
+
+config SOC_AMD_COMMON_FSP_PCIE_CLK_REQ
+ bool
+ depends on SOC_AMD_COMMON_BLOCK_PCIE_GPP_DRIVER
+ help
+ This option includes code to disable PCIe clock request if the corresponding
+ PCIe device is disabled.
diff --git a/src/soc/amd/common/fsp/pci/Makefile.inc b/src/soc/amd/common/fsp/pci/Makefile.inc
index 85418f395f..e0b2cd97a7 100644
--- a/src/soc/amd/common/fsp/pci/Makefile.inc
+++ b/src/soc/amd/common/fsp/pci/Makefile.inc
@@ -1,6 +1,5 @@
## SPDX-License-Identifier: GPL-2.0-only
-ifeq ($(CONFIG_SOC_AMD_COMMON_FSP_PCI),y)
-ramstage-y += pci_routing_info.c
+ramstage-$(CONFIG_SOC_AMD_COMMON_FSP_PCI) += pci_routing_info.c
-endif # CONFIG_SOC_AMD_COMMON_FSP_PCI
+ramstage-$(CONFIG_SOC_AMD_COMMON_FSP_PCIE_CLK_REQ) += pcie_clk_req.c
diff --git a/src/soc/amd/common/block/pci/pcie_clk_req.c b/src/soc/amd/common/fsp/pci/pcie_clk_req.c
index 881c650ed4..881c650ed4 100644
--- a/src/soc/amd/common/block/pci/pcie_clk_req.c
+++ b/src/soc/amd/common/fsp/pci/pcie_clk_req.c