u-boot: Update to v2024.07

Set default U-Boot revision to v2024.07 and rebase patches on top of
that. One patch that fixes drawing box characters (UTF-8 to CP437) had
an alternative merged, another hack we have to fix regulator issues is
no longer neccessary as the issue is fixed, and my QEMU patches were
merged upstream, so drop these patches. One patch we have to disable
binman images can be replaced by a simpler alternative so drop it too.

Upstream kconfig status is still unstable, so updating configs with
`make oldconfig` would miss important upstream changes, since they rely
on carrying defaults via upstream defconfigs. Update the configs as
such, like before:

- Turn old configs into defconfigs (./update trees -s u-boot)
- Save the diff from old upstream defconfig (diffconfig $theirs $ours)
- Update U-Boot revision, rebase patches, and clean old trees
- Prepare new U-Boot tree (./update trees -f u-boot)
- Review the diffconfigs to see if any options were renamed upstream
- Copy over the new upstream defconfigs and apply earlier diff
- Turn new defconfigs into configs (./update trees -l u-boot)

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>

1 files changed, 141 insertions, 75 deletions

diff --git a/config/u-boot/gru_bob/config/default b/config/u-boot/gru_bob/config/default
index 2bcbe3d8..da088ef0 100644
--- a/config/u-boot/gru_bob/config/default
+++ b/config/u-boot/gru_bob/config/default
@@ -1,13 +1,14 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# U-Boot 2023.10 Configuration
+# U-Boot 2024.07 Configuration
 #
 
 #
-# Compiler: gcc (Debian 13.2.0-5) 13.2.0
+# Compiler: gcc (Debian 13.3.0-2) 13.3.0
 #
 CONFIG_CREATE_ARCH_SYMLINK=y
 CONFIG_SYS_CACHE_SHIFT_6=y
+CONFIG_64BIT=y
 CONFIG_SYS_CACHELINE_SIZE=64
 CONFIG_LINKER_LIST_ALIGN=8
 # CONFIG_ARC is not set
@@ -40,7 +41,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 # CONFIG_SYS_ICACHE_OFF is not set
 # CONFIG_SPL_SYS_ICACHE_OFF is not set
 # CONFIG_SYS_DCACHE_OFF is not set
-# CONFIG_SPL_SYS_DCACHE_OFF is not set
+CONFIG_SPL_SYS_DCACHE_OFF=y
 
 #
 # ARM architecture
@@ -53,6 +54,7 @@ CONFIG_INIT_SP_RELATIVE=y
 CONFIG_SYS_INIT_SP_BSS_OFFSET=524288
 CONFIG_LNX_KRNL_IMG_TEXT_OFFSET_BASE=0x18000000
 # CONFIG_GIC_V3_ITS is not set
+# CONFIG_GICV3_SUPPORT_GIC600 is not set
 CONFIG_STATIC_RELA=y
 CONFIG_DMA_ADDR_T_64BIT=y
 CONFIG_ARM_ASM_UNIFIED=y
@@ -81,13 +83,11 @@ CONFIG_ARM64_SUPPORT_AARCH32=y
 # CONFIG_ARCH_KIRKWOOD is not set
 # CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_ORION5X is not set
-# CONFIG_TARGET_STV0991 is not set
 # CONFIG_ARCH_BCM283X is not set
 # CONFIG_ARCH_BCMSTB is not set
 # CONFIG_ARCH_BCMBCA is not set
 # CONFIG_TARGET_VEXPRESS_CA9X4 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
 # CONFIG_ARCH_S5PC1XX is not set
@@ -117,7 +117,7 @@ CONFIG_ARM64_SUPPORT_AARCH32=y
 # CONFIG_ARCH_APPLE is not set
 # CONFIG_ARCH_OWL is not set
 # CONFIG_ARCH_QEMU is not set
-# CONFIG_ARCH_RMOBILE is not set
+# CONFIG_ARCH_RENESAS is not set
 # CONFIG_ARCH_SNAPDRAGON is not set
 # CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_ARCH_SUNXI is not set
@@ -176,6 +176,7 @@ CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_ASPEED is not set
 # CONFIG_TARGET_DURIAN is not set
 # CONFIG_TARGET_POMELO is not set
+# CONFIG_TARGET_PE2201 is not set
 # CONFIG_TARGET_PRESIDIO_ASIC is not set
 # CONFIG_TARGET_XENGUEST_ARM64 is not set
 # CONFIG_ARCH_GXP is not set
@@ -194,10 +195,9 @@ CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_ENV_SIZE=0x8000
 CONFIG_DM_GPIO=y
 CONFIG_SPL_DM_SPI=y
-CONFIG_DEFAULT_DEVICE_TREE="rk3399-gru-bob"
+CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3399-gru-bob"
 CONFIG_SPL_TEXT_BASE=0xff8c2000
-CONFIG_BOARD_SPECIFIC_OPTIONS=y
-# CONFIG_OF_LIBFDT_OVERLAY is not set
+CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x8000
 CONFIG_DM_RESET=y
 CONFIG_SYS_MONITOR_LEN=0
@@ -227,13 +227,15 @@ CONFIG_ROCKCHIP_STIMER=y
 CONFIG_ROCKCHIP_STIMER_BASE=0xff8680a0
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
 # CONFIG_SPL_ROCKCHIP_EARLYRETURN_TO_BROM is not set
+CONFIG_ROCKCHIP_DISABLE_FORCE_JTAG=y
 # CONFIG_SPL_MMC is not set
 CONFIG_ROCKCHIP_SPI_IMAGE=y
