From: Pranav Sanwal Date: Fri, 27 Mar 2026 12:10:15 +0000 (+0530) Subject: amd: versal2: Enable PCIe/NVMe support and add NVMe boot target X-Git-Tag: v2026.07-rc1~20^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e17b275c56e5c3ee7068cf208bef54d1c48528e;p=thirdparty%2Fu-boot.git amd: versal2: Enable PCIe/NVMe support and add NVMe boot target Enable the AMD Versal Gen 2 DW PCIe host controller and NVMe storage in the virtual platform defconfig: - CONFIG_PCI / CONFIG_CMD_PCI: core PCI stack and pci command - CONFIG_PCIE_DW_AMD: AMD Versal Gen 2 PCIe host driver - CONFIG_NVME_PCI: NVMe-over-PCIe storage driver - CONFIG_CMD_LSBLK: block device listing command - CONFIG_DM_PCA953X: GPIO expander driver for PERST# control Add BOOT_TARGET_DEVICES_NVME to amd_versal2.h so NVMe is included in the distro boot target list when CONFIG_NVME is enabled. Signed-off-by: Pranav Sanwal Link: https://lore.kernel.org/r/20260327121015.996806-4-pranav.sanwal@amd.com Signed-off-by: Michal Simek --- diff --git a/configs/amd_versal2_virt_defconfig b/configs/amd_versal2_virt_defconfig index 0f4b75c72e1..bf3caf22167 100644 --- a/configs/amd_versal2_virt_defconfig +++ b/configs/amd_versal2_virt_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_BOOTM_LEN=0x6400000 CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_XILINX_OF_BOARD_DTB_ADDR=0x1000000 CONFIG_CMD_FRU=y +CONFIG_PCI=y CONFIG_SYS_MEMTEST_START=0x00000000 CONFIG_SYS_MEMTEST_END=0x00001000 CONFIG_REMAKE_ELF=y @@ -40,10 +41,12 @@ 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_OPTEE=y CONFIG_CMD_MTD=y +CONFIG_CMD_PCI=y CONFIG_CMD_POWEROFF=y CONFIG_CMD_SF_TEST=y CONFIG_CMD_SPI=y @@ -84,6 +87,7 @@ CONFIG_SCMI_FIRMWARE=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_VERSALPL=y CONFIG_GPIO_DELAY=y +CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_CADENCE=y CONFIG_I2C_MUX=y @@ -123,6 +127,8 @@ CONFIG_DM_ETH_PHY=y CONFIG_PHY_GIGE=y CONFIG_XILINX_AXIEMAC=y CONFIG_ZYNQ_GEM=y +CONFIG_NVME_PCI=y +CONFIG_PCIE_DW_AMD=y CONFIG_POWER_DOMAIN=y CONFIG_ZYNQMP_POWER_DOMAIN=y CONFIG_RESET_SCMI=y diff --git a/include/configs/amd_versal2.h b/include/configs/amd_versal2.h index 38d0bfc315b..fccc786219f 100644 --- a/include/configs/amd_versal2.h +++ b/include/configs/amd_versal2.h @@ -2,7 +2,7 @@ /* * Configuration for AMD Versal Gen 2 * Copyright (C) 2016 - 2022, Xilinx, Inc. - * Copyright (C) 2022 - 2024, Advanced Micro Devices, Inc. + * Copyright (C) 2022 - 2026, Advanced Micro Devices, Inc. * * Michal Simek * @@ -132,11 +132,18 @@ #define BOOT_TARGET_DEVICES_USB(func) #endif +#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_UFS(func) \ BOOT_TARGET_DEVICES_XSPI(func) \ + BOOT_TARGET_DEVICES_NVME(func) \ BOOT_TARGET_DEVICES_DFU_USB(func) \ BOOT_TARGET_DEVICES_USB(func) \ BOOT_TARGET_DEVICES_PXE(func) \