diff options
| author | Shelley Chen <shchen@google.com> | 2022-11-17 00:41:38 +0000 |
|---|---|---|
| committer | Shelley Chen <shchen@google.com> | 2022-11-17 02:36:42 +0000 |
| commit | 6d4641d7042ebf03e4988ef8386395f30d75c685 (patch) | |
| tree | 70c905339282b6f616e39a6cfed35b3969cca10f /src/soc/qualcomm | |
| parent | 32a3d93659482f78e2b74b8ad89b81a4ec8f1f81 (diff) | |
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 <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/qualcomm')
| -rw-r--r-- | src/soc/qualcomm/sc7280/Kconfig | 2 | ||||
| -rw-r--r-- | src/soc/qualcomm/sc7280/soc.c | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/soc/qualcomm/sc7280/Kconfig b/src/soc/qualcomm/sc7280/Kconfig index 3f3ded3c59..ccba8ff9b5 100644 --- a/src/soc/qualcomm/sc7280/Kconfig +++ b/src/soc/qualcomm/sc7280/Kconfig @@ -19,6 +19,8 @@ config SOC_QUALCOMM_SC7280 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 265a69479e..dc5a9b0b78 100644 --- a/src/soc/qualcomm/sc7280/soc.c +++ b/src/soc/qualcomm/sc7280/soc.c @@ -43,14 +43,10 @@ static struct device_operations soc_ops = { 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 = { |