Enable the AMD Versal CPM/QDMA PCIe host controllers and NVMe storage in the virtual platform defconfig.
Add BOOT_TARGET_DEVICES_NVME to xilinx_versal.h so NVMe is included in the distro boot target list when CONFIG_NVME is enabled. Signed-off-by: Pranav Sanwal <[email protected]> --- configs/xilinx_versal_virt_defconfig | 6 ++++++ include/configs/xilinx_versal.h | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index a94468d9b9b..647e0455f85 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -16,6 +16,7 @@ CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_ENV_OFFSET_REDUND=0x7F00000 CONFIG_CMD_FRU=y CONFIG_DEFINE_TCM_OCM_MMAP=y +CONFIG_PCI=y CONFIG_SYS_MEMTEST_START=0x00000000 CONFIG_SYS_MEMTEST_END=0x00001000 CONFIG_REMAKE_ELF=y @@ -47,9 +48,11 @@ CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y +CONFIG_CMD_LSBLK=y CONFIG_CMD_MMC=y CONFIG_MMC_SPEED_MODE_SET=y CONFIG_CMD_MTD=y +CONFIG_CMD_PCI=y CONFIG_CMD_SF_TEST=y CONFIG_CMD_USB=y CONFIG_CMD_NFS=y @@ -135,6 +138,9 @@ CONFIG_PHY_NATSEMI=y CONFIG_PHY_REALTEK=y CONFIG_PHY_TI_DP83867=y CONFIG_PHY_FIXED=y +CONFIG_NVME_PCI=y +CONFIG_PCIE_AMD_CPM=y +CONFIG_PCIE_AMD_QDMA_PL=y CONFIG_POWER_DOMAIN=y CONFIG_ZYNQMP_POWER_DOMAIN=y CONFIG_RESET_ZYNQMP=y diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index 64f123424cf..cea3340cf2e 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -118,10 +118,17 @@ #define BOOTENV_DEV_NAME_USB_THOR(devtypeu, devtypel, instance) \ "" +#if defined(CONFIG_NVME) +# define BOOT_TARGET_DEVICES_NVME(func) func(NVME, nvme, 0) +#else +# define BOOT_TARGET_DEVICES_NVME(func) +#endif + #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_DEVICES_JTAG(func) \ BOOT_TARGET_DEVICES_MMC(func) \ BOOT_TARGET_DEVICES_XSPI(func) \ + BOOT_TARGET_DEVICES_NVME(func) \ BOOT_TARGET_DEVICES_USB_DFU(func) \ BOOT_TARGET_DEVICES_USB_THOR(func) \ BOOT_TARGET_DEVICES_USB(func) \ -- 2.43.7
