[coreboot-gerrit] [S] Change in coreboot[master]: Revert "soc/qualcomm/sc7280: Remove NVMe init"

[Shelley Chen (Code Review)]

Shelley Chen has submitted this change. ( https://review.coreboot.org/c/coreboot/+/69719 )

Change subject: Revert "soc/qualcomm/sc7280: Remove NVMe init"
......................................................................

Revert "soc/qualcomm/sc7280: Remove NVMe init"

This reverts commit 1b07797a7b79ea6c11421b61b9cf14b92cb91c66.

Reason for revert: Herobrine program decided that we wanted
to be able to boot from NVMe if one exists.

Change-Id: If675947026095d16b72bdb0f3ec790e583523465
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69719
Reviewed-by: Julius Werner 
Tested-by: build bot (Jenkins) 
---
M src/soc/qualcomm/sc7280/Kconfig
M src/soc/qualcomm/sc7280/soc.c
2 files changed, 22 insertions(+), 7 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Julius Werner: Looks good to me, approved

diff --git a/src/soc/qualcomm/sc7280/Kconfig b/src/soc/qualcomm/sc7280/Kconfig
index 3f3ded3..ccba8ff 100644
--- a/src/soc/qualcomm/sc7280/Kconfig
+++ b/src/soc/qualcomm/sc7280/Kconfig
@@ -19,6 +19,8 @@
    select HAVE_LINEAR_FRAMEBUFFER
    select COMPRESS_BOOTBLOCK
    select HAVE_UART_SPECIAL
+	select PCI
+	select NO_ECAM_MMCONF_SUPPORT

if SOC_QUALCOMM_SC7280

diff --git a/src/soc/qualcomm/sc7280/soc.c b/src/soc/qualcomm/sc7280/soc.c
index 265a694..dc5a9b0 100644
--- a/src/soc/qualcomm/sc7280/soc.c
+++ b/src/soc/qualcomm/sc7280/soc.c
@@ -43,14 +43,10 @@
 static void enable_soc_dev(struct device *dev)
 {
    /* Set the operations if it is a special bus type */
-	if (dev->path.type == DEVICE_PATH_DOMAIN) {
-		if (CONFIG(PCI) && CONFIG(NO_ECAM_MMCONF_SUPPORT))
-			dev->ops = &pci_domain_ops;
-		else
-			printk(BIOS_INFO,  "Skip setting PCIe ops\n");
-	} else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) {
+	if (dev->path.type == DEVICE_PATH_DOMAIN)
+		dev->ops = &pci_domain_ops;
+	else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER)
    	dev->ops = &soc_ops;
-	}
 }

struct chip_operations soc_qualcomm_sc7280_ops = {