+CONFIG_ROCKCHIP_COMMON_STACK_ADDR=y
 CONFIG_SPL_SERIAL=y
 CONFIG_TPL_LDSCRIPT="arch/arm/mach-rockchip/u-boot-tpl-v8.lds"
 CONFIG_TPL_TEXT_BASE=0xff8c2000
 CONFIG_TPL_STACK=0xff8effff
-CONFIG_SPL_DRIVERS_MISC=y
+# CONFIG_SPL_DRIVERS_MISC is not set
 CONFIG_SPL_STACK_R_ADDR=0x04000000
 CONFIG_TARGET_CHROMEBOOK_BOB=y
 # CONFIG_TARGET_CHROMEBOOK_KEVIN is not set
@@ -242,16 +244,23 @@ CONFIG_TARGET_CHROMEBOOK_BOB=y
 # CONFIG_TARGET_PINEPHONE_PRO_RK3399 is not set
 # CONFIG_TARGET_PUMA_RK3399 is not set
 # CONFIG_TARGET_ROCK960_RK3399 is not set
+# CONFIG_TARGET_ROCKPI4_RK3399 is not set
 # CONFIG_TARGET_ROCKPRO64_RK3399 is not set
 # CONFIG_TARGET_ROC_PC_RK3399 is not set
 CONFIG_SPL_STACK=0xff8effff
 CONFIG_SPL_SYS_MALLOC_F_LEN=0x4000
+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
+CONFIG_SPL_BSS_START_ADDR=0xff8e0000
+CONFIG_SPL_BSS_MAX_SIZE=0x10000
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000
+CONFIG_SPL_SYS_MALLOC_F=y
 CONFIG_ERR_PTR_OFFSET=0x0
 CONFIG_SPL_SIZE_LIMIT=0x0
 CONFIG_SPL=y
 CONFIG_PRE_CON_BUF_ADDR=0x0f200000
 CONFIG_PRE_CON_BUF_SZ=4096
-CONFIG_BOOTSTAGE_STASH_ADDR=0
+CONFIG_BOOTSTAGE_STASH_ADDR=0x0
 CONFIG_DEBUG_UART_BASE=0xff1a0000
 CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEBUG_UART_BOARD_INIT=y
@@ -265,7 +274,7 @@ CONFIG_SPL_SPI=y
 # CONFIG_CMO_BY_VA_ONLY is not set
 # CONFIG_ARMV8_SPL_EXCEPTION_VECTORS is not set
 # CONFIG_ARMV8_MULTIENTRY is not set
-# CONFIG_ARMV8_SET_SMPEN is not set
+CONFIG_ARMV8_SET_SMPEN=y
 # CONFIG_ARMV8_SWITCH_TO_EL1 is not set
 
 #
@@ -277,7 +286,9 @@ CONFIG_SPL_SPI=y
 CONFIG_PSCI_RESET=y
 # CONFIG_ARMV8_PSCI is not set
 # CONFIG_ARMV8_EA_EL3_FIRST is not set
-# CONFIG_ARMV8_CRYPTO is not set
+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
@@ -285,8 +296,6 @@ CONFIG_PSCI_RESET=y
 # CONFIG_IMX_ELE_DEK_ENCAP is not set
 # CONFIG_CMD_HDMIDETECT is not set
 CONFIG_IMX_DCD_ADDR=0x00910000
-# CONFIG_SPL_LOAD_IMX_CONTAINER is not set
-CONFIG_IMX_CONTAINER_CFG=""
 CONFIG_SYS_MEM_TOP_HIDE=0x0
 CONFIG_SYS_LOAD_ADDR=0x800800
 
@@ -313,7 +322,7 @@ CONFIG_DEBUG_UART=y
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130200
+CONFIG_GCC_VERSION=130300
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
@@ -346,6 +355,10 @@ 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
+CONFIG_SYS_UBOOT_START=0x18000000
+# CONFIG_DYNAMIC_SYS_CLK_FREQ is not set
 # CONFIG_API is not set
 
 #
@@ -356,8 +369,8 @@ CONFIG_SYS_SRAM_SIZE=0x0
 # Boot images
 #
 # CONFIG_ANDROID_BOOT_IMAGE is not set
-CONFIG_FIT=y
 # CONFIG_TIMESTAMP is not set
+CONFIG_FIT=y
 CONFIG_FIT_EXTERNAL_OFFSET=0x0
 CONFIG_FIT_FULL_CHECK=y
 # CONFIG_FIT_SIGNATURE is not set
@@ -377,6 +390,8 @@ CONFIG_SPL_LOAD_FIT_ADDRESS=0x0
 CONFIG_SPL_FIT_SOURCE=""
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_PXE_UTILS=y
+CONFIG_BOOT_DEFAULTS_FEATURES=y
+CONFIG_BOOT_DEFAULTS_CMDS=y
 CONFIG_BOOT_DEFAULTS=y
 CONFIG_BOOTSTD=y
 # CONFIG_SPL_BOOTSTD is not set
@@ -384,9 +399,11 @@ CONFIG_BOOTSTD_FULL=y
 CONFIG_BOOTSTD_DEFAULTS=y
 CONFIG_BOOTSTD_BOOTCOMMAND=y
 CONFIG_BOOTMETH_GLOBAL=y
+# CONFIG_BOOTMETH_CROS is not set
 CONFIG_BOOTMETH_EXTLINUX=y
 CONFIG_BOOTMETH_EXTLINUX_PXE=y
 CONFIG_BOOTMETH_EFILOADER=y
