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

1 files changed, 43 insertions, 45 deletions

diff --git a/resources/u-boot/qemu_arm64_12mb/config/default b/resources/u-boot/qemu_arm64_12mb/config/default
index 6d0a1aa7..b870bcb8 100644
--- a/resources/u-boot/qemu_arm64_12mb/config/default
+++ b/resources/u-boot/qemu_arm64_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
@@ -54,7 +54,8 @@ CONFIG_SYS_ARM_CACHE_WRITEBACK=y
 # CONFIG_ARCH_CPU_INIT is not set
 CONFIG_SYS_ARCH_TIMER=y
 CONFIG_ARM_SMCCC=y
-# CONFIG_SEMIHOSTING is not set
+# 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 is not set
@@ -67,10 +68,6 @@ CONFIG_ARM64_SUPPORT_AARCH32=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
@@ -111,6 +108,7 @@ CONFIG_ARCH_QEMU=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
@@ -167,12 +165,11 @@ CONFIG_ARCH_QEMU=y
 # CONFIG_TARGET_XENGUEST_ARM64 is not set
 # CONFIG_ARCH_GXP is not set
 # CONFIG_STATIC_MACH_TYPE is not set
-CONFIG_SYS_TEXT_BASE=0x50000000
+CONFIG_TEXT_BASE=0x50000000
 CONFIG_SYS_MALLOC_LEN=0x1000000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x40000
-CONFIG_ENV_SECT_SIZE=0x40000
 # CONFIG_DM_GPIO is not set
 CONFIG_DEFAULT_DEVICE_TREE="qemu-arm64"
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
@@ -210,7 +207,6 @@ CONFIG_ARMV8_CE_SHA256=y
 CONFIG_IMX_DCD_ADDR=0x00910000
 CONFIG_SYS_MEM_TOP_HIDE=0x0
 CONFIG_SYS_LOAD_ADDR=0x40200000
-CONFIG_ENV_ADDR=0x4000000
 CONFIG_MTDPARTS_NOR0="64m(u-boot)"
 CONFIG_MTDPARTS_NOR1="64m(u-boot-env)"
 
@@ -219,6 +215,8 @@ CONFIG_MTDPARTS_NOR1="64m(u-boot-env)"
 #
 CONFIG_BUILD_TARGET=""
 # CONFIG_SYS_PCI_64BIT is not set
+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
@@ -264,6 +262,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
 
@@ -301,15 +300,16 @@ CONFIG_BOOTMETH_DISTRO_PXE=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=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_HAVE_SYS_MONITOR_BASE=y
-CONFIG_SYS_MONITOR_BASE=0x00000000
+CONFIG_SYS_MONITOR_BASE=0x50000000
 # CONFIG_DYNAMIC_SYS_CLK_FREQ is not set
 CONFIG_ARCH_FIXUP_FDT_MEMORY=y
 # CONFIG_CHROMEOS is not set
@@ -366,7 +366,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 is not set
+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
@@ -392,6 +395,7 @@ CONFIG_LOGLEVEL=4
 #
 # Start-up hooks
 #
+# CONFIG_CYCLIC is not set
 CONFIG_EVENT=y
 CONFIG_EVENT_DYNAMIC=y
 # CONFIG_EVENT_DEBUG is not set
@@ -492,6 +496,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 is not set
 
@@ -563,6 +568,10 @@ CONFIG_CMD_FLASH=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_CLONE is not set
@@ -575,7 +584,6 @@ CONFIG_CMD_PCI=y
 CONFIG_CMD_POWEROFF=y
 # 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
@@ -587,6 +595,7 @@ CONFIG_CMD_VIRTIO=y
 #
 # Shell scripting commands
 #
+# CONFIG_CMD_CAT is not set
 CONFIG_CMD_ECHO=y
 CONFIG_CMD_ITEST=y
 CONFIG_CMD_SOURCE=y
@@ -623,6 +632,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
@@ -640,12 +650,15 @@ CONFIG_CMD_PXE=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_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 is not set
 # 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
@@ -751,11 +764,11 @@ CONFIG_SAVEENV=y
 # CONFIG_ENV_OVERWRITE is not set
 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
-CONFIG_ENV_IS_IN_FLASH=y
+# CONFIG_ENV_IS_IN_FLASH is not set
 # CONFIG_ENV_IS_IN_NAND is not set
 # CONFIG_ENV_IS_IN_NVRAM is not set
 # CONFIG_ENV_IS_IN_ONENAND is not set
@@ -791,6 +804,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
 
 #
@@ -816,6 +831,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
@@ -841,7 +857,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 is not set
@@ -929,6 +944,8 @@ CONFIG_ARM_PSCI_FW=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_AT91_GPIO is not set
 # CONFIG_ASPEED_GPIO is not set
@@ -955,6 +972,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
@@ -963,7 +981,6 @@ CONFIG_I2C=y
 # CONFIG_SYS_I2C_MVTWSI is not set
 CONFIG_INPUT=y
 # CONFIG_DM_KEYBOARD is not set
-# CONFIG_KEYBOARD is not set
 # CONFIG_CROS_EC_KEYB is not set
 # CONFIG_TEGRA_KEYBOARD is not set
 # CONFIG_TWL4030_INPUT is not set
@@ -987,6 +1004,7 @@ CONFIG_INPUT=y
 #
 # Memory Controller drivers
 #
+# CONFIG_MEMORY is not set
 
 #
 # Multifunction device drivers
@@ -1099,6 +1117,7 @@ CONFIG_E1000=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
@@ -1390,33 +1409,7 @@ CONFIG_USB_STORAGE=y
 #
 # Graphics support
 #
-# CONFIG_DM_VIDEO is not set
-# CONFIG_SYS_WHITE_ON_BLACK is not set
-# CONFIG_NO_FB_CLEAR is not set
-
-#
-# TrueType Fonts
-#
-# CONFIG_VIDEO_VESA is not set
-# CONFIG_VIDEO_LCD_ANX9804 is not set
-# CONFIG_ATMEL_LCD_BGR555 is not set
-# CONFIG_VIDEO_BCM2835 is not set
-# CONFIG_VIDEO_LCD_SSD2828 is not set
-# CONFIG_VIDEO_LCD_HITACHI_TX18D42VM is not set
-# CONFIG_VIDEO_MVEBU is not set
-# 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_TEGRA20 is not set
-# CONFIG_VIDEO_BRIDGE is not set
 # CONFIG_VIDEO is not set
-# CONFIG_LCD is not set
-# CONFIG_VIDEO_SIMPLE is not set
-# CONFIG_VIDEO_DT_SIMPLEFB is not set
-# CONFIG_OSD is not set
-# CONFIG_SPLASH_SCREEN is not set
-# CONFIG_VIDEO_VCXK is not set
 
 #
 # VirtIO Drivers
@@ -1462,6 +1455,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
@@ -1477,6 +1471,7 @@ CONFIG_FS_FAT_MAX_CLUSTSIZE=65536
 CONFIG_CHARSET=y
 # CONFIG_DYNAMIC_CRC_TABLE is not set
 CONFIG_LIB_UUID=y
+# CONFIG_SEMIHOSTING is not set
 CONFIG_PRINTF=y
 CONFIG_SPRINTF=y
 CONFIG_STRTO=y
@@ -1550,7 +1545,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
@@ -1574,7 +1568,7 @@ CONFIG_EFI_TCG2_PROTOCOL_EVENTLOG_SIZE=65536
 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
@@ -1584,6 +1578,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
 
 #