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

1 files changed, 59 insertions, 37 deletions

diff --git a/resources/u-boot/peach_pi/config/default b/resources/u-boot/peach_pi/config/default
index 65877f24..7fa1b4c0 100644
--- a/resources/u-boot/peach_pi/config/default
+++ b/resources/u-boot/peach_pi/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
@@ -59,10 +59,10 @@ CONFIG_SYS_ARM_CACHE_WRITEBACK=y
 CONFIG_ARCH_CPU_INIT=y
 # CONFIG_SYS_ARCH_TIMER is not set
 # CONFIG_ARM_SMCCC is not set
-# CONFIG_SEMIHOSTING is not set
-# CONFIG_SPL_SEMIHOSTING is not set
 CONFIG_SYS_THUMB_BUILD=y
 CONFIG_SPL_SYS_THUMB_BUILD=y
+# CONFIG_SYS_L2_PL310 is not set
+# CONFIG_SPL_SYS_L2_PL310 is not set
 # CONFIG_SYS_L2CACHE_OFF is not set
 # CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK is not set
 CONFIG_USE_ARCH_MEMCPY=y
@@ -77,10 +77,6 @@ CONFIG_S5P=y
 # CONFIG_ARCH_ORION5X is not set
 # CONFIG_TARGET_STV0991 is not set
 # CONFIG_ARCH_BCM283X is not set
-# CONFIG_ARCH_BCM63158 is not set
-# CONFIG_ARCH_BCM6753 is not set
-# CONFIG_ARCH_BCM68360 is not set
-# CONFIG_ARCH_BCM6858 is not set
 # CONFIG_ARCH_BCMSTB is not set
 # CONFIG_ARCH_BCMBCA is not set
 # CONFIG_TARGET_VEXPRESS_CA9X4 is not set
@@ -121,6 +117,7 @@ CONFIG_ARCH_EXYNOS=y
 # CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_U8500 is not set
 # CONFIG_ARCH_VERSAL is not set
+# CONFIG_ARCH_VERSAL_NET is not set
 # CONFIG_ARCH_VF610 is not set
 # CONFIG_ARCH_ZYNQ is not set
 # CONFIG_ARCH_ZYNQMP_R5 is not set
@@ -178,7 +175,7 @@ CONFIG_ARCH_EXYNOS=y
 # CONFIG_ARCH_GXP is not set
 # CONFIG_SUPPORT_PASSING_ATAGS is not set
 # CONFIG_STATIC_MACH_TYPE is not set
-CONFIG_SYS_TEXT_BASE=0x23E00000
+CONFIG_TEXT_BASE=0x23E00000
 CONFIG_SYS_MALLOC_LEN=0x5004000
 CONFIG_SYS_MALLOC_F_LEN=0x400
 CONFIG_BOARD_COMMON=y
@@ -203,8 +200,6 @@ CONFIG_EXYNOS_TMU=y
 CONFIG_NR_DRAM_BANKS=7
 CONFIG_SPL_LDSCRIPT="board/samsung/common/exynos-uboot-spl.lds"
 CONFIG_ENV_SIZE=0x4000
-CONFIG_ENV_OFFSET=0x3FC000
-CONFIG_ENV_SECT_SIZE=0x4000
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5800-peach-pi"
 CONFIG_SPL_TEXT_BASE=0x02024410
@@ -236,7 +231,6 @@ CONFIG_IMX_DCD_ADDR=0x00910000
 CONFIG_IMX_CONTAINER_CFG=""
 CONFIG_SYS_MEM_TOP_HIDE=0x0
 CONFIG_SYS_LOAD_ADDR=0x23e00000
-CONFIG_ENV_ADDR=0x0
 
 #
 # ARM debug
@@ -244,6 +238,8 @@ CONFIG_ENV_ADDR=0x0
 # CONFIG_DEBUG_LL is not set
 CONFIG_SPL_PAYLOAD="u-boot.bin"
 CONFIG_BUILD_TARGET=""
+CONFIG_FWU_NUM_BANKS=2
+CONFIG_FWU_NUM_IMAGES_PER_BANK=2
 # CONFIG_DEBUG_UART is not set
 # CONFIG_AHCI is not set
 # CONFIG_OF_BOARD_FIXUP is not set
@@ -291,6 +287,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 is not set
 