+CONFIG_BOOTMETH_EFI_BOOTMGR=y
 CONFIG_BOOTMETH_VBE=y
 CONFIG_BOOTMETH_DISTRO=y
 # CONFIG_SPL_BOOTMETH_VBE is not set
@@ -398,13 +415,8 @@ CONFIG_BOOTMETH_VBE_SIMPLE_OS=y
 CONFIG_EXPO=y
 CONFIG_BOOTMETH_SCRIPT=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 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_TEXT_BASE=y
-# CONFIG_DYNAMIC_SYS_CLK_FREQ is not set
-CONFIG_ARCH_FIXUP_FDT_MEMORY=y
 # CONFIG_CHROMEOS is not set
 # CONFIG_CHROMEOS_VBOOT is not set
 # CONFIG_RAMBOOT_PBL is not set
@@ -444,6 +456,17 @@ CONFIG_BOOTDELAY=2
 # Image support
 #
 # CONFIG_IMAGE_PRE_LOAD is not set
+
+#
+# Devicetree fixup
+#
+# CONFIG_OF_ENV_SETUP 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_FDT_FIXUP_PARTITIONS is not set
+# CONFIG_FDT_SIMPLEFB is not set
+CONFIG_ARCH_FIXUP_FDT_MEMORY=y
 # CONFIG_USE_BOOTARGS is not set
 # CONFIG_BOOTARGS_SUBST is not set
 CONFIG_USE_BOOTCOMMAND=y
@@ -463,6 +486,8 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-gru-bob.dtb"
 #
 CONFIG_MENU=y
 # CONFIG_CONSOLE_RECORD is not set
+CONFIG_SYS_CBSIZE=1024
+CONFIG_SYS_PBSIZE=1044
 # CONFIG_DISABLE_CONSOLE is not set
 CONFIG_LOGLEVEL=4
 CONFIG_SPL_LOGLEVEL=4
@@ -471,6 +496,7 @@ CONFIG_SPL_LOGLEVEL=4
 # CONFIG_TPL_SILENT_CONSOLE is not set
 CONFIG_PRE_CONSOLE_BUFFER=y
 CONFIG_CONSOLE_FLUSH_SUPPORT=y
+# CONFIG_CONSOLE_FLUSH_ON_NEWLINE is not set
 CONFIG_CONSOLE_MUX=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE is not set
@@ -517,7 +543,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_BOARD_LATE_INIT=y
 # CONFIG_CLOCKS is not set
 # CONFIG_HWCONFIG is not set
-# CONFIG_LAST_STAGE_INIT is not set
+CONFIG_LAST_STAGE_INIT=y
 CONFIG_MISC_INIT_R=y
 # CONFIG_SYS_MALLOC_BOOTPARAMS is not set
 # CONFIG_ID_EEPROM is not set
@@ -557,14 +583,11 @@ CONFIG_SUPPORT_TPL=y
 #
 CONFIG_SPL_FRAMEWORK=y
 # CONFIG_SPL_FRAMEWORK_BOARD_INIT_F is not set
-CONFIG_SPL_MAX_SIZE=0x2e000
+CONFIG_SPL_MAX_SIZE=0x1e000
 CONFIG_SPL_PAD_TO=0x7f8000
-CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
-CONFIG_SPL_BSS_START_ADDR=0xff8e0000
 # CONFIG_SPL_NO_BSS_LIMIT is not set
 CONFIG_SPL_BSS_LIMIT=y
 # CONFIG_SPL_FOOTPRINT_LIMIT is not set
-CONFIG_SPL_BSS_MAX_SIZE=0x10000
 CONFIG_SPL_SYS_STACK_F_CHECK_BYTE=0xaa
 # CONFIG_SPL_SYS_REPORT_STACK_F_USAGE is not set
 # CONFIG_SPL_SHOW_ERRORS is not set
@@ -576,12 +599,11 @@ CONFIG_SPL_BOARD_INIT=y
 # CONFIG_SPL_BOOTROM_SUPPORT is not set
 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
 # CONFIG_SPL_LEGACY_IMAGE_FORMAT is not set
+# CONFIG_SPL_LOAD_IMX_CONTAINER is not set
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
-CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000
 CONFIG_SPL_SEPARATE_BSS=y
-# CONFIG_SYS_SPL_MALLOC is not set
+# CONFIG_SPL_SYS_MALLOC is not set
 CONFIG_SPL_BANNER_PRINT=y
 # CONFIG_SPL_DISPLAY_PRINT is not set
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
@@ -602,7 +624,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_DATA_PART_OFFSET=0x0
 # CONFIG_SPL_DM_MAILBOX is not set
 # CONFIG_SPL_MEMORY is not set
 # CONFIG_SPL_MPC8XXX_INIT_DDR is not set
-# CONFIG_SPL_MTD_SUPPORT is not set
+# CONFIG_SPL_MTD is not set
 # CONFIG_SPL_MUSB_NEW is not set
 # CONFIG_SPL_NAND_SUPPORT is not set
 # CONFIG_SPL_NAND_DRIVERS is not set
@@ -640,23 +662,21 @@ CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
 CONFIG_SPL_TARGET=""
 # CONFIG_TPL is not set
 # CONFIG_VPL is not set
-# CONFIG_FDT_SIMPLEFB is not set
-# CONFIG_BMP is not set
+CONFIG_CMDLINE=y
+CONFIG_HUSH_PARSER=y
 
 #
-# Command line interface
+# Hush flavor to use
 #
