]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge tag 'v2024.10-rc6' into next
authorTom Rini <trini@konsulko.com>
Mon, 30 Sep 2024 23:48:12 +0000 (17:48 -0600)
committerTom Rini <trini@konsulko.com>
Mon, 30 Sep 2024 23:48:12 +0000 (17:48 -0600)
Prepare v2024.10-rc6

1  2 
Makefile
drivers/usb/gadget/Kconfig
include/os.h
lib/efi_loader/efi_console.c

diff --cc Makefile
Simple merge
index b1247a9eeaef4bab2e091af3a0b4a4b930235e3f,2634154f94a4cb0bea8a5cb88d8299441808915a..f20a16e3e7d95cbe13a9ae45e08077fa04efdae3
@@@ -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
 -      depends on SPL_RAM_SUPPORT
 +      select SPL_RAM_SUPPORT
+       depends on DFU_OVER_USB
        help
          This feature enables the DFU (Device Firmware Upgrade) in SPL with
          RAM memory device support. The ROM code will load and execute
diff --cc include/os.h
Simple merge
Simple merge