@@ -330,14 +327,17 @@ CONFIG_BOOTMETH_DISTRO=y
 CONFIG_BOOTMETH_DISTRO_PXE=y
 CONFIG_BOOTMETH_EFILOADER=y
 CONFIG_BOOTMETH_VBE=y
+# CONFIG_SPL_BOOTMETH_VBE is not set
 CONFIG_BOOTMETH_VBE_SIMPLE=y
+CONFIG_BOOTMETH_VBE_SIMPLE_OS=y
+# CONFIG_SPL_BOOTMETH_VBE_SIMPLE is not set
 # CONFIG_BOOTMETH_SCRIPT is not set
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_SUPPORT_RAW_INITRD=y
 # 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_DYNAMIC_SYS_CLK_FREQ is not set
 CONFIG_ARCH_FIXUP_FDT_MEMORY=y
 # CONFIG_CHROMEOS is not set
@@ -395,10 +395,13 @@ CONFIG_MENU=y
 CONFIG_LOGLEVEL=4
 CONFIG_SPL_LOGLEVEL=4
 CONFIG_SILENT_CONSOLE=y
+CONFIG_SPL_SILENT_CONSOLE=y
+CONFIG_TPL_SILENT_CONSOLE=y
 # CONFIG_SILENT_U_BOOT_ONLY is not set
 CONFIG_SILENT_CONSOLE_UPDATE_ON_SET=y
 # CONFIG_SILENT_CONSOLE_UPDATE_ON_RELOC is not set
 # CONFIG_PRE_CONSOLE_BUFFER is not set
+CONFIG_CONSOLE_FLUSH_SUPPORT=y
 CONFIG_CONSOLE_MUX=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE is not set
@@ -424,6 +427,7 @@ CONFIG_DISPLAY_BOARDINFO=y
 #
 # Start-up hooks
 #
+# CONFIG_CYCLIC is not set
 CONFIG_EVENT=y
 CONFIG_EVENT_DYNAMIC=y
 # CONFIG_EVENT_DEBUG is not set
@@ -498,6 +502,7 @@ CONFIG_SPL_CRC32=y
 # CONFIG_SPL_FAT_WRITE is not set
 # CONFIG_SPL_FPGA is not set
 # CONFIG_SPL_I2C is not set
+# CONFIG_SPL_MEMORY is not set
 CONFIG_SYS_MMCSD_FS_BOOT_PARTITION=1
 # CONFIG_SPL_MPC8XXX_INIT_DDR is not set
 # CONFIG_SPL_MTD_SUPPORT is not set
@@ -526,7 +531,6 @@ CONFIG_SYS_MMCSD_FS_BOOT_PARTITION=1
 # CONFIG_SPL_USB_HOST is not set
 # CONFIG_SPL_USB_GADGET is not set
 # CONFIG_SPL_WATCHDOG is not set
-# CONFIG_SPL_OPTEE_IMAGE is not set
 CONFIG_SPL_TARGET=""
 # CONFIG_VPL is not set
 # CONFIG_FDT_SIMPLEFB is not set
@@ -591,6 +595,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_SPL is not set
 # CONFIG_CMD_THOR_DOWNLOAD is not set
 # CONFIG_CMD_ZBOOT is not set
@@ -668,6 +673,10 @@ CONFIG_CMD_I2C=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
@@ -682,7 +691,6 @@ CONFIG_CMD_PART=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 is not set
 # CONFIG_CMD_SDRAM is not set
 CONFIG_CMD_SF=y
@@ -698,6 +706,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
@@ -733,6 +742,7 @@ CONFIG_NET_TFTP_VARS=y
 CONFIG_CMD_NFS=y
 CONFIG_NFS_TIMEOUT=2000
 # CONFIG_SYS_DISABLE_AUTOLOAD is not set
+# CONFIG_CMD_WGET is not set
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_CDP is not set
@@ -753,10 +763,12 @@ CONFIG_CMD_CACHE=y
 # CONFIG_CMD_CONITRACE 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 is not set
 CONFIG_CMD_TIME=y
 # CONFIG_CMD_GETTIME is not set
+# CONFIG_CMD_PAUSE is not set
 # CONFIG_CMD_RNG is not set
 # CONFIG_CMD_KASLRSEED is not set
 CONFIG_CMD_SLEEP=y