-CONFIG_CMDLINE=y
-CONFIG_HUSH_PARSER=y
+CONFIG_HUSH_OLD_PARSER=y
+# CONFIG_HUSH_MODERN_PARSER is not set
 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=1024
-CONFIG_SYS_PBSIZE=1044
+CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_XTRACE=y
 
 #
@@ -670,8 +690,10 @@ CONFIG_CMD_BDI=y
 # CONFIG_CMD_BDINFO_EXTRA is not set
 # CONFIG_CMD_CONFIG is not set
 CONFIG_CMD_CONSOLE=y
+# CONFIG_CMD_HISTORY is not set
 # CONFIG_CMD_LICENSE is not set
 # CONFIG_CMD_PMC is not set
+# CONFIG_CMD_SMBIOS is not set
 
 #
 # Boot commands
@@ -693,24 +715,24 @@ CONFIG_BOOTM_PLAN9=y
 CONFIG_BOOTM_RTEMS=y
 CONFIG_CMD_VBE=y
 CONFIG_BOOTM_VXWORKS=y
-CONFIG_SYS_BOOTM_LEN=0x4000000
 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=y
 # CONFIG_CMD_ADTIMG is not set
 CONFIG_CMD_ELF=y
+# CONFIG_CMD_ELF_FDT_SETUP is not set
 CONFIG_CMD_FDT=y
 CONFIG_CMD_GO=y
 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_SYS_XIMG_LEN=0x800000
 # CONFIG_CMD_SPL is not set
-# CONFIG_CMD_THOR_DOWNLOAD is not set
-# CONFIG_CMD_ZBOOT is not set
 
 #
 # Environment commands
@@ -776,7 +798,6 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_GPIO_READ is not set
 # CONFIG_CMD_PWM is not set
 CONFIG_CMD_GPT=y
-CONFIG_RANDOM_UUID=y
 # CONFIG_CMD_GPT_RENAME is not set
 # CONFIG_CMD_IDE is not set
 # CONFIG_CMD_IO is not set
@@ -794,8 +815,11 @@ CONFIG_CMD_LOADXY_TIMEOUT=90
 # CONFIG_CMD_MISC is not set
 CONFIG_CMD_MMC=y
 # CONFIG_CMD_BKOPS_ENABLE is not set
+# CONFIG_CMD_MMC_REG is not set
 # CONFIG_CMD_MMC_SWRITE is not set
 # CONFIG_CMD_CLONE is not set
+# CONFIG_CMD_MTD is not set
+# CONFIG_CMD_ONENAND is not set
 # CONFIG_CMD_OSD is not set
 CONFIG_CMD_PART=y
 # CONFIG_CMD_PCI is not set
@@ -808,11 +832,12 @@ CONFIG_CMD_SF=y
 CONFIG_CMD_SF_TEST=y
 CONFIG_CMD_SPI=y
 CONFIG_DEFAULT_SPI_BUS=0
-CONFIG_DEFAULT_SPI_MODE=0
+CONFIG_DEFAULT_SPI_MODE=0x0
 # CONFIG_CMD_TSI148 is not set
 # CONFIG_CMD_UNIVERSE is not set
 CONFIG_CMD_USB=y
 # CONFIG_CMD_USB_SDP is not set
+# CONFIG_CMD_RKMTD is not set
 # CONFIG_CMD_WRITE is not set
 
 #
@@ -823,6 +848,7 @@ CONFIG_CMD_ECHO=y
 CONFIG_CMD_ITEST=y
 CONFIG_CMD_SOURCE=y
 # CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_XXD is not set
 
 #
 # Android support commands
@@ -845,6 +871,7 @@ CONFIG_BOOTP_SUBNETMASK=y
 # CONFIG_CMD_PCAP is not set
 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
@@ -898,7 +925,6 @@ CONFIG_CMD_VIDCONSOLE=y
 #
 # TI specific command line interface
 #
-# CONFIG_CMD_DDR3 is not set
 
 #
 # Power commands
@@ -933,9 +959,9 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 # CONFIG_CMD_FS_UUID is not set
 # CONFIG_CMD_JFFS2 is not set
+# CONFIG_CMD_MTDPARTS is not set
 CONFIG_MTDIDS_DEFAULT=""
 CONFIG_MTDPARTS_DEFAULT=""
-# CONFIG_CMD_REISER is not set
 # CONFIG_CMD_ZFS is not set
 
 #
@@ -979,16 +1005,18 @@ CONFIG_BINMAN=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_REAL=y
 CONFIG_SPL_OF_CONTROL=y
-# CONFIG_OF_LIVE is not set
+CONFIG_OF_LIVE=y
+CONFIG_OF_UPSTREAM=y
+# CONFIG_OF_UPSTREAM_BUILD_VENDOR is not set
 CONFIG_OF_SEPARATE=y
 # CONFIG_OF_EMBED is not set
 # CONFIG_OF_BOARD is not set
 # CONFIG_OF_OMIT_DTB is not set
 CONFIG_DEVICE_TREE_INCLUDES=""
-CONFIG_OF_LIST="rk3399-gru-bob"
+CONFIG_OF_LIST="rockchip/rk3399-gru-bob"
 # CONFIG_MULTI_DTB_FIT is not set
 # CONFIG_SPL_MULTI_DTB_FIT is not set
-CONFIG_SPL_OF_LIST="rk3399-gru-bob"
+CONFIG_SPL_OF_LIST="rockchip/rk3399-gru-bob"
 CONFIG_OF_TAG_MIGRATE=y
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 # CONFIG_OF_DTB_PROPS_REMOVE is not set
@@ -1066,10 +1094,11 @@ CONFIG_SYS_RX_ETH_BUFFER=4
 #
 CONFIG_DM=y
 CONFIG_SPL_DM=y
