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

This reverts commit 1b07797a7b.

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>
This commit is contained in:
Shelley Chen 2022-11-17 00:41:38 +00:00
parent 32a3d93659
commit 6d4641d704
2 changed files with 5 additions and 7 deletions

View File

@ -19,6 +19,8 @@ config SOC_QUALCOMM_SC7280
select HAVE_LINEAR_FRAMEBUFFER select HAVE_LINEAR_FRAMEBUFFER
select COMPRESS_BOOTBLOCK select COMPRESS_BOOTBLOCK
select HAVE_UART_SPECIAL select HAVE_UART_SPECIAL
select PCI
select NO_ECAM_MMCONF_SUPPORT
if SOC_QUALCOMM_SC7280 if SOC_QUALCOMM_SC7280

View File

@ -43,15 +43,11 @@ static struct device_operations soc_ops = {
static void enable_soc_dev(struct device *dev) static void enable_soc_dev(struct device *dev)
{ {
/* Set the operations if it is a special bus type */ /* Set the operations if it is a special bus type */
if (dev->path.type == DEVICE_PATH_DOMAIN) { if (dev->path.type == DEVICE_PATH_DOMAIN)
if (CONFIG(PCI) && CONFIG(NO_ECAM_MMCONF_SUPPORT))
dev->ops = &pci_domain_ops; dev->ops = &pci_domain_ops;
else else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER)
printk(BIOS_INFO, "Skip setting PCIe ops\n");
} else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) {
dev->ops = &soc_ops; dev->ops = &soc_ops;
} }
}
struct chip_operations soc_qualcomm_sc7280_ops = { struct chip_operations soc_qualcomm_sc7280_ops = {
CHIP_NAME("SOC Qualcomm SC7280") CHIP_NAME("SOC Qualcomm SC7280")