@@ -767,6 +779,7 @@ CONFIG_CMD_SYSBOOT=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
@@ -871,7 +884,7 @@ CONFIG_SAVEENV=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_MIN_ENTRIES=64
 CONFIG_ENV_MAX_ENTRIES=512
-# CONFIG_ENV_IS_NOWHERE is not set
+CONFIG_ENV_IS_NOWHERE=y
 # CONFIG_ENV_IS_IN_EEPROM is not set
 # CONFIG_ENV_IS_IN_FAT is not set
 # CONFIG_ENV_IS_IN_EXT4 is not set
@@ -881,13 +894,7 @@ CONFIG_ENV_MAX_ENTRIES=512
 # CONFIG_ENV_IS_IN_NVRAM is not set
 # CONFIG_ENV_IS_IN_ONENAND is not set
 # CONFIG_ENV_IS_IN_REMOTE is not set
-CONFIG_ENV_IS_IN_SPI_FLASH=y
-# CONFIG_ENV_SECT_SIZE_AUTO is not set
-CONFIG_ENV_SPI_BUS=1
-CONFIG_ENV_SPI_CS=0
-CONFIG_ENV_SPI_MAX_HZ=50000000
-CONFIG_ENV_SPI_MODE=0x0
-# CONFIG_ENV_SPI_EARLY is not set
+# CONFIG_ENV_IS_IN_SPI_FLASH is not set
 # CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 # CONFIG_USE_DEFAULT_ENV_FILE is not set
@@ -919,6 +926,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
 
 #
@@ -945,6 +954,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=y
 # CONFIG_ADC is not set
@@ -964,7 +974,6 @@ CONFIG_BOUNCE_BUFFER=y
 # Bus devices
 #
 CONFIG_BLK=y
-CONFIG_HAVE_BLOCK_DEVICE=y
 CONFIG_BLOCK_CACHE=y
 # CONFIG_EFI_MEDIA is not set
 # CONFIG_IDE is not set
@@ -1036,6 +1045,8 @@ CONFIG_BLOCK_CACHE=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_SPL_GPIO_HOG is not set
@@ -1080,6 +1091,8 @@ 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
+# CONFIG_ADP5585_GPIO is not set
 
 #
 # Hardware Spinlock Support
@@ -1098,6 +1111,7 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
 # CONFIG_SYS_I2C_DW is not set
 # CONFIG_SYS_I2C_INTEL 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_NEXELL is not set
@@ -1117,7 +1131,6 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 # CONFIG_I2C_MUX_GPIO is not set
 CONFIG_INPUT=y
 CONFIG_DM_KEYBOARD=y
-CONFIG_KEYBOARD=y
 # CONFIG_APPLE_SPI_KEYB is not set
 CONFIG_CROS_EC_KEYB=y
 # CONFIG_I8042_KEYB is not set
@@ -1143,6 +1156,7 @@ CONFIG_CROS_EC_KEYB=y
 #
 # Memory Controller drivers
 #
+# CONFIG_MEMORY is not set
 
 #
 # Multifunction device drivers
@@ -1179,6 +1193,7 @@ CONFIG_DM_MMC=y
 # CONFIG_MMC_SPI is not set
 # 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=y
@@ -1299,6 +1314,7 @@ CONFIG_NETDEVICES=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 is not set
@@ -1379,7 +1395,7 @@ CONFIG_PMIC_CHILDREN=y
 # CONFIG_DM_PMIC_MAX8998 is not set
 # CONFIG_DM_PMIC_MC34708 is not set
 # CONFIG_PMIC_MAX8997 is not set
-# CONFIG_PMIC_PM8916 is not set
+# CONFIG_PMIC_QCOM is not set
 # CONFIG_PMIC_RK8XX is not set
 # CONFIG_PMIC_S2MPS11 is not set
 # CONFIG_DM_PMIC_SANDBOX is not set
@@ -1521,6 +1537,7 @@ CONFIG_SOUND_WM8994=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_SPI_MEM=y
+# CONFIG_SPI_DIRMAP is not set
 # CONFIG_ALTERA_SPI is not set
 # CONFIG_APPLE_SPI is not set
 # CONFIG_ATCSPI200_SPI is not set
