Merge branch 'uboot-v2023.01' of alpernebbi/lbmk into master

1 files changed, 44 insertions, 17 deletions

diff --git a/resources/u-boot/qemu_x86_12mb/config/default b/resources/u-boot/qemu_x86_12mb/config/default
index ae2534d8..ab22558a 100644
--- a/resources/u-boot/qemu_x86_12mb/config/default
+++ b/resources/u-boot/qemu_x86_12mb/config/default
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# U-Boot 2022.10 Configuration
+# U-Boot 2023.01 Configuration
 #
 
 #
-# Compiler: gcc (Debian 12.2.0-9) 12.2.0
+# Compiler: gcc (Debian 12.2.0-14) 12.2.0
 #
 CONFIG_CREATE_ARCH_SYMLINK=y
 CONFIG_SYS_CACHE_SHIFT_6=y
@@ -27,7 +27,7 @@ CONFIG_SYS_SOC="coreboot"
 CONFIG_SYS_VENDOR="coreboot"
 CONFIG_SYS_BOARD="coreboot"
 CONFIG_SYS_CONFIG_NAME="coreboot"
-CONFIG_SYS_TEXT_BASE=0x1110000
+CONFIG_TEXT_BASE=0x1110000
 CONFIG_SYS_MALLOC_LEN=0x200000
 CONFIG_SYS_MALLOC_F_LEN=0x800
 CONFIG_NR_DRAM_BANKS=8
@@ -48,6 +48,8 @@ CONFIG_SYS_MEM_TOP_HIDE=0x0
 CONFIG_SYS_LOAD_ADDR=0x02000000
 CONFIG_BUILD_TARGET=""
 # CONFIG_SYS_PCI_64BIT is not set
+CONFIG_FWU_NUM_BANKS=2
+CONFIG_FWU_NUM_IMAGES_PER_BANK=2
 
 #
 # x86 architecture
@@ -135,6 +137,7 @@ CONFIG_PLATFORM_ELFENTRY="_start"
 CONFIG_STACK_SIZE=0x1000000
 CONFIG_SYS_SRAM_BASE=0x0
 CONFIG_SYS_SRAM_SIZE=0x0
+CONFIG_SYS_MONITOR_LEN=1048576
 # CONFIG_MP is not set
 # CONFIG_EXAMPLES is not set
 
@@ -171,13 +174,14 @@ CONFIG_BOOTMETH_DISTRO=y
 CONFIG_BOOTMETH_EFILOADER=y
 CONFIG_BOOTMETH_VBE=y
 CONFIG_BOOTMETH_VBE_SIMPLE=y
+CONFIG_BOOTMETH_VBE_SIMPLE_OS=y
 # CONFIG_BOOTMETH_SCRIPT is not set
 # CONFIG_LEGACY_IMAGE_FORMAT is not set
 # CONFIG_SUPPORT_RAW_INITRD is not set
 # CONFIG_OF_BOARD_SETUP is not set
 # CONFIG_OF_SYSTEM_SETUP is not set
 # CONFIG_OF_STDOUT_VIA_ALIAS is not set
-CONFIG_HAVE_SYS_TEXT_BASE=y
+CONFIG_HAVE_TEXT_BASE=y
 CONFIG_HAVE_SYS_MONITOR_BASE=y
 CONFIG_SYS_MONITOR_BASE=0x01110000
 # CONFIG_DYNAMIC_SYS_CLK_FREQ is not set
@@ -234,7 +238,10 @@ CONFIG_MENU=y
 # CONFIG_DISABLE_CONSOLE is not set
 CONFIG_LOGLEVEL=4
 # CONFIG_SILENT_CONSOLE is not set
+# CONFIG_SPL_SILENT_CONSOLE is not set
+# CONFIG_TPL_SILENT_CONSOLE is not set
 CONFIG_PRE_CONSOLE_BUFFER=y
+CONFIG_CONSOLE_FLUSH_SUPPORT=y
 CONFIG_CONSOLE_MUX=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE is not set
@@ -260,6 +267,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 #
 # Start-up hooks
 #
