diff options
| author | Tom Rini <[email protected]> | 2023-06-20 09:35:16 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-06-20 09:35:16 -0400 |
| commit | 571d8e57345dd35525bab2b3b47638792b960252 (patch) | |
| tree | 9074635ccd9362356f04ab59bcf23bb1867c1ea5 /drivers | |
| parent | bb922ca3eb4b92a27e98fb5d81bf22242e9d4f0e (diff) | |
| parent | 02d9c0b0e5c95b0c8af475c4b8821abe62478419 (diff) | |
Merge branch '2023-06-19-spl-nvme-support' into next
To quote the author:
This patchset adds support to load images of the SPL's next booting
stage from a NVMe device
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/Makefile | 1 | ||||
| -rw-r--r-- | drivers/block/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/nvme/Makefile | 2 | ||||
| -rw-r--r-- | drivers/pci/Kconfig | 6 |
4 files changed, 15 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 29be78a3f28..78dcf62f76a 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -35,6 +35,7 @@ obj-$(CONFIG_$(SPL_)DM_MAILBOX) += mailbox/ obj-$(CONFIG_$(SPL_)REMOTEPROC) += remoteproc/ obj-$(CONFIG_$(SPL_)SYSINFO) += sysinfo/ obj-$(CONFIG_$(SPL_TPL_)TPM) += tpm/ +obj-$(CONFIG_$(SPL_)NVME) += nvme/ obj-$(CONFIG_XEN) += xen/ obj-$(CONFIG_$(SPL_)FPGA) += fpga/ obj-y += bus/ diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 5a1aeb3d2b4..6baaa6f0711 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -107,6 +107,13 @@ config EFI_MEDIA For sandbox there is a test driver. +config SPL_BLK_FS + bool "Load images from filesystems on block devices" + depends on SPL_BLK + help + Use generic support to load images from fat/ext filesystems on + different types of block devices such as NVMe. + if EFI_MEDIA config EFI_MEDIA_SANDBOX diff --git a/drivers/nvme/Makefile b/drivers/nvme/Makefile index fa7b6194460..fd3e68a91dc 100644 --- a/drivers/nvme/Makefile +++ b/drivers/nvme/Makefile @@ -4,4 +4,4 @@ obj-y += nvme-uclass.o nvme.o nvme_show.o obj-$(CONFIG_NVME_APPLE) += nvme_apple.o -obj-$(CONFIG_NVME_PCI) += nvme_pci.o +obj-$(CONFIG_$(SPL_)NVME_PCI) += nvme_pci.o diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 60d98d14640..84a2ae951f7 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -40,6 +40,12 @@ config PCI_PNP help Enable PCI memory and I/O space resource allocation and assignment. +config SPL_PCI_PNP + bool "Enable Plug & Play support for PCI" + help + Enable PCI memory and I/O space resource allocation and assignment. + This is required to auto configure the enumerated devices. + config PCI_REGION_MULTI_ENTRY bool "Enable Multiple entries of region type MEMORY in ranges for PCI" help |