From: Tom Rini <trini@konsulko.com>
Date: Mon, 30 Sep 2024 23:48:12 +0000 (-0600)
Subject: Merge tag 'v2024.10-rc6' into next
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=3a0b829efc35227b1079a444f00e0729502197ad;p=u-boot.git

Merge tag 'v2024.10-rc6' into next

Prepare v2024.10-rc6
---

3a0b829efc35227b1079a444f00e0729502197ad
diff --cc drivers/usb/gadget/Kconfig
index b1247a9eea,2634154f94..f20a16e3e7
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@@ -323,7 -323,8 +323,8 @@@ config SPL_DF
  	bool "Support DFU (Device Firmware Upgrade) in SPL"
  	select SPL_HASH
  	select SPL_DFU_NO_RESET
 +	select SPL_RAM_SUPPORT
+ 	depends on DFU_OVER_USB
 -	depends on SPL_RAM_SUPPORT
  	help
  	  This feature enables the DFU (Device Firmware Upgrade) in SPL with
  	  RAM memory device support. The ROM code will load and execute