Merge pull request 'Update U-Boot to v2023.10 and use default coreboot tree for gru chromebooks' (#136) from alpernebbi/lbmk:uboot-v2023.10 into master

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

2 files changed, 121 insertions, 53 deletions

diff --git a/config/u-boot/qemu_arm64_12mb/config/default b/config/u-boot/qemu_arm64_12mb/config/default
index 18cbb4f0..982b6889 100644
--- a/config/u-boot/qemu_arm64_12mb/config/default
+++ b/config/u-boot/qemu_arm64_12mb/config/default
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# U-Boot 2023.01 Configuration
+# U-Boot 2023.10 Configuration
 #
 
 #
-# Compiler: gcc (Debian 12.2.0-14) 12.2.0
+# Compiler: gcc (Debian 13.2.0-5) 13.2.0
 #
 CONFIG_CREATE_ARCH_SYMLINK=y
 CONFIG_SYS_CACHE_SHIFT_6=y
@@ -27,6 +27,10 @@ CONFIG_SYS_CPU="armv8"
 CONFIG_SYS_VENDOR="emulation"
 CONFIG_SYS_BOARD="qemu-arm"
 CONFIG_SYS_CONFIG_NAME="qemu-arm"
+
+#
+# Skipping low level initialization functions
+#
 # CONFIG_SKIP_LOWLEVEL_INIT is not set
 # CONFIG_SKIP_LOWLEVEL_INIT_ONLY is not set
 # CONFIG_SYS_ICACHE_OFF is not set
@@ -63,6 +67,7 @@ CONFIG_ARM_SMCCC=y
 CONFIG_ARM64_SUPPORT_AARCH32=y
 # CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_HISTB is not set
 # CONFIG_ARCH_KIRKWOOD is not set
 # CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_ORION5X is not set
@@ -71,7 +76,7 @@ CONFIG_ARM64_SUPPORT_AARCH32=y
 # CONFIG_ARCH_BCMSTB is not set
 # CONFIG_ARCH_BCMBCA is not set
 # CONFIG_TARGET_VEXPRESS_CA9X4 is not set
-# CONFIG_TARGET_BCMCYGNUS is not set
+# CONFIG_TARGET_BCMNS is not set
 # CONFIG_TARGET_BCMNS2 is not set
 # CONFIG_TARGET_BCMNS3 is not set
 # CONFIG_ARCH_EXYNOS is not set
@@ -169,12 +174,17 @@ CONFIG_TEXT_BASE=0x50000000
 CONFIG_SYS_MALLOC_LEN=0x1000000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_NR_DRAM_BANKS=1
+CONFIG_ENV_SOURCE_FILE=""
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40200000
 CONFIG_ENV_SIZE=0x40000
 # CONFIG_DM_GPIO is not set
 CONFIG_DEFAULT_DEVICE_TREE="qemu-arm64"
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_SYS_PROMPT="=> "
+# CONFIG_OF_LIBFDT_OVERLAY is not set
 CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x8000
+# CONFIG_DM_RESET is not set
+CONFIG_SYS_MONITOR_LEN=0
 # CONFIG_TARGET_QEMU_ARM_32BIT is not set
 CONFIG_TARGET_QEMU_ARM_64BIT=y
 CONFIG_ERR_PTR_OFFSET=0x0
@@ -185,6 +195,7 @@ CONFIG_DEBUG_UART_CLOCK=0
 CONFIG_IDENT_STRING=""
 CONFIG_SYS_CLK_FREQ=0
 # CONFIG_CHIP_DIP_SCAN is not set
+# CONFIG_CMO_BY_VA_ONLY is not set
 # CONFIG_ARMV8_MULTIENTRY is not set
 # CONFIG_ARMV8_SET_SMPEN is not set
 # CONFIG_ARMV8_SWITCH_TO_EL1 is not set
@@ -203,6 +214,7 @@ CONFIG_ARMV8_CE_SHA256=y
 # 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
@@ -215,16 +227,17 @@ CONFIG_MTDPARTS_NOR1="64m(u-boot-env)"
 #
 CONFIG_BUILD_TARGET=""
 # CONFIG_SYS_PCI_64BIT is not set
+CONFIG_PCI=y
 CONFIG_FWU_NUM_BANKS=2
 CONFIG_FWU_NUM_IMAGES_PER_BANK=2
 CONFIG_DEBUG_UART=y
 CONFIG_AHCI=y
 # CONFIG_OF_BOARD_FIXUP is not set
-# CONFIG_NXP_ESBC is not set
 
 #
-# Other functionality shared between NXP SoCs
+# Functionality shared between NXP SoCs
 #
+# CONFIG_NXP_ESBC is not set
 
 #
 # General setup
@@ -232,7 +245,7 @@ CONFIG_AHCI=y
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120200
+CONFIG_GCC_VERSION=130200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
@@ -242,12 +255,9 @@ CONFIG_ARCH_SUPPORTS_LTO=y
 # CONFIG_LTO is not set
 CONFIG_CC_HAS_ASM_INLINE=y
 # CONFIG_XEN is not set
-CONFIG_DISTRO_DEFAULTS=y
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
 # CONFIG_SYS_BOOT_GET_CMDLINE is not set
 # CONFIG_SYS_BOOT_GET_KBD is not set
-CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
-CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40200000
 CONFIG_SYS_MALLOC_F=y
 # CONFIG_VALGRIND is not set
 CONFIG_EXPERT=y
@@ -255,6 +265,7 @@ CONFIG_SYS_MALLOC_CLEAR_ON_INIT=y
 # CONFIG_SYS_MALLOC_DEFAULT_TO_INIT is not set
 # CONFIG_TOOLS_DEBUG is not set
 CONFIG_PHYS_64BIT=y
+CONFIG_FDT_64BIT=y
 # CONFIG_REMAKE_ELF is not set
 # CONFIG_HAS_BOARD_SIZE_LIMIT is not set
 # CONFIG_SYS_CUSTOM_LDSCRIPT is not set
@@ -262,13 +273,7 @@ CONFIG_PLATFORM_ELFENTRY="_start"
 CONFIG_STACK_SIZE=0x1000000
 CONFIG_SYS_SRAM_BASE=0x0
 CONFIG_SYS_SRAM_SIZE=0x0
-CONFIG_SYS_MONITOR_LEN=0
 # CONFIG_MP is not set
-CONFIG_EXAMPLES=y
-
-#
-# API
-#
 # CONFIG_API is not set
 
 #
@@ -290,18 +295,23 @@ CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_BEST_MATCH=y
 CONFIG_FIT_PRINT=y
+# CONFIG_SPL_LOAD_FIT_FULL is not set
 CONFIG_PXE_UTILS=y
+CONFIG_BOOT_DEFAULTS=y
 CONFIG_BOOTSTD=y
-# CONFIG_BOOTSTD_FULL is not set
-# CONFIG_BOOTSTD_BOOTCOMMAND is not set
+CONFIG_BOOTSTD_FULL=y
+CONFIG_BOOTSTD_DEFAULTS=y
+CONFIG_BOOTSTD_BOOTCOMMAND=y
 CONFIG_BOOTMETH_GLOBAL=y
-CONFIG_BOOTMETH_DISTRO=y
-CONFIG_BOOTMETH_DISTRO_PXE=y
+CONFIG_BOOTMETH_EXTLINUX=y
+CONFIG_BOOTMETH_EXTLINUX_PXE=y
 CONFIG_BOOTMETH_EFILOADER=y
 CONFIG_BOOTMETH_VBE=y
+CONFIG_BOOTMETH_DISTRO=y
+CONFIG_BOOTMETH_VBE_REQUEST=y
 CONFIG_BOOTMETH_VBE_SIMPLE=y
 CONFIG_BOOTMETH_VBE_SIMPLE_OS=y
-# CONFIG_BOOTMETH_SCRIPT is not set
+CONFIG_BOOTMETH_SCRIPT=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_SUPPORT_RAW_INITRD=y
 # CONFIG_OF_BOARD_SETUP is not set
@@ -316,6 +326,7 @@ CONFIG_ARCH_FIXUP_FDT_MEMORY=y
 # CONFIG_CHROMEOS_VBOOT is not set
 # CONFIG_RAMBOOT_PBL is not set
 CONFIG_SYS_BOOT_RAMDISK_HIGH=y
+# CONFIG_DISTRO_DEFAULTS is not set
 
 #
 # Boot timing
@@ -351,7 +362,7 @@ CONFIG_BOOTDELAY=2
 # CONFIG_USE_BOOTARGS is not set
 # CONFIG_BOOTARGS_SUBST is not set
 CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="run distro_bootcmd"
+CONFIG_BOOTCOMMAND="bootflow scan -lb"
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT=""
 CONFIG_DEFAULT_FDT_FILE=""
@@ -359,6 +370,11 @@ CONFIG_DEFAULT_FDT_FILE=""
 # CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR is not set
 
 #
+# Configuration editor
+#
+# CONFIG_CEDIT is not set
+
+#
 # Console
 #
 CONFIG_MENU=y
@@ -373,7 +389,6 @@ CONFIG_CONSOLE_FLUSH_SUPPORT=y
 # CONFIG_CONSOLE_MUX is not set
 # CONFIG_SYS_CONSOLE_IS_IN_ENV is not set
 # CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE is not set
-# CONFIG_SYS_CONSOLE_ENV_OVERWRITE is not set
 # CONFIG_SYS_CONSOLE_INFO_QUIET is not set
 # CONFIG_SYS_STDIO_DEREGISTER is not set
 # CONFIG_SPL_SYS_STDIO_DEREGISTER is not set
@@ -399,13 +414,13 @@ CONFIG_CONSOLE_FLUSH_SUPPORT=y
 CONFIG_EVENT=y
 CONFIG_EVENT_DYNAMIC=y
 # CONFIG_EVENT_DEBUG is not set
-# CONFIG_ARCH_EARLY_INIT_R is not set
 # CONFIG_ARCH_MISC_INIT is not set
 # CONFIG_BOARD_EARLY_INIT_F is not set
 # CONFIG_BOARD_EARLY_INIT_R is not set
 # CONFIG_BOARD_POSTCLK_INIT is not set
 CONFIG_BOARD_LATE_INIT=y
 # CONFIG_CLOCKS is not set
+# CONFIG_HWCONFIG is not set
 # CONFIG_LAST_STAGE_INIT is not set
 # CONFIG_MISC_INIT_R is not set
 # CONFIG_SYS_MALLOC_BOOTPARAMS is not set
@@ -424,7 +439,9 @@ CONFIG_HASH=y
 # Update support
 #
 CONFIG_UPDATE_COMMON=y
-# CONFIG_UPDATE_TFTP is not set
+CONFIG_UPDATE_TFTP_CNT_MAX=0
+CONFIG_UPDATE_TFTP_MSEC_MAX=100
+CONFIG_UPDATE_LOAD_ADDR=0x100000
 # CONFIG_UPDATE_FIT is not set
 # CONFIG_ANDROID_AB is not set
 
@@ -434,6 +451,7 @@ CONFIG_UPDATE_COMMON=y
 # CONFIG_BLOBLIST is not set
 CONFIG_IMAGE_SIGN_INFO=y
 # CONFIG_FDT_SIMPLEFB is not set
+# CONFIG_BMP is not set
 
 #
 # Command line interface
@@ -444,6 +462,7 @@ CONFIG_CMDLINE_EDITING=y
 # CONFIG_CMDLINE_PS_SUPPORT is not set
 CONFIG_AUTO_COMPLETE=y
 CONFIG_SYS_LONGHELP=y
+CONFIG_SYS_PROMPT="=> "
 CONFIG_SYS_PROMPT_HUSH_PS2="> "
 CONFIG_SYS_MAXARGS=16
 CONFIG_SYS_CBSIZE=512
@@ -458,6 +477,7 @@ CONFIG_SYS_XTRACE=y
 # Info commands
 #
 CONFIG_CMD_BDI=y
+# CONFIG_CMD_BDINFO_EXTRA is not set
 # CONFIG_CMD_CONFIG is not set
 CONFIG_CMD_CONSOLE=y
 # CONFIG_CMD_LICENSE is not set
@@ -468,11 +488,12 @@ CONFIG_CMD_CONSOLE=y
 #
 CONFIG_CMD_BOOTD=y
 CONFIG_CMD_BOOTM=y
-# CONFIG_CMD_BOOTDEV is not set
+CONFIG_CMD_BOOTDEV=y
 CONFIG_CMD_BOOTFLOW=y
-# CONFIG_CMD_BOOTMETH is not set
+CONFIG_CMD_BOOTFLOW_FULL=y
+CONFIG_CMD_BOOTMETH=y
 CONFIG_BOOTM_EFI=y
-# CONFIG_CMD_BOOTZ is not set
+CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_BOOTI=y
 CONFIG_BOOTM_LINUX=y
 CONFIG_BOOTM_NETBSD=y
@@ -480,7 +501,7 @@ CONFIG_BOOTM_NETBSD=y
 # CONFIG_BOOTM_OSE is not set
 CONFIG_BOOTM_PLAN9=y
 CONFIG_BOOTM_RTEMS=y
-# CONFIG_CMD_VBE is not set
+CONFIG_CMD_VBE=y
 CONFIG_BOOTM_VXWORKS=y
 CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_BOOTEFI=y
@@ -581,6 +602,7 @@ CONFIG_CMD_NVME=y
 # CONFIG_CMD_OSD is not set
 CONFIG_CMD_PART=y
 CONFIG_CMD_PCI=y
+# CONFIG_CMD_PCI_MPS is not set
 CONFIG_CMD_POWEROFF=y
 # CONFIG_CMD_READ is not set
 # CONFIG_CMD_SATA is not set
@@ -591,6 +613,7 @@ CONFIG_CMD_SCSI=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_USB_SDP is not set
 CONFIG_CMD_VIRTIO=y
+# CONFIG_CMD_WRITE is not set
 
 #
 # Shell scripting commands
@@ -629,8 +652,7 @@ CONFIG_CMD_TFTPBOOT=y
 # CONFIG_CMD_TFTPSRV is not set
 CONFIG_NET_TFTP_VARS=y
 # CONFIG_CMD_RARP is not set
-CONFIG_CMD_NFS=y
-CONFIG_NFS_TIMEOUT=2000
+# CONFIG_CMD_NFS is not set
 # CONFIG_SYS_DISABLE_AUTOLOAD is not set
 # CONFIG_CMD_WGET is not set
 CONFIG_CMD_MII=y
@@ -646,14 +668,16 @@ CONFIG_CMD_PXE=y
 #
 # Misc commands
 #
+# CONFIG_CMD_2048 is not set
 # CONFIG_CMD_BSP is not set
 CONFIG_CMD_BLOCK_CACHE=y
 # CONFIG_CMD_CACHE is not set
 # CONFIG_CMD_CONITRACE is not set
 # CONFIG_CMD_CLS is not set
 # CONFIG_CMD_EFIDEBUG is not set
-# CONFIG_CMD_EFICONFIG is not set
+CONFIG_CMD_EFICONFIG=y
 # CONFIG_CMD_EXCEPTION is not set
+# CONFIG_CMD_INI is not set
 CONFIG_CMD_DATE=y
 # CONFIG_CMD_RTC is not set
 # CONFIG_CMD_TIME is not set
@@ -663,7 +687,7 @@ CONFIG_CMD_DATE=y
 # CONFIG_CMD_KASLRSEED is not set
 CONFIG_CMD_SLEEP=y
 # CONFIG_CMD_TIMER is not set
-CONFIG_CMD_SYSBOOT=y
+# CONFIG_CMD_SYSBOOT is not set
 CONFIG_CMD_QFW=y
 # CONFIG_CMD_PSTORE is not set
 # CONFIG_CMD_TERMINAL is not set
@@ -711,8 +735,6 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_MTDPARTS=y
 # CONFIG_CMD_MTDPARTS_SPREAD is not set
 # CONFIG_CMD_MTDPARTS_SHOW_NET_SIZES is not set
-CONFIG_MTDIDS_DEFAULT=""
-CONFIG_MTDPARTS_DEFAULT=""
 # CONFIG_CMD_REISER is not set
 # CONFIG_CMD_ZFS is not set
 
@@ -753,17 +775,19 @@ CONFIG_OF_OMIT_DTB=y
 CONFIG_DEVICE_TREE_INCLUDES=""
 CONFIG_OF_LIST="qemu-arm64"
 # CONFIG_MULTI_DTB_FIT is not set
+CONFIG_OF_TAG_MIGRATE=y
 # CONFIG_OF_DTB_PROPS_REMOVE is not set
 
 #
 # Environment
 #
 CONFIG_ENV_SUPPORT=y
-CONFIG_ENV_SOURCE_FILE=""
 CONFIG_SAVEENV=y
 # CONFIG_ENV_OVERWRITE is not set
+# CONFIG_OVERWRITE_ETHADDR_ONCE is not set
 CONFIG_ENV_MIN_ENTRIES=64
 CONFIG_ENV_MAX_ENTRIES=512
+CONFIG_ENV_IS_DEFAULT=y
 CONFIG_ENV_IS_NOWHERE=y
 # CONFIG_ENV_IS_IN_EEPROM is not set
 # CONFIG_ENV_IS_IN_FAT is not set
@@ -783,6 +807,7 @@ CONFIG_ENV_IS_NOWHERE=y
 # CONFIG_ENV_ACCESS_IGNORE_FORCE is not set
 # CONFIG_USE_BOOTFILE is not set
 # CONFIG_USE_ETHPRIME is not set
+# CONFIG_USE_HOSTNAME is not set
 # CONFIG_VERSION_VARIABLE is not set
 CONFIG_NET=y
 CONFIG_ARP_TIMEOUT=5000
@@ -804,6 +829,11 @@ CONFIG_SERVERIP_FROM_PROXYDHCP_DELAY_MS=100
 # CONFIG_UDP_CHECKSUM is not set
 # CONFIG_BOOTP_SERVERIP is not set
 CONFIG_BOOTP_MAX_ROOT_PATH_LEN=64
+# CONFIG_USE_GATEWAYIP is not set
+# CONFIG_USE_IPADDR is not set
+# CONFIG_USE_NETMASK is not set
+# CONFIG_USE_ROOTPATH is not set
+# CONFIG_USE_SERVERIP is not set
 # CONFIG_PROT_TCP is not set
 # CONFIG_IPV6 is not set
 CONFIG_SYS_RX_ETH_BUFFER=4
@@ -832,13 +862,13 @@ CONFIG_OF_TRANSLATE=y
 # CONFIG_TRANSLATION_OFFSET is not set
 CONFIG_DM_DEV_READ_INLINE=y
 # CONFIG_OFNODE_MULTI_TREE is not set
-# CONFIG_ACPIGEN is not set
 # CONFIG_BOUNCE_BUFFER is not set
 # CONFIG_ADC is not set
 # CONFIG_ADC_EXYNOS is not set
 # CONFIG_ADC_SANDBOX is not set
 # CONFIG_SARADC_MESON is not set
 # CONFIG_SARADC_ROCKCHIP is not set
+# CONFIG_ADC_IMX93 is not set
 # CONFIG_SATA is not set
 CONFIG_LIBATA=y
 CONFIG_SCSI_AHCI=y
@@ -858,6 +888,7 @@ CONFIG_AHCI_PCI=y
 #
 CONFIG_BLK=y
 CONFIG_BLOCK_CACHE=y
+# CONFIG_BLKMAP is not set
 # CONFIG_EFI_MEDIA is not set
 # CONFIG_IDE is not set
 # CONFIG_LBA48 is not set
@@ -874,6 +905,7 @@ CONFIG_BLOCK_CACHE=y
 #
 # CONFIG_CACHE is not set
 # CONFIG_L2X0_CACHE is not set
+# CONFIG_V5L2_CACHE is not set
 # CONFIG_NCORE_CACHE is not set
 # CONFIG_SIFIVE_CCACHE is not set
 
@@ -882,6 +914,8 @@ CONFIG_BLOCK_CACHE=y
 #
 # CONFIG_CLK is not set
 # CONFIG_CLK_CCF is not set
+# CONFIG_CLK_RCAR is not set
+# CONFIG_CLK_RCAR_CPG_LIB is not set
 # CONFIG_CPU is not set
 
 #
@@ -892,6 +926,7 @@ CONFIG_BLOCK_CACHE=y
 CONFIG_CAAM_64BIT=y
 # CONFIG_SYS_FSL_SEC_BE is not set
 # CONFIG_SYS_FSL_SEC_LE is not set
+# CONFIG_FSL_DCP_RNG is not set
 # CONFIG_NPCM_AES is not set
 # CONFIG_NPCM_SHA is not set
 # CONFIG_DDR_SPD is not set
@@ -910,7 +945,6 @@ CONFIG_DFU_OVER_TFTP=y
 CONFIG_DFU_WRITE_ALT=y
 CONFIG_DFU_TFTP=y
 # CONFIG_DFU_TIMEOUT is not set
-# CONFIG_DFU_MMC is not set
 CONFIG_DFU_MTD=y
 CONFIG_DFU_RAM=y
 # CONFIG_DFU_SF is not set
@@ -928,13 +962,20 @@ CONFIG_SYS_DFU_MAX_FILE_SIZE=0x800000
 # CONFIG_DMA_LEGACY is not set
 
 #
+# Extcon Support
+#
+# CONFIG_EXTCON is not set
+
+#
 # Fastboot support
 #
 # CONFIG_UDP_FUNCTION_FASTBOOT is not set
+# CONFIG_TCP_FUNCTION_FASTBOOT is not set
 CONFIG_FIRMWARE=y
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ZYNQMP_FIRMWARE is not set
 # CONFIG_ARM_SMCCC_FEATURES is not set
+# CONFIG_ARM_FFA_TRANSPORT is not set
 # CONFIG_SCMI_FIRMWARE is not set
 # CONFIG_DM_FUZZING_ENGINE is not set
 
@@ -943,6 +984,7 @@ CONFIG_ARM_PSCI_FW=y
 #
 # CONFIG_FPGA_ALTERA is not set
 # CONFIG_FPGA_SOCFPGA is not set
+# CONFIG_FPGA_LATTICE is not set
 # CONFIG_FPGA_XILINX is not set
 # CONFIG_DM_FPGA is not set
 # CONFIG_FWU_MDATA is not set
@@ -959,8 +1001,9 @@ CONFIG_GPIO=y
 # CONFIG_MXC_GPIO is not set
 # CONFIG_MXS_GPIO is not set
 # CONFIG_CMD_PCA953X is not set
-# CONFIG_CMD_TCA642X is not set
+# CONFIG_TCA642X is not set
 # CONFIG_VYBRID_GPIO is not set
+# CONFIG_PCA953X is not set
 
 #
 # Hardware Spinlock Support
@@ -1005,6 +1048,8 @@ CONFIG_INPUT=y
 # Memory Controller drivers
 #
 # CONFIG_MEMORY is not set
+# CONFIG_ATMEL_EBI is not set
+# CONFIG_MFD_ATMEL_SMC is not set
 
 #
 # Multifunction device drivers
@@ -1012,6 +1057,8 @@ CONFIG_INPUT=y
 # CONFIG_MISC is not set
 # CONFIG_NVMEM is not set
 # CONFIG_SPL_NVMEM is not set
+# CONFIG_SMSC_LPC47M is not set
+# CONFIG_SMSC_SIO1007 is not set
 # CONFIG_CROS_EC is not set
 # CONFIG_DS4510 is not set
 # CONFIG_FSL_SEC_MON is not set
@@ -1051,16 +1098,19 @@ CONFIG_SYS_FLASH_CFI_WIDTH_8BIT=y
 # CONFIG_SYS_FLASH_CFI_WIDTH_32BIT is not set
 # CONFIG_SYS_FLASH_CFI_WIDTH_64BIT is not set
 CONFIG_SYS_FLASH_CFI_WIDTH=0x1
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS=y
 # CONFIG_SYS_CFI_FLASH_STATUS_POLL is not set
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 # CONFIG_SYS_FLASH_EMPTY_INFO is not set
+# CONFIG_FLASH_SPANSION_S29WS_N is not set
 CONFIG_FLASH_CFI_MTD=y
 # CONFIG_SYS_FLASH_PROTECTION is not set
 CONFIG_SYS_FLASH_CFI=y
 # CONFIG_SYS_FLASH_QUIET_TEST is not set
 # CONFIG_SYS_FLASH_CHECKSUM is not set
+# CONFIG_FLASH_VERIFY is not set
 # CONFIG_ALTERA_QSPI is not set
 CONFIG_SYS_MAX_FLASH_SECT=256
 # CONFIG_SAMSUNG_ONENAND is not set
@@ -1079,6 +1129,8 @@ CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y
 #
 # CONFIG_UBI_SILENCE_MSG is not set
 # CONFIG_MTD_UBI is not set
+# CONFIG_NVMXIP is not set
+# CONFIG_NVMXIP_QSPI is not set
 
 #
 # Multiplexer drivers
@@ -1090,7 +1142,6 @@ CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y
 # CONFIG_FSL_MEMAC is not set
 CONFIG_PHY_RESET_DELAY=0
 # CONFIG_FSL_PFE is not set
-# CONFIG_BNXT_ETH is not set
 CONFIG_ETH=y
 CONFIG_DM_ETH=y
 # CONFIG_DM_ETH_PHY is not set
@@ -1099,6 +1150,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_ALTERA_TSE is not set
 # CONFIG_BCM_SF2_ETH is not set
 # CONFIG_BCMGENET is not set
+# CONFIG_BNXT_ETH is not set
 # CONFIG_CALXEDA_XGMAC is not set
 # CONFIG_DRIVER_DM9000 is not set
 # CONFIG_DWC_ETH_QOS is not set
@@ -1138,6 +1190,7 @@ CONFIG_E1000=y
 # CONFIG_DRIVER_TI_KEYSTONE_NET is not set
 # CONFIG_TULIP is not set
 # CONFIG_XILINX_AXIEMAC is not set
+# CONFIG_VSC7385_ENET is not set
 # CONFIG_XILINX_EMACLITE is not set
 # CONFIG_ZYNQ_GEM is not set
 # CONFIG_SYS_DPAA_QBMAN is not set
@@ -1147,7 +1200,6 @@ CONFIG_E1000=y
 CONFIG_NVME=y
 # CONFIG_NVME_APPLE is not set
 CONFIG_NVME_PCI=y
-CONFIG_PCI=y
 # CONFIG_DM_PCI_COMPAT is not set
 CONFIG_PCI_PNP=y
 # CONFIG_PCI_REGION_MULTI_ENTRY is not set
@@ -1167,6 +1219,7 @@ CONFIG_PCIE_ECAM_GENERIC=y
 # CONFIG_PCIE_INTEL_FPGA is not set
 # CONFIG_PCIE_IPROC is not set
 # CONFIG_PCI_KEYSTONE is not set
+# CONFIG_PCIE_STARFIVE_JH7110 is not set
 
 #
 # PCI Endpoint
@@ -1200,8 +1253,10 @@ CONFIG_POWER=y
 # CONFIG_POWER_DOMAIN is not set
 # CONFIG_DM_PMIC is not set
 # CONFIG_PMIC_TPS65217 is not set
-# CONFIG_POWER_MC34VR500 is not set
+# CONFIG_POWER_TPS65218 is not set
+# CONFIG_POWER_TPS62362 is not set
 # CONFIG_DM_REGULATOR is not set
+# CONFIG_TPS6586X_POWER is not set
 # CONFIG_POWER_MT6323 is not set
 # CONFIG_DM_PWM is not set
 # CONFIG_PWM_IMX is not set
@@ -1221,7 +1276,6 @@ CONFIG_POWER=y
 #
 # Reset Controller Support
 #
-# CONFIG_DM_RESET is not set
 # CONFIG_RESET_SCMI is not set
 CONFIG_DM_RNG=y
 # CONFIG_RNG_MSM is not set
@@ -1237,9 +1291,13 @@ CONFIG_DM_RTC=y
 # CONFIG_RTC_ENABLE_32KHZ_OUTPUT is not set
 # CONFIG_RTC_PCF2127 is not set
 # CONFIG_RTC_DS1307 is not set
+# CONFIG_RTC_DS1337 is not set
+# CONFIG_RTC_DS1338 is not set
+# CONFIG_RTC_DS3231 is not set
 # CONFIG_RTC_EMULATION is not set
 # CONFIG_RTC_ISL1208 is not set
 # CONFIG_RTC_PCF8563 is not set
+# CONFIG_RTC_PT7C4338 is not set
 # CONFIG_RTC_RV3028 is not set
 # CONFIG_RTC_RV3029 is not set
 # CONFIG_RTC_RV8803 is not set
@@ -1284,12 +1342,12 @@ CONFIG_DEBUG_UART_SHIFT=2
 # CONFIG_MCFUART is not set
 # CONFIG_NULLDEV_SERIAL is not set
 # CONFIG_SYS_NS16550 is not set
-# CONFIG_NS16550_DYNAMIC is not set
 CONFIG_PL01X_SERIAL=y
 # CONFIG_ROCKCHIP_SERIAL is not set
 # CONFIG_XILINX_UARTLITE is not set
 # CONFIG_MSM_SERIAL is not set
 # CONFIG_MSM_GENI_SERIAL is not set
+# CONFIG_MXS_AUART_SERIAL is not set
 # CONFIG_OMAP_SERIAL is not set
 # CONFIG_SIFIVE_SERIAL is not set
 # CONFIG_ZYNQ_SERIAL is not set
@@ -1322,9 +1380,7 @@ CONFIG_PL01X_SERIAL=y
 #
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_CMD_RESET=y
-# CONFIG_SYSRESET_CMD_POWEROFF is not set
-# CONFIG_POWEROFF_GPIO is not set
-# CONFIG_SYSRESET_GPIO is not set
+CONFIG_SYSRESET_CMD_POWEROFF=y
 CONFIG_SYSRESET_PSCI=y
 # CONFIG_SYSRESET_SYSCON is not set
 # CONFIG_SYSRESET_WATCHDOG is not set
@@ -1397,8 +1453,11 @@ CONFIG_USB_EHCI_PCI=y
 #
 CONFIG_USB_STORAGE=y
 # CONFIG_USB_KEYBOARD is not set
+# CONFIG_USB_ONBOARD_HUB is not set
+CONFIG_USB_HUB_DEBOUNCE_TIMEOUT=1000
 # CONFIG_USB_HOST_ETHER is not set
 # CONFIG_USB_GADGET is not set
+# CONFIG_SPL_USB_GADGET is not set
 
 #
 # UFS Host Controller Support
@@ -1440,7 +1499,6 @@ CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
 # CONFIG_IMX_WATCHDOG is not set
 # CONFIG_ULP_WATCHDOG is not set
 # CONFIG_WDT is not set
-# CONFIG_PVBLOCK is not set
 # CONFIG_PHYS_TO_BUS is not set
 
 #
@@ -1465,6 +1523,7 @@ CONFIG_FS_FAT_MAX_CLUSTSIZE=65536
 # Library routines
 #
 # CONFIG_ADDR_MAP is not set
+# CONFIG_SYS_TIMER_COUNTS_DOWN is not set
 # CONFIG_PHYSMEM is not set
 # CONFIG_BCH is not set
 # CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED is not set
@@ -1481,7 +1540,7 @@ CONFIG_REGEX=y
 CONFIG_LIB_RAND=y
 # CONFIG_LIB_HW_RAND is not set
 CONFIG_SUPPORT_ACPI=y
-# CONFIG_GENERATE_ACPI_TABLE is not set
+# CONFIG_ACPI is not set
 # CONFIG_BITREVERSE is not set
 # CONFIG_TRACE is not set
 # CONFIG_CIRCBUF is not set
@@ -1513,6 +1572,7 @@ CONFIG_SHA512=y
 CONFIG_SHA384=y
 # CONFIG_SHA_HW_ACCEL is not set
 CONFIG_MD5=y
+CONFIG_CRC8=y
 CONFIG_CRC32=y
 
 #
@@ -1533,7 +1593,6 @@ CONFIG_HEXDUMP=y
 # CONFIG_GETOPT is not set
 CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT_ASSUME_MASK=0
-# CONFIG_OF_LIBFDT_OVERLAY is not set
 CONFIG_SYS_FDT_PAD=0x3000
 # CONFIG_FDT_FIXUP_PARTITIONS is not set
 
@@ -1548,11 +1607,13 @@ CONFIG_CMD_BOOTEFI_BOOTMGR=y
 CONFIG_EFI_VARIABLE_FILE_STORE=y
 # CONFIG_EFI_VARIABLE_NO_STORE is not set
 # CONFIG_EFI_VARIABLES_PRESEED is not set
-CONFIG_EFI_VAR_BUF_SIZE=32768
+CONFIG_EFI_VAR_BUF_SIZE=65536
 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
@@ -1565,6 +1626,7 @@ 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
@@ -1577,11 +1639,17 @@ CONFIG_LIB_DATE=y
 CONFIG_LIB_ELF=y
 CONFIG_LMB=y
 CONFIG_LMB_USE_MAX_REGIONS=y
-CONFIG_LMB_MAX_REGIONS=8
+CONFIG_LMB_MAX_REGIONS=16
+# CONFIG_PHANDLE_CHECK_SEQ is not set
 
 #
 # FWU Multi Bank Updates
 #
+# CONFIG_POST is not set
+
+#
+# Unit tests
+#
 # CONFIG_UNIT_TEST is not set
 
 #
@@ -1605,3 +1673,4 @@ CONFIG_TOOLS_SHA384=y
 CONFIG_TOOLS_SHA512=y
 # CONFIG_TOOLS_MKEFICAPSULE is not set
 # CONFIG_FSPI_CONF_HEADER is not set
+# CONFIG_TOOLS_MKFWUMDATA is not set
diff --git a/config/u-boot/qemu_arm64_12mb/target.cfg b/config/u-boot/qemu_arm64_12mb/target.cfg
index 97c8d8e6..6532f257 100644
--- a/config/u-boot/qemu_arm64_12mb/target.cfg
+++ b/config/u-boot/qemu_arm64_12mb/target.cfg
@@ -1,3 +1,2 @@
 tree="default"
-rev="4debc57a3da6c3f4d3f89a637e99206f4cea0a96" # v2022.10
 arch="AArch64"