[PATCH 1/2] arm64: versal: Remove description for USB1

There is only one USB controller that's why remove description for USB1.
Signed-off-by: Michal Simek michal.simek@amd.com ---
include/configs/xilinx_versal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index dc3f41b94a29..212dc9df2a2e 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 " \

For unknown reason USB host hasn't been described for distro boot that's why wire it now.
Signed-off-by: Michal Simek michal.simek@amd.com ---
include/configs/xilinx_versal.h | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index 212dc9df2a2e..64f123424cf7 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)

On 9/30/24 13:03, Michal Simek wrote:
For unknown reason USB host hasn't been described for distro boot that's why wire it now.
Signed-off-by: Michal Simek michal.simek@amd.com
include/configs/xilinx_versal.h | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index 212dc9df2a2e..64f123424cf7 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)
Applied. M

Hi Michal,
On Mon, 30 Sept 2024 at 05:05, Michal Simek michal.simek@amd.com wrote:
For unknown reason USB host hasn't been described for distro boot that's why wire it now.
Signed-off-by: Michal Simek michal.simek@amd.com
include/configs/xilinx_versal.h | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index 212dc9df2a2e..64f123424cf7 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)
-- 2.43.0
I wonder if these could move to boostd? It would require implementing something for dfu and thor, though.
Regards, Simon

On 10/9/24 03:56, Simon Glass wrote:
Hi Michal,
On Mon, 30 Sept 2024 at 05:05, Michal Simek michal.simek@amd.com wrote:
For unknown reason USB host hasn't been described for distro boot that's why wire it now.
Signed-off-by: Michal Simek michal.simek@amd.com
include/configs/xilinx_versal.h | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index 212dc9df2a2e..64f123424cf7 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)
-- 2.43.0
I wonder if these could move to boostd? It would require implementing something for dfu and thor, though.
I will get to it in near future.
M

On 9/30/24 13:03, Michal Simek wrote:
There is only one USB controller that's why remove description for USB1.
Signed-off-by: Michal Simek michal.simek@amd.com
include/configs/xilinx_versal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index dc3f41b94a29..212dc9df2a2e 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 " \
applied. M
participants (2)
-
Michal Simek
-
Simon Glass