+# CONFIG_CYCLIC is not set
 CONFIG_EVENT=y
 CONFIG_EVENT_DYNAMIC=y
 # CONFIG_EVENT_DEBUG is not set
@@ -360,6 +368,7 @@ CONFIG_CMD_RUN=y
 CONFIG_CMD_IMI=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_XIMG=y
+# CONFIG_CMD_XXD is not set
 # CONFIG_CMD_THOR_DOWNLOAD is not set
 CONFIG_CMD_ZBOOT=y
 
@@ -431,6 +440,10 @@ CONFIG_CMD_IO=y
 CONFIG_CMD_LOADB=y
 # CONFIG_CMD_LOADM is not set
 CONFIG_CMD_LOADS=y
+# CONFIG_LOADS_ECHO is not set
+# CONFIG_CMD_SAVES is not set
+# CONFIG_SYS_LOADS_BAUD_CHANGE is not set
+CONFIG_CMD_LOADXY_TIMEOUT=90
 # CONFIG_CMD_LSBLK is not set
 # CONFIG_CMD_MBR is not set
 CONFIG_CMD_MMC=y
@@ -443,7 +456,6 @@ CONFIG_CMD_PCI=y
 # CONFIG_CMD_POWEROFF is not set
 # CONFIG_CMD_READ is not set
 # CONFIG_CMD_SATA is not set
-# CONFIG_CMD_SAVES is not set
 CONFIG_CMD_SCSI=y
 # CONFIG_CMD_SDRAM is not set
 # CONFIG_CMD_TSI148 is not set
@@ -454,6 +466,7 @@ CONFIG_CMD_USB=y
 #
 # Shell scripting commands
 #
+# CONFIG_CMD_CAT is not set
 CONFIG_CMD_ECHO=y
 CONFIG_CMD_ITEST=y
 CONFIG_CMD_SOURCE=y
@@ -486,6 +499,7 @@ 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 is not set
 # CONFIG_CMD_MII is not set
 # CONFIG_CMD_MDIO is not set
 CONFIG_CMD_PING=y
@@ -505,13 +519,15 @@ CONFIG_CMD_PING=y
 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_CLS=y
 # CONFIG_CMD_EFIDEBUG is not set
+# CONFIG_CMD_EFICONFIG is not set
 # CONFIG_CMD_EXCEPTION is not set
 CONFIG_CMD_DATE=y
 # CONFIG_CMD_RTC is not set
 CONFIG_CMD_TIME=y
 CONFIG_CMD_GETTIME=y
+# CONFIG_CMD_PAUSE is not set
 CONFIG_CMD_SLEEP=y
 # CONFIG_CMD_TIMER is not set
 CONFIG_CMD_SOUND=y
@@ -520,6 +536,7 @@ CONFIG_CMD_SOUND=y
 # CONFIG_CMD_PSTORE is not set
 # CONFIG_CMD_TERMINAL is not set
 # CONFIG_CMD_UUID is not set
+CONFIG_CMD_VIDCONSOLE=y
 
 #
 # TI specific command line interface
@@ -650,6 +667,8 @@ 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_PROT_TCP is not set
+# CONFIG_IPV6 is not set
 CONFIG_SYS_RX_ETH_BUFFER=4
 
 #
@@ -676,6 +695,7 @@ CONFIG_SIMPLE_BUS=y
 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
@@ -701,7 +721,6 @@ CONFIG_AHCI_PCI=y
 # Bus devices
 #
 CONFIG_BLK=y
-CONFIG_HAVE_BLOCK_DEVICE=y
 CONFIG_BLOCK_CACHE=y
 # CONFIG_EFI_MEDIA is not set
 CONFIG_IDE=y
@@ -782,6 +801,8 @@ CONFIG_SYS_64BIT_LBA=y
 # CONFIG_FPGA_ALTERA is not set
 # CONFIG_FPGA_SOCFPGA is not set
 # CONFIG_FPGA_XILINX is not set
+# CONFIG_DM_FPGA is not set
+# CONFIG_FWU_MDATA is not set
 CONFIG_GPIO=y
 # CONFIG_GPIO_HOG is not set
 # CONFIG_DM_GPIO_LOOKUP_LABEL is not set
