Merge pull request 'Update U-Boot to v2025.10' (#305) from alpernebbi/lbmk:uboot-v2025.04 into master

Reviewed-on: https://codeberg.org/libreboot/lbmk/pulls/305

1 files changed, 148 insertions, 73 deletions

diff --git a/config/u-boot/qemu_arm64_12mb/config/default b/config/u-boot/qemu_arm64_12mb/config/default
index 4824cc79..2cd0b94c 100644
--- a/config/u-boot/qemu_arm64_12mb/config/default
+++ b/config/u-boot/qemu_arm64_12mb/config/default
@@ -1,12 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# U-Boot 2024.10 Configuration
+# U-Boot 2025.04 Configuration
 #
 
 #
-# Compiler: gcc (Debian 12.2.0-14) 12.2.0
+# Compiler: gcc (Debian 14.2.0-19) 14.2.0
 #
 CONFIG_CREATE_ARCH_SYMLINK=y
+CONFIG_HAVE_SETJMP=y
 CONFIG_SUPPORT_LITTLE_ENDIAN=y
 CONFIG_SYS_CACHE_SHIFT_6=y
 CONFIG_64BIT=y
@@ -46,6 +47,7 @@ CONFIG_ARM64_CRC32=y
 CONFIG_COUNTER_FREQUENCY=0
 CONFIG_POSITION_INDEPENDENT=y
 # CONFIG_INIT_SP_RELATIVE is not set
+# CONFIG_DRIVER_GICV2 is not set
 # CONFIG_GIC_V3_ITS is not set
 # CONFIG_GICV3_SUPPORT_GIC600 is not set
 CONFIG_STATIC_RELA=y
@@ -90,6 +92,7 @@ CONFIG_ARM64_SUPPORT_AARCH32=y
 # CONFIG_ARCH_OMAP2PLUS is not set
 # CONFIG_ARCH_MESON is not set
 # CONFIG_ARCH_MEDIATEK is not set
+# CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_IMX8 is not set
 # CONFIG_ARCH_IMX8M is not set
@@ -173,10 +176,10 @@ CONFIG_ARCH_QEMU=y
 # CONFIG_TARGET_PRESIDIO_ASIC is not set
 # CONFIG_TARGET_XENGUEST_ARM64 is not set
 # CONFIG_ARCH_GXP is not set
-# CONFIG_STATIC_MACH_TYPE is not set
 CONFIG_TEXT_BASE=0x50000000
 CONFIG_SYS_MALLOC_LEN=0x1000000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_BLOBLIST_SIZE_RELOC=0x2000
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SOURCE_FILE=""
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
@@ -184,6 +187,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40200000
 CONFIG_ENV_SIZE=0x40000
 # CONFIG_DM_GPIO is not set
 CONFIG_DEFAULT_DEVICE_TREE="qemu-arm64"
+CONFIG_DDR_SI_TEST=y
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 # CONFIG_OF_LIBFDT_OVERLAY is not set
 CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x8000
@@ -191,6 +195,9 @@ CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x8000
 CONFIG_SYS_MONITOR_LEN=0
 # CONFIG_TARGET_QEMU_ARM_32BIT is not set
 CONFIG_TARGET_QEMU_ARM_64BIT=y
+# CONFIG_TARGET_QEMU_ARM_SBSA is not set
+CONFIG_SYS_BOOTM_LEN=0x4000000
+CONFIG_SYS_LOAD_ADDR=0x40200000
 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
 CONFIG_ERR_PTR_OFFSET=0x0
 CONFIG_PRE_CON_BUF_ADDR=0x40100000
@@ -217,15 +224,7 @@ CONFIG_PSCI_RESET=y
 CONFIG_ARMV8_CRYPTO=y
 CONFIG_ARMV8_CE_SHA1=y
 CONFIG_ARMV8_CE_SHA256=y
-# CONFIG_CMD_DEKBLOB is not set
-# CONFIG_IMX_CAAM_DEK_ENCAP is not set
-# CONFIG_IMX_OPTEE_DEK_ENCAP is not set
-# CONFIG_IMX_SECO_DEK_ENCAP is not set
-# CONFIG_IMX_ELE_DEK_ENCAP is not set
-# CONFIG_CMD_HDMIDETECT is not set
-CONFIG_IMX_DCD_ADDR=0x00910000
 CONFIG_SYS_MEM_TOP_HIDE=0x0
-CONFIG_SYS_LOAD_ADDR=0x40200000
 CONFIG_MTDPARTS_NOR0="64m(u-boot)"
 CONFIG_MTDPARTS_NOR1="64m(u-boot-env)"
 
@@ -253,7 +252,7 @@ CONFIG_SYS_LITTLE_ENDIAN=y
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120200
+CONFIG_GCC_VERSION=140200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
@@ -279,8 +278,6 @@ CONFIG_FDT_64BIT=y
 # CONFIG_SYS_CUSTOM_LDSCRIPT is not set
 CONFIG_PLATFORM_ELFENTRY="_start"
 CONFIG_STACK_SIZE=0x1000000
-CONFIG_SYS_SRAM_BASE=0x0
-CONFIG_SYS_SRAM_SIZE=0x0
 # CONFIG_MP is not set
 CONFIG_HAVE_TEXT_BASE=y
 # CONFIG_HAVE_SYS_UBOOT_START is not set
@@ -295,6 +292,69 @@ CONFIG_SYS_MONITOR_BASE=0x50000000
 #
 
 #
+# UEFI Support
+#
+CONFIG_EFI_LOADER=y
+CONFIG_EFI_BINARY_EXEC=y
+# CONFIG_EFI_SECURE_BOOT is not set
+
+#
+# UEFI services
+#
+CONFIG_EFI_GET_TIME=y
+CONFIG_EFI_SET_TIME=y
+CONFIG_EFI_HAVE_RUNTIME_RESET=y
+
+#
+# UEFI Variables
+#
+CONFIG_EFI_VARIABLE_FILE_STORE=y
+# CONFIG_EFI_RT_VOLATILE_STORE is not set
+# CONFIG_EFI_VARIABLE_NO_STORE is not set
+# CONFIG_EFI_VARIABLES_PRESEED is not set
+CONFIG_EFI_VAR_BUF_SIZE=131072
+CONFIG_EFI_PLATFORM_LANG_CODES="en-US"
+
+#
+# Capsule support
+#
+# CONFIG_EFI_RUNTIME_UPDATE_CAPSULE is not set
+# CONFIG_EFI_CAPSULE_ON_DISK is not set
+CONFIG_EFI_CAPSULE_MAX=15
+
+#
+# UEFI protocol support
+#
+CONFIG_EFI_DEVICE_PATH_TO_TEXT=y
+CONFIG_EFI_DEVICE_PATH_UTIL=y
+CONFIG_EFI_DT_FIXUP=y
+CONFIG_EFI_LOADER_HII=y
+CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y
+CONFIG_EFI_UNICODE_CAPITALIZATION=y
+CONFIG_EFI_RNG_PROTOCOL=y
+CONFIG_EFI_TCG2_PROTOCOL=y
+# CONFIG_EFI_TCG2_PROTOCOL_MEASURE_DTB is not set
+CONFIG_EFI_LOAD_FILE2_INITRD=y
+CONFIG_EFI_IP4_CONFIG2_PROTOCOL=y
+CONFIG_EFI_HTTP_PROTOCOL=y
+
+#
+# Misc options
+#
+# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set
+CONFIG_EFI_ECPT=y
+CONFIG_EFI_EBBR_2_1_CONFORMANCE=y
+# CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN is not set
+
+#
+# EFI bootmanager
+#
+CONFIG_EFI_BOOTMGR=y
+CONFIG_EFI_HTTP_BOOT=y
+CONFIG_BOOTEFI_HELLO_COMPILE=y
+CONFIG_BOOTEFI_TESTAPP_COMPILE=y
+
+#
 # Boot images
 #
 # CONFIG_ANDROID_BOOT_IMAGE is not set
@@ -318,6 +378,7 @@ CONFIG_BOOTSTD=y
 CONFIG_BOOTSTD_FULL=y
 CONFIG_BOOTSTD_DEFAULTS=y
 CONFIG_BOOTSTD_BOOTCOMMAND=y
+CONFIG_BOOTSTD_MENU=y
 CONFIG_BOOTMETH_GLOBAL=y
 # CONFIG_BOOTMETH_ANDROID is not set
 # CONFIG_BOOTMETH_CROS is not set
@@ -330,12 +391,13 @@ CONFIG_BOOTMETH_VBE=y
 CONFIG_BOOTMETH_DISTRO=y
 CONFIG_BOOTMETH_VBE_REQUEST=y
 CONFIG_BOOTMETH_VBE_SIMPLE=y
+# CONFIG_BOOTMETH_VBE_ABREC is not set
 CONFIG_BOOTMETH_VBE_SIMPLE_OS=y
 CONFIG_EXPO=y
 CONFIG_BOOTMETH_SCRIPT=y
+# CONFIG_UPL is not set
 CONFIG_LEGACY_IMAGE_FORMAT=y
 # CONFIG_MEASURED_BOOT is not set
-CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_SUPPORT_RAW_INITRD=y
 # CONFIG_CHROMEOS is not set
 # CONFIG_CHROMEOS_VBOOT is not set
@@ -464,6 +526,7 @@ CONFIG_PCI_INIT_R=y
 # Security support
 #
 CONFIG_HASH=y
+# CONFIG_HASH_CRC8 is not set
 # CONFIG_STACKPROTECTOR is not set
 # CONFIG_BOARD_RNG_SEED is not set
 
@@ -480,7 +543,10 @@ CONFIG_UPDATE_LOAD_ADDR=0x100000
 #
 # Blob list
 #
-# CONFIG_BLOBLIST is not set
+CONFIG_BLOBLIST=y
+# CONFIG_BLOBLIST_FIXED is not set
+CONFIG_BLOBLIST_ALLOC=y
+CONFIG_BLOBLIST_SIZE=0x400
 CONFIG_IMAGE_SIGN_INFO=y
 CONFIG_CMDLINE=y
 CONFIG_HUSH_PARSER=y
@@ -510,6 +576,7 @@ CONFIG_CMD_BDI=y
 # CONFIG_CMD_BDINFO_EXTRA is not set
 # CONFIG_CMD_CONFIG is not set
 CONFIG_CMD_CONSOLE=y
+# CONFIG_CMD_UFETCH is not set
 # CONFIG_CMD_HISTORY is not set
 # CONFIG_CMD_LICENSE is not set
 # CONFIG_CMD_PMC is not set
@@ -523,8 +590,9 @@ CONFIG_CMD_BOOTM=y
 CONFIG_CMD_BOOTDEV=y
 CONFIG_CMD_BOOTFLOW=y
 CONFIG_CMD_BOOTFLOW_FULL=y
-CONFIG_CMD_BOOTFLOW_BOOTDELAY=8
+CONFIG_CMD_BOOTFLOW_BOOTDELAY=30
 CONFIG_CMD_BOOTMETH=y
+CONFIG_CMD_BOOTSTD=y
 CONFIG_BOOTM_EFI=y
 CONFIG_BOOTM_ELF=y
 CONFIG_CMD_BOOTZ=y
@@ -535,17 +603,18 @@ CONFIG_BOOTM_NETBSD=y
 # CONFIG_BOOTM_OSE is not set
 CONFIG_BOOTM_PLAN9=y
 CONFIG_BOOTM_RTEMS=y
+# CONFIG_CMD_UPL is not set
 CONFIG_CMD_VBE=y
 CONFIG_BOOTM_VXWORKS=y
 CONFIG_CMD_BOOTEFI=y
 CONFIG_CMD_BOOTEFI_BINARY=y
 CONFIG_CMD_BOOTEFI_BOOTMGR=y
-CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y
 CONFIG_CMD_BOOTEFI_HELLO=y
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 # CONFIG_CMD_BOOTMENU is not set
 # CONFIG_CMD_ADTIMG is not set
 CONFIG_CMD_ELF=y
+CONFIG_CMD_ELF_BOOTVX=y
 # CONFIG_CMD_ELF_FDT_SETUP is not set
 CONFIG_CMD_FDT=y
 CONFIG_CMD_GO=y
@@ -578,6 +647,7 @@ CONFIG_CMD_NVEDIT_EFI=y
 # Memory commands
 #
 # CONFIG_CMD_BINOP is not set
+CONFIG_CMD_BLOBLIST=y
 CONFIG_CMD_CRC32=y
 # CONFIG_CRC32_VERIFY is not set
 # CONFIG_LOOPW is not set
@@ -605,7 +675,6 @@ CONFIG_CMD_UNZIP=y
 # CONFIG_CMD_ARMFLASH is not set
 # CONFIG_CMD_BCB is not set
 # CONFIG_CMD_BIND is not set
-# CONFIG_CMD_CLK is not set
 # CONFIG_CMD_DEMO is not set
 CONFIG_CMD_DFU=y
 CONFIG_CMD_DM=y
@@ -631,7 +700,6 @@ CONFIG_CMD_MTD=y
 # CONFIG_CMD_MTD_OTP is not set
 CONFIG_CMD_NVME=y
 # CONFIG_CMD_ONENAND is not set
-# CONFIG_CMD_OSD is not set
 CONFIG_CMD_PART=y
 CONFIG_CMD_PCI=y
 # CONFIG_CMD_PCI_MPS is not set
@@ -641,7 +709,6 @@ CONFIG_CMD_POWEROFF=y
 CONFIG_CMD_SCSI=y
 # CONFIG_CMD_SDRAM is not set
 CONFIG_CMD_USB=y
-# CONFIG_CMD_USB_SDP is not set
 # CONFIG_CMD_RKMTD is not set
 CONFIG_CMD_VIRTIO=y
 # CONFIG_CMD_WRITE is not set
@@ -656,13 +723,8 @@ CONFIG_CMD_SOURCE=y
 CONFIG_CMD_SETEXPR=y
 # CONFIG_CMD_SETEXPR_FMT is not set
 # CONFIG_CMD_XXD is not set
-
-#
-# Android support commands
-#
 CONFIG_CMD_NET=y
 CONFIG_CMD_BOOTP=y
-CONFIG_CMD_DHCP=y
 # CONFIG_BOOTP_MAY_FAIL is not set
 CONFIG_BOOTP_BOOTPATH=y
 # CONFIG_BOOTP_VENDOREX is not set
@@ -680,23 +742,24 @@ CONFIG_BOOTP_PXE=y
 CONFIG_BOOTP_PXE_CLIENTARCH=0x16
 # CONFIG_BOOTP_PXE_DHCP_OPTION is not set
 CONFIG_BOOTP_VCI_STRING="U-Boot.armv8"
-CONFIG_CMD_TFTPBOOT=y
 # CONFIG_CMD_TFTPPUT is not set
 # CONFIG_CMD_TFTPSRV is not set
 CONFIG_NET_TFTP_VARS=y
 # CONFIG_CMD_RARP is not set
 # CONFIG_CMD_NFS is not set
 # CONFIG_SYS_DISABLE_AUTOLOAD is not set
-CONFIG_CMD_WGET=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
 # CONFIG_CMD_CDP is not set
 # CONFIG_CMD_SNTP is not set
-CONFIG_CMD_DNS=y
 # CONFIG_CMD_LINK_LOCAL is not set
 # CONFIG_CMD_ETHSW is not set
-CONFIG_CMD_PXE=y
 # CONFIG_CMD_WOL is not set
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_DNS=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_TFTPBOOT=y
+CONFIG_CMD_WGET=y
+CONFIG_CMD_PXE=y
 
 #
 # Misc commands
@@ -787,6 +850,7 @@ CONFIG_CMD_CYCLIC=y
 #
 CONFIG_PARTITIONS=y
 # CONFIG_MAC_PARTITION is not set
+# CONFIG_TEGRA_PARTITION is not set
 CONFIG_DOS_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_AMIGA_PARTITION is not set
@@ -812,6 +876,7 @@ CONFIG_OF_HAS_PRIOR_STAGE=y
 CONFIG_OF_OMIT_DTB=y
 CONFIG_DEVICE_TREE_INCLUDES=""
 CONFIG_OF_LIST="qemu-arm64"
+CONFIG_OF_OVERLAY_LIST=""
 # CONFIG_MULTI_DTB_FIT is not set
 CONFIG_OF_TAG_MIGRATE=y
 # CONFIG_OF_DTB_PROPS_REMOVE is not set
@@ -820,6 +885,7 @@ CONFIG_OF_TAG_MIGRATE=y
 # Environment
 #
 CONFIG_ENV_SUPPORT=y
+CONFIG_ENV_CALLBACK_LIST_STATIC=""
 CONFIG_SAVEENV=y
 # CONFIG_ENV_OVERWRITE is not set
 # CONFIG_OVERWRITE_ETHADDR_ONCE is not set
@@ -846,17 +912,20 @@ CONFIG_ENV_IS_NOWHERE=y
 # CONFIG_USE_ETHPRIME is not set
 # CONFIG_USE_HOSTNAME is not set
 # CONFIG_VERSION_VARIABLE is not set
+
+#
+# Networking
+#
+# CONFIG_NO_NET is not set
 CONFIG_NET=y
+# CONFIG_NET_LWIP is not set
 CONFIG_ARP_TIMEOUT=5000
 CONFIG_NET_RETRY_COUNT=5
 # CONFIG_PROT_UDP is not set
-CONFIG_BOOTDEV_ETH=y
 # CONFIG_BOOTP_SEND_HOSTNAME is not set
-# CONFIG_NET_RANDOM_ETHADDR is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_IP_DEFRAG is not set
 # CONFIG_SYS_FAULT_ECHO_LINK_DOWN is not set
-CONFIG_TFTP_BLOCKSIZE=1468
 # CONFIG_TFTP_PORT is not set
 CONFIG_TFTP_WINDOWSIZE=1
 # CONFIG_TFTP_TSIZE is not set
@@ -874,6 +943,10 @@ CONFIG_BOOTP_MAX_ROOT_PATH_LEN=64
 CONFIG_PROT_TCP=y
 # CONFIG_PROT_TCP_SACK is not set
 # CONFIG_IPV6 is not set
+CONFIG_BOOTDEV_ETH=y
+# CONFIG_NET_RANDOM_ETHADDR is not set
+CONFIG_WGET=y
+CONFIG_TFTP_BLOCKSIZE=1468
 CONFIG_SYS_RX_ETH_BUFFER=4
 
 #
@@ -913,6 +986,7 @@ CONFIG_AHCI_PCI=y
 # CONFIG_DWC_AHCI is not set
 # CONFIG_DWC_AHSATA is not set
 # CONFIG_MTK_AHCI is not set
+# CONFIG_AHCI_GENERIC is not set
 # CONFIG_SUNXI_AHCI is not set
 # CONFIG_AXI is not set
 
@@ -984,6 +1058,7 @@ CONFIG_DFU_TFTP=y
 CONFIG_DFU_MTD=y
 CONFIG_DFU_RAM=y
 # CONFIG_DFU_VIRT is not set
+# CONFIG_DFU_SCSI is not set
 CONFIG_SET_DFU_ALT_INFO=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x800000
 CONFIG_SYS_DFU_MAX_FILE_SIZE=0x800000
@@ -1027,6 +1102,8 @@ CONFIG_ARM_PSCI_FW=y
 CONFIG_GPIO=y
 # CONFIG_AT91_GPIO is not set
 # CONFIG_ASPEED_GPIO is not set
+# CONFIG_ASPEED_SGPIO is not set
+# CONFIG_ASPEED_G7_GPIO is not set
 # CONFIG_DA8XX_GPIO is not set
 # CONFIG_INTEL_BROADWELL_GPIO is not set
 # CONFIG_IMX_RGPIO2P is not set
@@ -1075,6 +1152,8 @@ CONFIG_DM_KEYBOARD=y
 # LED Support
 #
 # CONFIG_LED is not set
+# CONFIG_LED_BOOT is not set
+# CONFIG_LED_ACTIVITY is not set
 # CONFIG_LED_STATUS is not set
 
 #
@@ -1110,7 +1189,6 @@ CONFIG_DM_KEYBOARD=y
 # CONFIG_WINBOND_W83627 is not set
 CONFIG_QFW=y
 CONFIG_QFW_MMIO=y
-CONFIG_QFW_SMBIOS=y
 # CONFIG_FS_LOADER is not set
 
 #
@@ -1118,7 +1196,6 @@ CONFIG_QFW_SMBIOS=y
 #
 # CONFIG_MMC is not set
 # CONFIG_MMC_BROKEN_CD is not set
-# CONFIG_DM_MMC is not set
 # CONFIG_FSL_ESDHC is not set
 # CONFIG_FSL_ESDHC_IMX is not set
 
@@ -1251,6 +1328,7 @@ CONFIG_PCI_ENHANCED_ALLOCATION=y
 CONFIG_PCIE_ECAM_GENERIC=y
 # CONFIG_PCIE_ECAM_SYNQUACER is not set
 # CONFIG_PCI_FTPCI100 is not set
+# CONFIG_PCIE_CDNS_TI is not set
 # CONFIG_PCI_PHYTIUM is not set
 # CONFIG_PCIE_FSL is not set
 # CONFIG_PCI_MPC85XX is not set
@@ -1426,7 +1504,12 @@ CONFIG_PL01X_SERIAL=y
 # SPMI support
 #
 # CONFIG_SPMI is not set
-# CONFIG_SYSINFO is not set
+CONFIG_SYSINFO=y
+# CONFIG_SYSINFO_EXTRA is not set
+# CONFIG_SYSINFO_GAZERBEAM is not set
+# CONFIG_SYSINFO_SANDBOX is not set
+CONFIG_SYSINFO_SMBIOS=y
+# CONFIG_SYSINFO_GPIO is not set
 
 #
 # System reset device drivers
@@ -1459,6 +1542,7 @@ CONFIG_TPM_V1=y
 # CONFIG_TPM_LIST_RESOURCES is not set
 CONFIG_TPM_V2=y
 CONFIG_TPM2_MMIO=y
+CONFIG_TPM2_EVENT_LOG_SIZE=65536
 CONFIG_USB=y
 CONFIG_DM_USB=y
 # CONFIG_DM_USB_GADGET is not set
@@ -1470,6 +1554,7 @@ CONFIG_USB_HOST=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_DWC3 is not set
 # CONFIG_USB_XHCI_DWC3_OF_SIMPLE is not set
+# CONFIG_USB_XHCI_GENERIC is not set
 CONFIG_USB_XHCI_PCI=y
 # CONFIG_USB_XHCI_FSL is not set
 # CONFIG_USB_XHCI_BRCM is not set
@@ -1504,6 +1589,7 @@ CONFIG_USB_EHCI_PCI=y
 #
 # CONFIG_TWL4030_USB is not set
 # CONFIG_ROCKCHIP_USB2_PHY is not set
+# CONFIG_TYPEC_TCPM is not set
 
 #
 # ULPI drivers
@@ -1578,6 +1664,7 @@ CONFIG_VIDEO_BOCHS_SIZE_Y=1024
 # CONFIG_VIDEO_LCD_RENESAS_R61307 is not set
 # CONFIG_VIDEO_LCD_RENESAS_R69328 is not set
 # CONFIG_VIDEO_LCD_SAMSUNG_LTL106HL02 is not set
+# CONFIG_VIDEO_LCD_SHARP_LQ101R1SX01 is not set
 # CONFIG_VIDEO_LCD_SSD2828 is not set
 # CONFIG_VIDEO_LCD_TDO_TL070WSH30 is not set
 # CONFIG_VIDEO_LCD_HITACHI_TX18D42VM is not set
@@ -1656,7 +1743,6 @@ CONFIG_FS_FAT_MAX_CLUSTSIZE=65536
 # CONFIG_UBIFS_SILENCE_MSG is not set
 # CONFIG_UBIFS_SILENCE_DEBUG_DUMP is not set
 # CONFIG_FS_CRAMFS is not set
-# CONFIG_YAFFS2 is not set
 # CONFIG_FS_SQUASHFS is not set
 # CONFIG_FS_EROFS is not set
 
@@ -1690,6 +1776,22 @@ CONFIG_SUPPORT_ACPI=y
 # CONFIG_CMD_DHRYSTONE is not set
 
 #
+# Alternative crypto libraries
+#
+# CONFIG_LEGACY_HASHING_AND_CRYPTO is not set
+CONFIG_MBEDTLS_LIB=y
+CONFIG_MBEDTLS_LIB_CRYPTO=y
+CONFIG_SHA1_MBEDTLS=y
+CONFIG_SHA256_MBEDTLS=y
+CONFIG_SHA256_SMALLER=y
+CONFIG_SHA512_MBEDTLS=y
+CONFIG_SHA512_SMALLER=y
+CONFIG_SHA384_MBEDTLS=y
+CONFIG_MD5_MBEDTLS=y
+# CONFIG_HKDF_MBEDTLS is not set
+CONFIG_MBEDTLS_LIB_X509=y
+
+#
 # Security support
 #
 # CONFIG_AES is not set
@@ -1700,6 +1802,7 @@ CONFIG_RSA_VERIFY=y
 CONFIG_RSA_SOFTWARE_EXP=y
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
 CONFIG_TPM=y
+CONFIG_TPM_PCR_ALLOCATE=y
 
 #
 # Android Verified Boot
@@ -1716,6 +1819,7 @@ CONFIG_SHA384=y
 # CONFIG_SHA_HW_ACCEL is not set
 CONFIG_MD5=y
 CONFIG_CRC8=y
+CONFIG_CRC16=y
 CONFIG_CRC32=y
 
 #
@@ -1731,6 +1835,7 @@ CONFIG_ZLIB=y
 # CONFIG_ZSTD is not set
 CONFIG_VPL_LZMA=y
 # CONFIG_SPL_GZIP is not set
+# CONFIG_TPL_GZIP is not set
 # CONFIG_ERRNO_STR is not set
 CONFIG_HEXDUMP=y
 # CONFIG_GETOPT is not set
@@ -1741,42 +1846,12 @@ CONFIG_SYS_FDT_PAD=0x3000
 #
 # System tables
 #
+# CONFIG_BLOBLIST_TABLES is not set
 CONFIG_GENERATE_SMBIOS_TABLE=y
+CONFIG_GENERATE_SMBIOS_TABLE_VERBOSE=y
 # CONFIG_LIB_RATIONAL is not set
 CONFIG_SMBIOS=y
 CONFIG_SMBIOS_PARSER=y
-CONFIG_EFI_LOADER=y
-CONFIG_EFI_BINARY_EXEC=y
-CONFIG_EFI_BOOTMGR=y
-CONFIG_EFI_VARIABLE_FILE_STORE=y
-# CONFIG_EFI_RT_VOLATILE_STORE is not set
-# CONFIG_EFI_VARIABLE_NO_STORE is not set
-# CONFIG_EFI_VARIABLES_PRESEED is not set
-CONFIG_EFI_VAR_BUF_SIZE=131072
-CONFIG_EFI_GET_TIME=y
-CONFIG_EFI_SET_TIME=y
-# CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN is not set
-# CONFIG_EFI_RUNTIME_UPDATE_CAPSULE is not set
-# CONFIG_EFI_CAPSULE_ON_DISK is not set
-CONFIG_EFI_CAPSULE_MAX=15
-CONFIG_EFI_DEVICE_PATH_TO_TEXT=y
-CONFIG_EFI_DEVICE_PATH_UTIL=y
-CONFIG_EFI_DT_FIXUP=y
-CONFIG_EFI_LOADER_HII=y
-CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y
-CONFIG_EFI_UNICODE_CAPITALIZATION=y
-# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set
-CONFIG_EFI_PLATFORM_LANG_CODES="en-US"
-CONFIG_EFI_HAVE_RUNTIME_RESET=y
-CONFIG_EFI_RNG_PROTOCOL=y
-CONFIG_EFI_TCG2_PROTOCOL=y
-CONFIG_EFI_TCG2_PROTOCOL_EVENTLOG_SIZE=65536
-# CONFIG_EFI_TCG2_PROTOCOL_MEASURE_DTB is not set
-CONFIG_EFI_LOAD_FILE2_INITRD=y
-# CONFIG_EFI_SECURE_BOOT is not set
-CONFIG_EFI_ECPT=y
-CONFIG_EFI_EBBR_2_1_CONFORMANCE=y
-CONFIG_EFI_HTTP_BOOT=y
 # CONFIG_OPTEE_LIB is not set
 # CONFIG_OPTEE_IMAGE is not set
 # CONFIG_BOOTM_OPTEE is not set
@@ -1784,8 +1859,7 @@ CONFIG_EFI_HTTP_BOOT=y
 CONFIG_LIB_DATE=y
 CONFIG_LIB_ELF=y
 CONFIG_LMB=y
-CONFIG_LMB_USE_MAX_REGIONS=y
-CONFIG_LMB_MAX_REGIONS=16
+# CONFIG_LMB_ARCH_MEM_MAP is not set
 # CONFIG_PHANDLE_CHECK_SEQ is not set
 
 #
@@ -1798,6 +1872,7 @@ CONFIG_LMB_MAX_REGIONS=16
 # Tools options
 #
 CONFIG_MKIMAGE_DTC_PATH="dtc"
+CONFIG_TOOLS_CRC16=y
 CONFIG_TOOLS_CRC32=y
 CONFIG_TOOLS_LIBCRYPTO=y
 CONFIG_TOOLS_KWBIMAGE=y