From: Tom Rini <trini@konsulko.com>
Date: Mon, 7 Apr 2025 22:40:02 +0000 (-0600)
Subject: Merge branch 'next'
X-Git-Tag: v2025.07-rc1~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff61d6bfd1c9534d3fc2397846a5899639f2e55d;p=thirdparty%2Fu-boot.git

Merge branch 'next'

Note that this undoes the changes of commit cf6d4535cc4c ("x86:
emulation: Disable bloblist for now") as that was intended only for the
release due to time.
---

ff61d6bfd1c9534d3fc2397846a5899639f2e55d
diff --cc cmd/Kconfig
index ce8393c72da,ddffa81613a..ecef664fcea
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@@ -2168,6 -2184,30 +2177,28 @@@ config WGET_HTTP
  	help
  	  Enable TLS over http for wget.
  
+ config WGET_CACERT
+ 	bool "wget cacert"
+ 	depends on CMD_WGET
+ 	depends on WGET_HTTPS
+ 	help
+ 	  Adds the "cacert" sub-command to wget to provide root certificates
+ 	  to the HTTPS engine. Must be in DER format.
+ 
+ config WGET_BUILTIN_CACERT
+ 	bool "Built-in CA certificates"
+ 	depends on WGET_HTTPS
+ 	select BUILD_BIN2C
+ 
+ config WGET_BUILTIN_CACERT_PATH
+ 	string "Path to root certificates"
+ 	depends on WGET_BUILTIN_CACERT
+ 	default "cacert.crt"
+ 	help
+ 	  Set this to the path to a DER-encoded X509 file containing
+ 	  Certification Authority certificates, a.k.a. root certificates, for
+ 	  the purpose of authenticating HTTPS connections.
+ 
 -endif  # if CMD_NET
 -
  config CMD_PXE
  	bool "pxe"
  	select PXE_UTILS
diff --cc lib/efi_loader/efi_boottime.c
index eaa6464fa39,c8d9a6037f7..f220daa048f
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@@ -2234,10 -2231,6 +2232,8 @@@ static efi_status_t EFIAPI efi_exit_boo
  
  	if (!efi_st_keep_devices) {
  		bootm_disable_interrupts();
- 		if (IS_ENABLED(CONFIG_USB_DEVICE))
- 			udc_disconnect();
 +		if (IS_ENABLED(CONFIG_DM_ETH))
 +			eth_halt();
  		board_quiesce_devices();
  		dm_remove_devices_active();
  	}