@@ -821,6 +842,7 @@ CONFIG_GPIO=y
 # CONFIG_ZYNQMP_GPIO_MODEPIN is not set
 # CONFIG_SLG7XL45106_I2C_GPO is not set
 # CONFIG_TURRIS_OMNIA_MCU is not set
+# CONFIG_FTGPIO010 is not set
 
 #
 # Hardware Spinlock Support
@@ -834,6 +856,7 @@ CONFIG_I2C=y
 # CONFIG_SYS_I2C_FSL is not set
 # CONFIG_SYS_I2C_DW is not set
 # CONFIG_SYS_I2C_IMX_LPI2C is not set
+# CONFIG_SYS_I2C_MTK is not set
 # CONFIG_SYS_I2C_MICROCHIP is not set
 # CONFIG_SYS_I2C_MXC is not set
 # CONFIG_SYS_I2C_NPCM is not set
@@ -842,7 +865,6 @@ CONFIG_I2C=y
 # CONFIG_SYS_I2C_MVTWSI is not set
 CONFIG_INPUT=y
 CONFIG_DM_KEYBOARD=y
-# CONFIG_KEYBOARD is not set
 # CONFIG_CROS_EC_KEYB is not set
 CONFIG_I8042_KEYB=y
 # CONFIG_TEGRA_KEYBOARD is not set
@@ -867,6 +889,7 @@ CONFIG_I8042_KEYB=y
 #
 # Memory Controller drivers
 #
+# CONFIG_MEMORY is not set
 
 #
 # Multifunction device drivers
@@ -898,6 +921,7 @@ CONFIG_MMC_WRITE=y
 CONFIG_DM_MMC=y
 # CONFIG_ARM_PL180_MMCI is not set
 CONFIG_MMC_QUIRKS=y
+CONFIG_SYS_MMC_MAX_BLK_COUNT=65535
 CONFIG_MMC_HW_PARTITIONING=y
 # CONFIG_SUPPORT_EMMC_RPMB is not set
 # CONFIG_SUPPORT_EMMC_BOOT is not set
@@ -992,6 +1016,7 @@ CONFIG_PHYLIB=y
 # CONFIG_PHY_VITESSE is not set
 # CONFIG_PHY_XILINX is not set
 # CONFIG_PHY_XILINX_GMII2RGMII is not set
+# CONFIG_PHY_XWAY is not set
 # CONFIG_PHY_ETHERNET_ID is not set
 # CONFIG_PHY_FIXED is not set
 # CONFIG_PHY_NCSI is not set
@@ -1028,6 +1053,7 @@ CONFIG_ETH_DESIGNWARE=y
 # CONFIG_MCFFEC is not set
 # CONFIG_FSLDMAFEC is not set
 # CONFIG_KS8851_MLL is not set
+# CONFIG_LITEETH is not set
 # CONFIG_MACB is not set
 # CONFIG_NET_NPCM750 is not set
 CONFIG_PCH_GBE=y
@@ -1258,7 +1284,7 @@ CONFIG_TIMER=y
 # CONFIG_OMAP_TIMER is not set
 # CONFIG_ORION_TIMER is not set
 # CONFIG_ROCKCHIP_TIMER is not set
-# CONFIG_STI_TIMER is not set
+# CONFIG_SP804_TIMER is not set
 # CONFIG_STM32_TIMER is not set
 CONFIG_X86_TSC_TIMER=y
 CONFIG_X86_TSC_READ_BASE=y
@@ -1348,13 +1374,12 @@ CONFIG_USB_ETHER_SMSC95XX=y
 #
 # Graphics support
 #
-CONFIG_DM_VIDEO=y
+CONFIG_VIDEO=y
 CONFIG_VIDEO_LOGO=y
 CONFIG_BACKLIGHT=y
 CONFIG_VIDEO_PCI_DEFAULT_FB_SIZE=0x1000000
 # CONFIG_VIDEO_DAMAGE is not set
 # CONFIG_BACKLIGHT_GPIO is not set