-CONFIG_DM_WARN=y
+# CONFIG_DM_WARN is not set
 # CONFIG_SPL_DM_WARN is not set
 # CONFIG_DM_DEBUG is not set
 # CONFIG_DM_STATS is not set
+# CONFIG_SPL_DM_STATS is not set
 CONFIG_DM_DEVICE_REMOVE=y
 CONFIG_DM_EVENT=y
 # CONFIG_SPL_DM_DEVICE_REMOVE is not set
@@ -1089,8 +1118,8 @@ CONFIG_SPL_SIMPLE_BUS=y
 CONFIG_OF_TRANSLATE=y
 # CONFIG_SPL_OF_TRANSLATE is not set
 # CONFIG_TRANSLATION_OFFSET is not set
-CONFIG_DM_DEV_READ_INLINE=y
-# CONFIG_OFNODE_MULTI_TREE is not set
+CONFIG_OFNODE_MULTI_TREE=y
+CONFIG_OFNODE_MULTI_TREE_MAX=4
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_ADC=y
 # CONFIG_ADC_EXYNOS is not set
@@ -1119,6 +1148,7 @@ CONFIG_BLOCK_CACHE=y
 # CONFIG_IDE is not set
 # CONFIG_LBA48 is not set
 # CONFIG_SYS_64BIT_LBA is not set
+# CONFIG_RKMTD is not set
 # CONFIG_BOOTCOUNT_LIMIT is not set
 
 #
@@ -1131,9 +1161,10 @@ CONFIG_BLOCK_CACHE=y
 #
 # CONFIG_CACHE is not set
 # CONFIG_L2X0_CACHE is not set
-# CONFIG_V5L2_CACHE is not set
+# CONFIG_ANDES_L2_CACHE is not set
 # CONFIG_NCORE_CACHE is not set
 # CONFIG_SIFIVE_CCACHE is not set
+# CONFIG_SIFIVE_PL2 is not set
 
 #
 # Clock
@@ -1142,6 +1173,8 @@ CONFIG_CLK=y
 CONFIG_SPL_CLK=y
 # CONFIG_SPL_CLK_CCF is not set
 # CONFIG_CLK_CCF is not set
+# CONFIG_CLK_GPIO is not set
+# CONFIG_SPL_CLK_GPIO is not set
 # CONFIG_CLK_CDCE9XX is not set
 # CONFIG_CLK_ICS8N3QV01 is not set
 # CONFIG_CLK_K210 is not set
@@ -1266,7 +1299,6 @@ CONFIG_ROCKCHIP_GPIO=y
 # CONFIG_NOMADIK_GPIO is not set
 # 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
 
@@ -1351,6 +1383,7 @@ CONFIG_SPL_MISC=y
 # CONFIG_GATEWORKS_SC is not set
 CONFIG_ROCKCHIP_EFUSE=y
 # CONFIG_ROCKCHIP_OTP is not set
+CONFIG_ROCKCHIP_IODOMAIN=y
 # CONFIG_SIFIVE_OTP is not set
 # CONFIG_SMSC_LPC47M is not set
 # CONFIG_SMSC_SIO1007 is not set
@@ -1370,6 +1403,7 @@ CONFIG_PWRSEQ=y
 # CONFIG_SPL_PWRSEQ is not set
 # CONFIG_PCA9551_LED is not set
 # CONFIG_TEST_DRV is not set
+# CONFIG_TURRIS_OMNIA_MCU is not set
 # CONFIG_USB_HUB_USB251XB is not set
 # CONFIG_TWL4030_LED is not set
 # CONFIG_WINBOND_W83627 is not set
@@ -1385,6 +1419,7 @@ CONFIG_PWRSEQ=y
 # CONFIG_MICROCHIP_FLEXCOM is not set
 # CONFIG_ESM_PMIC is not set
 # CONFIG_SL28CPLD is not set
+# CONFIG_SPL_SOCFPGA_DT_REG is not set
 
 #
 # MMC Host controller Support
@@ -1420,8 +1455,11 @@ CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 # CONFIG_MMC_SDHCI_ADMA is not set
+# CONFIG_MMC_SDHCI_ADMA_FORCE_32BIT is not set
+CONFIG_MMC_SDHCI_ADMA_64BIT=y
 # CONFIG_MMC_SDHCI_BCMSTB is not set
 # CONFIG_MMC_SDHCI_CADENCE is not set
+# CONFIG_MMC_SDHCI_CV1800B is not set
 # CONFIG_MMC_SDHCI_IPROC is not set
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 # CONFIG_MMC_SDHCI_KONA is not set
@@ -1442,9 +1480,11 @@ CONFIG_MMC_SDHCI_ROCKCHIP=y
 #
 # MTD Support
 #
-# CONFIG_MTD is not set
+CONFIG_MTD=y
 # CONFIG_DM_MTD is not set
 # CONFIG_MTD_NOR_FLASH is not set
+# CONFIG_MTD_CONCAT is not set
+# CONFIG_SYS_MTDPARTS_RUNTIME is not set
 # CONFIG_FLASH_CFI_DRIVER is not set
 # CONFIG_HBMC_AM654 is not set
 # CONFIG_SAMSUNG_ONENAND is not set