@@ -1537,18 +1554,22 @@ CONFIG_EXYNOS_SPI=y
 # CONFIG_ICH_SPI is not set
 # CONFIG_IPROC_QSPI is not set
 # CONFIG_KIRKWOOD_SPI is not set
+# CONFIG_MICROCHIP_COREQSPI is not set
 # CONFIG_MPC8XXX_SPI is not set
 # CONFIG_MTK_SNOR is not set
 # CONFIG_MTK_SNFI_SPI is not set
+# CONFIG_MTK_SPIM is not set
 # CONFIG_MVEBU_A3700_SPI is not set
 # CONFIG_MXS_SPI is not set
 # CONFIG_SPI_MXIC is not set
 # CONFIG_NPCM_FIU_SPI is not set
+# CONFIG_NPCM_PSPI is not set
 # CONFIG_NXP_FSPI is not set
 # CONFIG_OMAP3_SPI is not set
 # CONFIG_PL022_SPI is not set
 # CONFIG_ROCKCHIP_SFC is not set
 # CONFIG_ROCKCHIP_SPI is not set
+# CONFIG_SPI_ASPEED_SMC is not set
 # CONFIG_SPI_SIFIVE is not set
 # CONFIG_SOFT_SPI is not set
 # CONFIG_SPI_SUNXI is not set
@@ -1674,7 +1695,7 @@ 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=0
@@ -1682,7 +1703,6 @@ CONFIG_VIDEO_PCI_DEFAULT_FB_SIZE=0
 CONFIG_VIDEO_DAMAGE=y
 CONFIG_BACKLIGHT_PWM=y
 # CONFIG_BACKLIGHT_GPIO is not set
-CONFIG_CMD_VIDCONSOLE=y
 # CONFIG_VIDEO_BPP8 is not set
 CONFIG_VIDEO_BPP16=y
 CONFIG_VIDEO_BPP32=y
@@ -1691,11 +1711,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
@@ -1705,7 +1725,7 @@ CONFIG_VIDEO_FONT_8X16=y
 # TrueType Fonts
 #
 CONFIG_VIDCONSOLE_AS_LCD=y
-CONFIG_VIDCONSOLE_AS_NAME="lcd"
+CONFIG_VIDCONSOLE_AS_NAME="vga"
 # CONFIG_VIDEO_VESA is not set
 # CONFIG_VIDEO_LCD_ANX9804 is not set
 # CONFIG_ATMEL_LCD_BGR555 is not set
@@ -1721,7 +1741,6 @@ CONFIG_I2C_EDID=y
 CONFIG_DISPLAY=y
 # CONFIG_NXP_TDA19988 is not set
 # CONFIG_ATMEL_HLCD is not set
-# CONFIG_AM335X_LCD is not set
 CONFIG_VIDEO_EXYNOS=y
 CONFIG_EXYNOS_DP=y
 CONFIG_EXYNOS_FB=y
@@ -1739,19 +1758,16 @@ CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 # CONFIG_VIDEO_MXS is not set
 # CONFIG_VIDEO_SEPS525 is not set
 CONFIG_CONSOLE_SCROLL_LINES=1
-CONFIG_LCD=y
-# CONFIG_LCD_INFO is not set
-# CONFIG_LCD_LOGO 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
@@ -1792,6 +1808,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
@@ -1808,6 +1825,8 @@ CONFIG_CHARSET=y
 # CONFIG_DYNAMIC_CRC_TABLE is not set
 CONFIG_HAVE_PRIVATE_LIBGCC=y
 CONFIG_LIB_UUID=y
+# CONFIG_SEMIHOSTING is not set
+# CONFIG_SPL_SEMIHOSTING is not set
 CONFIG_PRINTF=y
 CONFIG_SPRINTF=y
 CONFIG_SPL_SPRINTF=y
@@ -1895,7 +1914,6 @@ CONFIG_GENERATE_SMBIOS_TABLE=y
 CONFIG_SMBIOS_PARSER=y
 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
@@ -1914,7 +1932,7 @@ CONFIG_EFI_TCG2_PROTOCOL=y
 CONFIG_EFI_TCG2_PROTOCOL_EVENTLOG_SIZE=65536
 CONFIG_EFI_LOAD_FILE2_INITRD=y
 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
@@ -1923,6 +1941,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
 # CONFIG_SPL_UNIT_TEST is not set