-CONFIG_CMD_VIDCONSOLE=y
 CONFIG_VIDEO_BPP8=y
 CONFIG_VIDEO_BPP16=y
 CONFIG_VIDEO_BPP32=y
@@ -1363,11 +1388,11 @@ CONFIG_VIDEO_ANSI=y
 CONFIG_CONSOLE_NORMAL=y
 # CONFIG_CONSOLE_ROTATION is not set
 # CONFIG_CONSOLE_TRUETYPE is not set
-# CONFIG_DM_PANEL_HX8238D is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_NO_FB_CLEAR is not set
 CONFIG_PANEL=y
 CONFIG_SIMPLE_PANEL=y
+# CONFIG_PANEL_HX8238D is not set
 # CONFIG_VIDEO_FONT_4X6 is not set
 CONFIG_VIDEO_FONT_8X16=y
 # CONFIG_VIDEO_FONT_SUN12X22 is not set
@@ -1392,7 +1417,6 @@ CONFIG_VIDEO_COREBOOT=y
 # CONFIG_I2C_EDID is not set
 # CONFIG_DISPLAY is not set
 # CONFIG_ATMEL_HLCD is not set
-# CONFIG_AM335X_LCD is not set
 # CONFIG_VIDEO_EXYNOS is not set
 # CONFIG_VIDEO_BROADWELL_IGD is not set
 # CONFIG_VIDEO_IVYBRIDGE_IGD is not set
@@ -1405,17 +1429,16 @@ CONFIG_VIDEO_COREBOOT=y
 # CONFIG_VIDEO_MXS is not set
 # CONFIG_VIDEO_SEPS525 is not set
 CONFIG_CONSOLE_SCROLL_LINES=5
-# CONFIG_LCD is not set
 # CONFIG_VIDEO_SIMPLE is not set
 # CONFIG_VIDEO_DT_SIMPLEFB is not set
 # CONFIG_VIDEO_MCDE_SIMPLE is not set
 # CONFIG_OSD is not set
 # CONFIG_SPLASH_SCREEN is not set
+CONFIG_VIDEO_LOGO_MAX_SIZE=0x100000
 CONFIG_VIDEO_BMP_RLE8=y
 # CONFIG_BMP_16BPP is not set
 # CONFIG_BMP_24BPP is not set
 # CONFIG_BMP_32BPP is not set
-# CONFIG_VIDEO_VCXK is not set
 
 #
 # VirtIO Drivers
@@ -1457,6 +1480,7 @@ CONFIG_FAT_WRITE=y
 CONFIG_FS_FAT_MAX_CLUSTSIZE=65536
 # CONFIG_FS_JFFS2 is not set
 # 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
@@ -1542,7 +1566,6 @@ CONFIG_SMBIOS_PARSER=y
 # CONFIG_EFI is not set
 CONFIG_EFI_LOADER=y
 CONFIG_CMD_BOOTEFI_BOOTMGR=y
-CONFIG_EFI_SETUP_EARLY=y
 CONFIG_EFI_VARIABLE_FILE_STORE=y
 # CONFIG_EFI_VARIABLE_NO_STORE is not set
 # CONFIG_EFI_VARIABLES_PRESEED is not set
@@ -1562,7 +1585,7 @@ CONFIG_EFI_HAVE_RUNTIME_RESET=y
 CONFIG_EFI_LOAD_FILE2_INITRD=y
 # CONFIG_EFI_SECURE_BOOT is not set
 CONFIG_EFI_ECPT=y
-CONFIG_EFI_EBBR_2_0_CONFORMANCE=y
+CONFIG_EFI_EBBR_2_1_CONFORMANCE=y
 # CONFIG_OPTEE_LIB is not set
 # CONFIG_OPTEE_IMAGE is not set
 # CONFIG_BOOTM_OPTEE is not set
@@ -1572,6 +1595,10 @@ CONFIG_LIB_ELF=y
 CONFIG_LMB=y
 CONFIG_LMB_USE_MAX_REGIONS=y
 CONFIG_LMB_MAX_REGIONS=8
+
+#
+# FWU Multi Bank Updates
+#
 # CONFIG_UNIT_TEST is not set
 
 #