@@ -1464,20 +1504,24 @@ CONFIG_SPI_FLASH_SMART_HWCAPS=y
 # CONFIG_SPI_NOR_BOOT_SOFT_RESET_EXT_INVERT is not set
 # CONFIG_SPI_FLASH_SOFT_RESET is not set
 # CONFIG_SPI_FLASH_BAR is not set
+CONFIG_SPI_FLASH_LOCK=y
 CONFIG_SPI_FLASH_UNLOCK_ALL=y
 # CONFIG_SPI_FLASH_ATMEL is not set
 # CONFIG_SPI_FLASH_EON is not set
 CONFIG_SPI_FLASH_GIGADEVICE=y
 # CONFIG_SPI_FLASH_ISSI is not set
 # CONFIG_SPI_FLASH_MACRONIX is not set
+# CONFIG_SPI_FLASH_SILICONKAISER is not set
 # CONFIG_SPI_FLASH_SPANSION is not set
 # CONFIG_SPI_FLASH_STMICRO is not set
 # CONFIG_SPI_FLASH_SST is not set
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_SPI_FLASH_XMC is not set
 # CONFIG_SPI_FLASH_XTX is not set
+# CONFIG_SPI_FLASH_ZBIT is not set
 CONFIG_SPI_FLASH_USE_4K_SECTORS=y
 # CONFIG_SPI_FLASH_DATAFLASH is not set
+# CONFIG_SPI_FLASH_MTD is not set
 
 #
 # UBI support
@@ -1538,7 +1582,7 @@ CONFIG_DM_ETH=y
 # CONFIG_DM_MDIO is not set
 # CONFIG_DM_ETH_PHY is not set
 CONFIG_NETDEVICES=y
-# CONFIG_PHY_GIGE is not set
+CONFIG_PHY_GIGE=y
 # CONFIG_ALTERA_TSE is not set
 # CONFIG_BCM_SF2_ETH is not set
 # CONFIG_BCMGENET is not set
@@ -1557,7 +1601,6 @@ CONFIG_ETH_DESIGNWARE=y
 # CONFIG_FTMAC100 is not set
 # CONFIG_FTGMAC100 is not set
 # 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
@@ -1586,6 +1629,7 @@ CONFIG_GMAC_ROCKCHIP=y
 # CONFIG_SYS_DPAA_QBMAN is not set
 # CONFIG_TSEC_ENET is not set
 # CONFIG_MEDIATEK_ETH is not set
+# CONFIG_HIFEMAC_ETH is not set
 # CONFIG_HIGMACV300_ETH is not set
 # CONFIG_NVME is not set
 # CONFIG_NVME_APPLE is not set
@@ -1611,6 +1655,7 @@ CONFIG_PHY=y
 # Rockchip PHY driver
 #
 # CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set
+# CONFIG_PHY_ROCKCHIP_INNO_HDMI is not set
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y
 # CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY is not set
 # CONFIG_PHY_ROCKCHIP_PCIE is not set
@@ -1649,6 +1694,8 @@ CONFIG_SPL_PINCONF_RECURSIVE=y
 # CONFIG_PINCTRL_K210 is not set
 CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_SPL_PINCTRL_ROCKCHIP=y
+# CONFIG_PINCTRL_TEGRA is not set
+# CONFIG_SPL_PINCTRL_TEGRA is not set
 CONFIG_POWER=y
 # CONFIG_POWER_LEGACY is not set
 # CONFIG_ACPI_PMC is not set
@@ -1678,6 +1725,7 @@ CONFIG_SPL_PMIC_CHILDREN=y
 # CONFIG_SPL_DM_PMIC_PCA9450 is not set
 # CONFIG_DM_PMIC_PFUZE100 is not set
 # CONFIG_SPL_DM_PMIC_PFUZE100 is not set
+# CONFIG_DM_PMIC_MAX77663 is not set
 # CONFIG_DM_PMIC_MAX77686 is not set
 # CONFIG_DM_PMIC_MAX8998 is not set
 # CONFIG_DM_PMIC_MC34708 is not set
@@ -1695,12 +1743,14 @@ CONFIG_PMIC_RK8XX=y
 # CONFIG_PMIC_LP873X is not set
 # CONFIG_PMIC_LP87565 is not set
 # CONFIG_DM_PMIC_TPS65910 is not set
+# CONFIG_DM_PMIC_TPS80031 is not set
 # CONFIG_PMIC_STPMIC1 is not set
 # CONFIG_SPL_PMIC_PALMAS is not set
 # CONFIG_SPL_PMIC_LP873X is not set
 # CONFIG_SPL_PMIC_LP87565 is not set
 # CONFIG_PMIC_TPS65941 is not set
 # CONFIG_PMIC_TPS65219 is not set
+# CONFIG_PMIC_RAA215300 is not set
 # CONFIG_PMIC_TPS65217 is not set
 # CONFIG_POWER_TPS65218 is not set
 # CONFIG_POWER_TPS62362 is not set
@@ -1758,6 +1808,7 @@ CONFIG_RAM_ROCKCHIP_DEBUG=y
 #
 # Remote Processor drivers
 #
+CONFIG_REMOTEPROC_MAX_FW_SIZE=0x10000
 
 #
 # Reset Controller Support
@@ -1770,11 +1821,13 @@ CONFIG_RESET_ROCKCHIP=y
 # CONFIG_RESET_SCMI is not set
 # CONFIG_RESET_DRA7 is not set
 CONFIG_DM_RNG=y
