From 88f43aa39cd32ef5f102931835c4a29c6892c110 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 30 Sep 2024 13:03:52 +0200 Subject: arm64: versal: Remove description for USB1 There is only one USB controller that's why remove description for USB1. Signed-off-by: Michal Simek Link: https://lore.kernel.org/r/f148161ee489d19d708df1b4fa7477821e06bb55.1727694230.git.michal.simek@amd.com --- include/configs/xilinx_versal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index dc3f41b94a2..212dc9df2a2 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -85,7 +85,7 @@ "jtag " #define BOOT_TARGET_DEVICES_USB_DFU(func) \ - func(USB_DFU, usb_dfu, 0) func(USB_DFU, usb_dfu, 1) + func(USB_DFU, usb_dfu, 0) #define BOOTENV_DEV_USB_DFU(devtypeu, devtypel, instance) \ "bootcmd_" #devtypel #instance "=setenv dfu_alt_info boot.scr ram " \ @@ -99,7 +99,7 @@ "" #define BOOT_TARGET_DEVICES_USB_THOR(func) \ - func(USB_THOR, usb_thor, 0) func(USB_THOR, usb_thor, 1) + func(USB_THOR, usb_thor, 0) #define BOOTENV_DEV_USB_THOR(devtypeu, devtypel, instance) \ "bootcmd_" #devtypel #instance "=setenv dfu_alt_info boot.scr ram " \ -- cgit v1.2.3 From f346dd67d047ad19f076d901dcc5295a2eb0cdde Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 30 Sep 2024 13:03:53 +0200 Subject: arm64: versal: Wire USB0 in distro boot For unknown reason USB host hasn't been described for distro boot that's why wire it now. Signed-off-by: Michal Simek Link: https://lore.kernel.org/r/9715605c232ce38a36a200204c14208b9d76cd83.1727694230.git.michal.simek@amd.com --- include/configs/xilinx_versal.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include') diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index 212dc9df2a2..64f123424cf 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -48,6 +48,12 @@ # define BOOT_TARGET_DEVICES_MMC(func) #endif +#if defined(CONFIG_USB_STORAGE) +# define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) +#else +# define BOOT_TARGET_DEVICES_USB(func) +#endif + #if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP) # define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na) #else @@ -118,6 +124,7 @@ BOOT_TARGET_DEVICES_XSPI(func) \ BOOT_TARGET_DEVICES_USB_DFU(func) \ BOOT_TARGET_DEVICES_USB_THOR(func) \ + BOOT_TARGET_DEVICES_USB(func) \ BOOT_TARGET_DEVICES_PXE(func) \ BOOT_TARGET_DEVICES_DHCP(func) -- cgit v1.2.3