+# CONFIG_SPL_DM_RNG is not set
 # CONFIG_RNG_MSM is not set
 # CONFIG_RNG_NPCM is not set
 CONFIG_RNG_ROCKCHIP=y
 # CONFIG_RNG_IPROC200 is not set
 # CONFIG_RNG_SMCCC_TRNG is not set
+# CONFIG_RNG_ARM_RNDR is not set
 
 #
 # Real Time Clock
@@ -1794,9 +1847,9 @@ CONFIG_RNG_ROCKCHIP=y
 # CONFIG_RTC_MC146818 is not set
 # CONFIG_RTC_M41T62 is not set
 # CONFIG_SCSI is not set
-# CONFIG_DM_SCSI is not set
 CONFIG_SERIAL=y
 CONFIG_BAUDRATE=115200
+# CONFIG_DEFAULT_ENV_IS_RW is not set
 CONFIG_REQUIRE_SERIAL_CONSOLE=y
 # CONFIG_SPECIFY_CONSOLE_INDEX is not set
 CONFIG_SERIAL_PRESENT=y
@@ -1838,11 +1891,14 @@ CONFIG_SYS_NS16550_MEM32=y
 # CONFIG_MSM_GENI_SERIAL is not set
 # CONFIG_MXS_AUART_SERIAL is not set
 # CONFIG_OMAP_SERIAL is not set
+# CONFIG_HTIF_CONSOLE is not set
 # CONFIG_SIFIVE_SERIAL is not set
 # CONFIG_ZYNQ_SERIAL is not set
 # CONFIG_MTK_SERIAL is not set
 # CONFIG_MT7620_SERIAL is not set
 # CONFIG_NPCM_SERIAL is not set
+# CONFIG_SM is not set
+# CONFIG_MESON_SM is not set
 # CONFIG_SMEM is not set
 
 #
@@ -1854,6 +1910,7 @@ CONFIG_SYS_NS16550_MEM32=y
 # SOC (System On Chip) specific Drivers
 #
 # CONFIG_SOC_DEVICE is not set
+# CONFIG_SOC_SAMSUNG is not set
 # CONFIG_SOC_TI is not set
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
@@ -1867,6 +1924,7 @@ CONFIG_SPI_MEM=y
 # CONFIG_CORTINA_SFLASH is not set
 # CONFIG_CADENCE_QSPI is not set
 # CONFIG_CF_SPI is not set
+# CONFIG_CV1800B_SPIF is not set
 # CONFIG_DESIGNWARE_SPI is not set
 # CONFIG_EXYNOS_SPI is not set
 # CONFIG_FSL_DSPI is not set
@@ -1919,7 +1977,8 @@ CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_SPL_SYSRESET=y
 CONFIG_SYSRESET_CMD_RESET=y
-# CONFIG_SYSRESET_CMD_POWEROFF is not set
+CONFIG_SYSRESET_CMD_POWEROFF=y
+# CONFIG_SYSRESET_CV1800B is not set
 # CONFIG_POWEROFF_GPIO is not set
 # CONFIG_SYSRESET_GPIO is not set
 # CONFIG_SYSRESET_PSCI is not set
@@ -1950,9 +2009,8 @@ CONFIG_SPL_DM_USB=y
 CONFIG_USB_HOST=y
 # CONFIG_SPL_USB_HOST is not set
 CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_DWC3=y
-CONFIG_USB_XHCI_DWC3_OF_SIMPLE=y
-# CONFIG_USB_XHCI_PCI is not set
+# CONFIG_USB_XHCI_DWC3 is not set
+# CONFIG_USB_XHCI_DWC3_OF_SIMPLE is not set
 # CONFIG_USB_XHCI_FSL is not set
 # CONFIG_USB_XHCI_BRCM is not set
 CONFIG_USB_EHCI_HCD=y
@@ -1977,7 +2035,7 @@ CONFIG_USB_DWC3=y
 # Platform Glue Driver Support
 #
 # CONFIG_USB_DWC3_OMAP is not set
-# CONFIG_USB_DWC3_GENERIC is not set
+CONFIG_USB_DWC3_GENERIC=y
 # CONFIG_SPL_USB_DWC3_GENERIC is not set
 # CONFIG_USB_DWC3_LAYERSCAPE is not set
 
@@ -2046,7 +2104,7 @@ CONFIG_VIDEO_FONT_8X16=y
 # CONFIG_VIDEO_FONT_16X32 is not set
 CONFIG_VIDEO_LOGO=y
 CONFIG_BACKLIGHT=y
-CONFIG_VIDEO_PCI_DEFAULT_FB_SIZE=0
+CONFIG_VIDEO_PCI_DEFAULT_FB_SIZE=0x0
 # CONFIG_VIDEO_COPY is not set
 CONFIG_VIDEO_DAMAGE=y
 CONFIG_BACKLIGHT_PWM=y
@@ -2077,9 +2135,11 @@ CONFIG_SIMPLE_PANEL=y
 # CONFIG_VIDEO_LCD_ENDEAVORU is not set
 # CONFIG_VIDEO_LCD_HIMAX_HX8394 is not set
 # CONFIG_VIDEO_LCD_ORISETECH_OTM8009A is not set
+# CONFIG_VIDEO_LCD_LG_LD070WX3 is not set
 # CONFIG_VIDEO_LCD_RAYDIUM_RM68200 is not set
 # 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_SSD2828 is not set
 # CONFIG_VIDEO_LCD_TDO_TL070WSH30 is not set
 # CONFIG_VIDEO_LCD_HITACHI_TX18D42VM is not set
@@ -2106,7 +2166,9 @@ CONFIG_DISPLAY_ROCKCHIP_EDP=y
 # CONFIG_VIDEO_TIDSS is not set
 # CONFIG_VIDEO_TEGRA124 is not set
 # CONFIG_VIDEO_BRIDGE is not set
+# CONFIG_VIDEO_BRIDGE_PARADE_DP501 is not set
 # CONFIG_VIDEO_BRIDGE_SOLOMON_SSD2825 is not set
+# CONFIG_VIDEO_BRIDGE_TOSHIBA_TC358768 is not set
 # CONFIG_VIDEO_TEGRA20 is not set
 # CONFIG_VIDEO_DSI_TEGRA30 is not set
 # CONFIG_TEGRA_BACKLIGHT_PWM is not set
@@ -2119,6 +2181,7 @@ CONFIG_CONSOLE_SCROLL_LINES=1
 # CONFIG_OSD is not set
 # CONFIG_VIDEO_REMOVE is not set
 # CONFIG_SPLASH_SCREEN is not set
+# CONFIG_BMP is not set
 CONFIG_VIDEO_LOGO_MAX_SIZE=0x100000
 CONFIG_VIDEO_BMP_RLE8=y
 # CONFIG_BMP_16BPP is not set
@@ -2183,6 +2246,7 @@ CONFIG_FS_FAT_MAX_CLUSTSIZE=65536
 CONFIG_CHARSET=y
 # CONFIG_DYNAMIC_CRC_TABLE is not set
 CONFIG_LIB_UUID=y
+CONFIG_RANDOM_UUID=y
 CONFIG_SPL_LIB_UUID=y
 # CONFIG_SEMIHOSTING is not set
 # CONFIG_SPL_SEMIHOSTING is not set
@@ -2200,6 +2264,7 @@ CONFIG_LIB_RAND=y
 # CONFIG_LIB_HW_RAND is not set
 CONFIG_SUPPORT_ACPI=y
 # CONFIG_ACPI is not set
+# CONFIG_SPL_ACPI is not set
 # CONFIG_SPL_TINY_MEMSET is not set
 # CONFIG_BITREVERSE is not set
 # CONFIG_TRACE is not set
@@ -2238,6 +2303,7 @@ CONFIG_MD5=y
 # CONFIG_SPL_MD5 is not set
 CONFIG_CRC8=y
 # CONFIG_SPL_CRC8 is not set
+# CONFIG_SPL_CRC16 is not set
 CONFIG_CRC32=y
 
 #
@@ -2262,7 +2328,7 @@ CONFIG_ERRNO_STR=y
 # CONFIG_HEXDUMP is not set
 CONFIG_GETOPT=y
 CONFIG_OF_LIBFDT=y
-CONFIG_OF_LIBFDT_ASSUME_MASK=0
+CONFIG_OF_LIBFDT_ASSUME_MASK=0x0
 CONFIG_SYS_FDT_PAD=0x3000
 CONFIG_SPL_OF_LIBFDT=y
 CONFIG_SPL_OF_LIBFDT_ASSUME_MASK=0xff
@@ -2273,13 +2339,15 @@ CONFIG_SPL_OF_LIBFDT_ASSUME_MASK=0xff
 CONFIG_GENERATE_SMBIOS_TABLE=y
 # CONFIG_LIB_RATIONAL is not set
 # CONFIG_SPL_LIB_RATIONAL is not set
+CONFIG_SMBIOS=y
 # CONFIG_SMBIOS_PARSER is not set
 CONFIG_EFI_LOADER=y
-CONFIG_CMD_BOOTEFI_BOOTMGR=y
+CONFIG_EFI_BINARY_EXEC=y
+CONFIG_EFI_BOOTMGR=y
 # CONFIG_EFI_VARIABLE_FILE_STORE is not set
 CONFIG_EFI_VARIABLE_NO_STORE=y
 # CONFIG_EFI_VARIABLES_PRESEED is not set
-CONFIG_EFI_VAR_BUF_SIZE=65536
+CONFIG_EFI_VAR_BUF_SIZE=131072
 # 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
@@ -2297,6 +2365,7 @@ CONFIG_EFI_RNG_PROTOCOL=y
 CONFIG_EFI_LOAD_FILE2_INITRD=y
 CONFIG_EFI_ECPT=y
 CONFIG_EFI_EBBR_2_1_CONFORMANCE=y
+# CONFIG_EFI_HTTP_BOOT is not set
 # CONFIG_OPTEE_LIB is not set
 # CONFIG_OPTEE_IMAGE is not set
 # CONFIG_BOOTM_OPTEE is not set
@@ -2308,15 +2377,11 @@ CONFIG_LMB_MAX_REGIONS=16
 # CONFIG_PHANDLE_CHECK_SEQ is not set
 
 #
-# FWU Multi Bank Updates
-#
-# CONFIG_POST is not set
-
-#
-# Unit tests
+# Testing
 #
 # CONFIG_UNIT_TEST is not set
 # CONFIG_SPL_UNIT_TEST is not set
+# CONFIG_POST is not set
 
 #
 # Tools options
@@ -2324,6 +2389,7 @@ CONFIG_LMB_MAX_REGIONS=16
 CONFIG_MKIMAGE_DTC_PATH="dtc"
 CONFIG_TOOLS_CRC32=y
 CONFIG_TOOLS_LIBCRYPTO=y
+CONFIG_TOOLS_KWBIMAGE=y
 CONFIG_TOOLS_FIT=y
 CONFIG_TOOLS_FIT_FULL_CHECK=y
 CONFIG_TOOLS_FIT_PRINT=y