Merge pull request 'Update U-Boot to v2025.10' (#305) from alpernebbi/lbmk:uboot-v2025.04 into master

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

1 files changed, 282 insertions, 115 deletions

diff --git a/config/u-boot/gru_kevin/config/default b/config/u-boot/gru_kevin/config/default
index 2a15b9bf..310fcb6f 100644
--- a/config/u-boot/gru_kevin/config/default
+++ b/config/u-boot/gru_kevin/config/default
@@ -1,15 +1,17 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# U-Boot 2024.10 Configuration
+# U-Boot 2025.04 Configuration
 #
 
 #
-# Compiler: gcc (Debian 12.2.0-14) 12.2.0
+# Compiler: gcc (Debian 14.2.0-19) 14.2.0
 #
 CONFIG_CREATE_ARCH_SYMLINK=y
+CONFIG_HAVE_SETJMP=y
 CONFIG_SUPPORT_LITTLE_ENDIAN=y
 CONFIG_SYS_CACHE_SHIFT_6=y
 CONFIG_64BIT=y
+CONFIG_SPL_64BIT=y
 CONFIG_SYS_CACHELINE_SIZE=64
 CONFIG_LINKER_LIST_ALIGN=8
 # CONFIG_ARC is not set
@@ -39,10 +41,11 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 # CONFIG_TPL_SKIP_LOWLEVEL_INIT is not set
 # CONFIG_SKIP_LOWLEVEL_INIT_ONLY is not set
 # CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY is not set
+# CONFIG_TPL_SKIP_LOWLEVEL_INIT_ONLY is not set
 # 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=y
+# CONFIG_SPL_SYS_DCACHE_OFF is not set
 
 #
 # ARM architecture
@@ -51,9 +54,9 @@ CONFIG_ARM64=y
 CONFIG_ARM64_CRC32=y
 CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_POSITION_INDEPENDENT=y
-CONFIG_INIT_SP_RELATIVE=y
-CONFIG_SYS_INIT_SP_BSS_OFFSET=524288
+# CONFIG_INIT_SP_RELATIVE is not set
 CONFIG_LNX_KRNL_IMG_TEXT_OFFSET_BASE=0x18000000
+# CONFIG_DRIVER_GICV2 is not set
 # CONFIG_GIC_V3_ITS is not set
 # CONFIG_GICV3_SUPPORT_GIC600 is not set
 CONFIG_STATIC_RELA=y
@@ -75,8 +78,10 @@ CONFIG_ARM_SMCCC=y
 CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y
 # CONFIG_USE_ARCH_MEMCPY is not set
 # CONFIG_SPL_USE_ARCH_MEMCPY is not set
+# CONFIG_TPL_USE_ARCH_MEMCPY is not set
 # CONFIG_USE_ARCH_MEMSET is not set
 # CONFIG_SPL_USE_ARCH_MEMSET is not set
+# CONFIG_TPL_USE_ARCH_MEMSET is not set
 CONFIG_ARM64_SUPPORT_AARCH32=y
 # CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_DAVINCI is not set
@@ -100,6 +105,7 @@ CONFIG_ARM64_SUPPORT_AARCH32=y
 # CONFIG_ARCH_OMAP2PLUS is not set
 # CONFIG_ARCH_MESON is not set
 # CONFIG_ARCH_MEDIATEK is not set
+# CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_IMX8 is not set
 # CONFIG_ARCH_IMX8M is not set
@@ -183,23 +189,25 @@ CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_TARGET_PRESIDIO_ASIC is not set
 # CONFIG_TARGET_XENGUEST_ARM64 is not set
 # CONFIG_ARCH_GXP is not set
-# CONFIG_STATIC_MACH_TYPE is not set
 CONFIG_TEXT_BASE=0x18000000
 CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x4000
+CONFIG_SYS_MALLOC_F_LEN=0x10000
+CONFIG_BLOBLIST_SIZE_RELOC=0x1000
 CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_SPL_LDSCRIPT="arch/arm/cpu/armv8/u-boot-spl.lds"
 CONFIG_ENV_SOURCE_FILE=""
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x3f00000
 CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_ENV_SIZE=0x1f000
 CONFIG_DM_GPIO=y
 CONFIG_SPL_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3399-gru-kevin"
-CONFIG_SPL_TEXT_BASE=0xff8c2000
+CONFIG_DDR_SI_TEST=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x8000
 CONFIG_DM_RESET=y
@@ -221,16 +229,20 @@ CONFIG_ROCKCHIP_RK3399=y
 # CONFIG_ROCKCHIP_RV1126 is not set
 # CONFIG_ROCKCHIP_USB_UART is not set
 # CONFIG_SPL_ROCKCHIP_BACK_TO_BROM is not set
+CONFIG_TPL_ROCKCHIP_BACK_TO_BROM=y
 CONFIG_ROCKCHIP_COMMON_BOARD=y
 CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y
+CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
 # CONFIG_ROCKCHIP_EXTERNAL_TPL is not set
 CONFIG_ROCKCHIP_BOOT_MODE_REG=0
 # CONFIG_ROCKCHIP_RK8XX_DISABLE_BOOT_ON_POWERON is not set
 CONFIG_ROCKCHIP_STIMER=y
 CONFIG_ROCKCHIP_STIMER_BASE=0xff8680a0
-CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
+CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
+CONFIG_ROCKCHIP_BROM_HELPER=y
 # CONFIG_SPL_ROCKCHIP_EARLYRETURN_TO_BROM is not set
 CONFIG_ROCKCHIP_DISABLE_FORCE_JTAG=y
+# CONFIG_TPL_ROCKCHIP_EARLYRETURN_TO_BROM is not set
 # CONFIG_SPL_MMC is not set
 CONFIG_ROCKCHIP_SPI_IMAGE=y
 CONFIG_ROCKCHIP_COMMON_STACK_ADDR=y
@@ -238,8 +250,12 @@ 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_TPL_SYS_MALLOC_F_LEN=0x4000
+CONFIG_TPL_LIBCOMMON_SUPPORT=y
+CONFIG_TPL_LIBGENERIC_SUPPORT=y
+CONFIG_TPL_SERIAL=y
 # CONFIG_SPL_DRIVERS_MISC is not set
-CONFIG_SPL_STACK_R_ADDR=0x04000000
+CONFIG_SPL_STACK_R_ADDR=0x3e00000
 # CONFIG_TARGET_CHROMEBOOK_BOB is not set
 CONFIG_TARGET_CHROMEBOOK_KEVIN=y
 # CONFIG_TARGET_EVB_RK3399 is not set
@@ -250,14 +266,20 @@ CONFIG_TARGET_CHROMEBOOK_KEVIN=y
 # 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_TPL_SYS_MALLOC_F=y
+CONFIG_SPL_SYS_MALLOC_F_LEN=0x8000
+CONFIG_SPL_TEXT_BASE=0x0
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
-CONFIG_SPL_BSS_START_ADDR=0xff8e0000
-CONFIG_SPL_BSS_MAX_SIZE=0x10000
+CONFIG_SPL_BSS_START_ADDR=0x3f80000
+CONFIG_SPL_BSS_MAX_SIZE=0x8000
 CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200000
+CONFIG_SYS_BOOTM_LEN=0x4000000
+CONFIG_SYS_LOAD_ADDR=0x800800
 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
+CONFIG_SPL_OF_LIBFDT_ASSUME_MASK=0xff
+CONFIG_SF_DEFAULT_BUS=1
+CONFIG_SF_DEFAULT_CS=0
 CONFIG_SPL_SYS_MALLOC_F=y
 CONFIG_ERR_PTR_OFFSET=0x0
 CONFIG_SPL_SIZE_LIMIT=0x0
@@ -293,24 +315,18 @@ CONFIG_PSCI_RESET=y
 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
-# 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
-CONFIG_SYS_LOAD_ADDR=0x800800
 
 #
 # ARM debug
 #
-CONFIG_SPL_PAYLOAD="u-boot.bin"
+CONFIG_TPL_MAX_SIZE=0x2e000
+CONFIG_SPL_PAYLOAD="tpl/u-boot-with-tpl.bin"
 CONFIG_BUILD_TARGET=""
 # CONFIG_PCI is not set
 CONFIG_FWU_NUM_BANKS=2
 CONFIG_FWU_NUM_IMAGES_PER_BANK=2
+CONFIG_TPL_SIZE_LIMIT=0x0
 CONFIG_DEBUG_UART=y
 # CONFIG_AHCI is not set
 # CONFIG_OF_BOARD_FIXUP is not set
@@ -327,7 +343,7 @@ CONFIG_SYS_LITTLE_ENDIAN=y
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120200
+CONFIG_GCC_VERSION=140200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
@@ -336,6 +352,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_SPL_OPTIMIZE_INLINING is not set
 CONFIG_ARCH_SUPPORTS_LTO=y
 # CONFIG_LTO is not set
+# CONFIG_TPL_OPTIMIZE_INLINING is not set
 CONFIG_CC_HAS_ASM_INLINE=y
 # CONFIG_XEN is not set
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
@@ -357,8 +374,6 @@ CONFIG_REMAKE_ELF=y
 # CONFIG_SYS_CUSTOM_LDSCRIPT is not set
 CONFIG_PLATFORM_ELFENTRY="_start"
 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
@@ -371,6 +386,63 @@ CONFIG_SYS_UBOOT_START=0x18000000
 #
 
 #
+# UEFI Support
+#
+CONFIG_EFI_LOADER=y
+CONFIG_EFI_BINARY_EXEC=y
+# CONFIG_EFI_SECURE_BOOT is not set
+
+#
+# UEFI services
+#
+CONFIG_EFI_HAVE_RUNTIME_RESET=y
+
+#
+# UEFI Variables
+#
+# 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=131072
+CONFIG_EFI_PLATFORM_LANG_CODES="en-US"
+
+#
+# Capsule support
+#
+# CONFIG_EFI_RUNTIME_UPDATE_CAPSULE is not set
+# CONFIG_EFI_CAPSULE_ON_DISK is not set
+CONFIG_EFI_CAPSULE_MAX=15
+
+#
+# UEFI protocol support
+#
+CONFIG_EFI_DEVICE_PATH_TO_TEXT=y
+CONFIG_EFI_DEVICE_PATH_UTIL=y
+CONFIG_EFI_DT_FIXUP=y
+CONFIG_EFI_LOADER_HII=y
+CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y
+CONFIG_EFI_UNICODE_CAPITALIZATION=y
+CONFIG_EFI_RNG_PROTOCOL=y
+CONFIG_EFI_LOAD_FILE2_INITRD=y
+# CONFIG_EFI_IP4_CONFIG2_PROTOCOL is not set
+
+#
+# Misc options
+#
+# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set
+CONFIG_EFI_ECPT=y
+CONFIG_EFI_EBBR_2_1_CONFORMANCE=y
+# CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN is not set
+
+#
+# EFI bootmanager
+#
+CONFIG_EFI_BOOTMGR=y
+# CONFIG_EFI_HTTP_BOOT is not set
+CONFIG_BOOTEFI_HELLO_COMPILE=y
+CONFIG_BOOTEFI_TESTAPP_COMPILE=y
+
+#
 # Boot images
 #
 # CONFIG_ANDROID_BOOT_IMAGE is not set
@@ -378,22 +450,26 @@ CONFIG_SYS_UBOOT_START=0x18000000
 CONFIG_FIT=y
 CONFIG_FIT_EXTERNAL_OFFSET=0x0
 CONFIG_FIT_FULL_CHECK=y
-# CONFIG_FIT_SIGNATURE is not set
+CONFIG_FIT_SIGNATURE=y
+CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000
+# CONFIG_FIT_RSASSA_PSS is not set
 # CONFIG_FIT_CIPHER is not set
 # CONFIG_FIT_VERBOSE is not set
 # CONFIG_FIT_BEST_MATCH is not set
 CONFIG_FIT_PRINT=y
 CONFIG_SPL_FIT=y
+# CONFIG_TPL_FIT is not set
 # CONFIG_SPL_FIT_PRINT is not set
-# CONFIG_SPL_FIT_FULL_CHECK is not set
-# CONFIG_SPL_FIT_SIGNATURE is not set
+CONFIG_SPL_FIT_FULL_CHECK=y
+CONFIG_SPL_FIT_SIGNATURE=y
+CONFIG_SPL_FIT_SIGNATURE_MAX_SIZE=0x10000000
+# CONFIG_SPL_FIT_RSASSA_PSS is not set
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x0
 # CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY is not set
 # CONFIG_SPL_LOAD_FIT_FULL is not set
+# CONFIG_TPL_LOAD_FIT is not set
 # CONFIG_SPL_FIT_IMAGE_POST_PROCESS is not set
-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
@@ -403,6 +479,7 @@ CONFIG_BOOTSTD=y
 CONFIG_BOOTSTD_FULL=y
 CONFIG_BOOTSTD_DEFAULTS=y
 CONFIG_BOOTSTD_BOOTCOMMAND=y
+CONFIG_BOOTSTD_MENU=y
 CONFIG_BOOTMETH_GLOBAL=y
 # CONFIG_BOOTMETH_ANDROID is not set
 # CONFIG_BOOTMETH_CROS is not set
@@ -413,15 +490,17 @@ CONFIG_BOOTMETH_EFI_BOOTMGR=y
 CONFIG_BOOTMETH_VBE=y
 CONFIG_BOOTMETH_DISTRO=y
 # CONFIG_SPL_BOOTMETH_VBE is not set
+CONFIG_TPL_BOOTMETH_VBE=y
 CONFIG_BOOTMETH_VBE_REQUEST=y
 # CONFIG_SPL_BOOTMETH_VBE_REQUEST is not set
 CONFIG_BOOTMETH_VBE_SIMPLE=y
+# CONFIG_BOOTMETH_VBE_ABREC is not set
 CONFIG_BOOTMETH_VBE_SIMPLE_OS=y
 # CONFIG_SPL_BOOTMETH_VBE_SIMPLE is not set
 CONFIG_EXPO=y
 CONFIG_BOOTMETH_SCRIPT=y
+# CONFIG_UPL is not set
 CONFIG_LEGACY_IMAGE_FORMAT=y
-CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_SUPPORT_RAW_INITRD=y
 # CONFIG_CHROMEOS is not set
 # CONFIG_CHROMEOS_VBOOT is not set
@@ -498,6 +577,7 @@ CONFIG_SYS_PBSIZE=1044
 # CONFIG_DISABLE_CONSOLE is not set
 CONFIG_LOGLEVEL=4
 CONFIG_SPL_LOGLEVEL=4
+CONFIG_TPL_LOGLEVEL=4
 # CONFIG_SILENT_CONSOLE is not set
 # CONFIG_SPL_SILENT_CONSOLE is not set
 # CONFIG_TPL_SILENT_CONSOLE is not set
@@ -526,6 +606,7 @@ CONFIG_LOG_CONSOLE=y
 CONFIG_LOGF_FUNC_PAD=20
 # CONFIG_LOG_SYSLOG is not set
 # CONFIG_SPL_LOG is not set
+# CONFIG_TPL_LOG is not set
 # CONFIG_LOG_ERROR_RETURN is not set
 
 #
@@ -562,6 +643,7 @@ CONFIG_MISC_INIT_R=y
 # Security support
 #
 CONFIG_HASH=y
+# CONFIG_HASH_CRC8 is not set
 CONFIG_SPL_HASH=y
 # CONFIG_STACKPROTECTOR is not set
 # CONFIG_BOARD_RNG_SEED is not set
@@ -577,11 +659,11 @@ CONFIG_SPL_HASH=y
 #
 CONFIG_BLOBLIST=y
 CONFIG_SPL_BLOBLIST=y
+# CONFIG_TPL_BLOBLIST is not set
 CONFIG_BLOBLIST_FIXED=y
 # CONFIG_BLOBLIST_ALLOC is not set
 CONFIG_BLOBLIST_ADDR=0x100000
 CONFIG_BLOBLIST_SIZE=0x1000
-CONFIG_BLOBLIST_SIZE_RELOC=0x1000
 CONFIG_SPL_BLOBLIST_FIXED=y
 # CONFIG_SPL_BLOBLIST_ALLOC is not set
 CONFIG_SUPPORT_SPL=y
@@ -592,7 +674,7 @@ CONFIG_SUPPORT_TPL=y
 #
 CONFIG_SPL_FRAMEWORK=y
 # CONFIG_SPL_FRAMEWORK_BOARD_INIT_F is not set
-CONFIG_SPL_MAX_SIZE=0x1e000
+CONFIG_SPL_MAX_SIZE=0x40000
 CONFIG_SPL_PAD_TO=0x7f8000
 # CONFIG_SPL_NO_BSS_LIMIT is not set
 CONFIG_SPL_BSS_LIMIT=y
@@ -606,24 +688,27 @@ CONFIG_HANDOFF=y
 CONFIG_SPL_HANDOFF=y
 # CONFIG_SPL_SOC_INIT is not set
 CONFIG_SPL_BOARD_INIT=y
+CONFIG_SPL_LOAD_BLOCK=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_SHARES_INIT_SP_ADDR=y
 CONFIG_SPL_SEPARATE_BSS=y
 # CONFIG_SPL_SYS_MALLOC is not set
 CONFIG_SPL_BANNER_PRINT=y
 # CONFIG_SPL_DISPLAY_PRINT is not set
+CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
+# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is not set
+# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE is not set
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x4000
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_DATA_PART_OFFSET=0x0
-# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is not set
 # CONFIG_SPL_FIT_IMAGE_TINY is not set
 # CONFIG_SPL_CACHE is not set
 # CONFIG_SPL_CPU is not set
-# CONFIG_SPL_CRYPTO is not set
+CONFIG_SPL_CRYPTO=y
 # CONFIG_SPL_DMA is not set
 # CONFIG_SPL_ENV_SUPPORT is not set
 # CONFIG_SPL_FS_EXT4 is not set
@@ -640,6 +725,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_DATA_PART_OFFSET=0x0
 # CONFIG_SPL_NAND_DRIVERS is not set
 # CONFIG_SPL_NAND_ECC is not set
 # CONFIG_SPL_NAND_SIMPLE is not set
+# CONFIG_SPL_RELOC_LOADER is not set
 # CONFIG_SPL_UBI is not set
 CONFIG_SPL_DM_SPI_FLASH=y
 # CONFIG_SPL_NET is not set
@@ -653,7 +739,7 @@ CONFIG_SPL_DM_SPI_FLASH=y
 # CONFIG_SPL_DM_RESET is not set
 # CONFIG_SPL_POWER is not set
 # CONFIG_SPL_POWER_DOMAIN is not set
-# CONFIG_SPL_RAM_SUPPORT is not set
+# CONFIG_SPL_RAM_DEVICE is not set
 # CONFIG_SPL_REMOTEPROC is not set
 # CONFIG_SPL_RTC is not set
 # CONFIG_SPL_SATA is not set
@@ -661,7 +747,7 @@ CONFIG_SPL_DM_SPI_FLASH=y
 CONFIG_SPL_SPI_FLASH_TINY=y
 # CONFIG_SPL_SPI_FLASH_MTD is not set
 CONFIG_SPL_SPI_LOAD=y
-CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
+CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000
 # CONFIG_SPL_THERMAL is not set
 # CONFIG_SPL_WATCHDOG is not set
 # CONFIG_SPL_YMODEM_SUPPORT is not set
@@ -670,8 +756,42 @@ CONFIG_SPL_ATF=y
 CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
 # CONFIG_SPL_OPTEE_IMAGE is not set
 CONFIG_SPL_TARGET=""
-# CONFIG_TPL is not set
+CONFIG_TPL=y
+
+#
+# TPL configuration options
+#
+CONFIG_TPL_BINMAN_SYMBOLS=y
+CONFIG_TPL_BINMAN_UBOOT_SYMBOLS=y
+CONFIG_TPL_FRAMEWORK=y
+CONFIG_TPL_BANNER_PRINT=y
+# CONFIG_TPL_BOARD_INIT is not set
+CONFIG_TPL_SYS_MALLOC_SIMPLE=y
+CONFIG_TPL_SEPARATE_BSS=y
+CONFIG_TPL_NEEDS_SEPARATE_STACK=y
+# CONFIG_TPL_POWER is not set
+CONFIG_TPL_BOOTROM_SUPPORT=y
+# CONFIG_TPL_CRC32 is not set
+# CONFIG_TPL_DRIVERS_MISC is not set
+# CONFIG_TPL_ENV_SUPPORT is not set
+CONFIG_TPL_GPIO=y
+# CONFIG_TPL_I2C is not set
+# CONFIG_TPL_MPC8XXX_INIT_DDR is not set
+# CONFIG_TPL_MMC is not set
+# CONFIG_TPL_NAND_SUPPORT is not set
+# CONFIG_TPL_PCI is not set
+# CONFIG_TPL_PCH is not set
+# CONFIG_TPL_RAM_SUPPORT is not set
+# CONFIG_TPL_RELOC_LOADER is not set
+# CONFIG_TPL_RTC is not set
+# CONFIG_TPL_SPI_FLASH_SUPPORT is not set
+# CONFIG_TPL_SPI is not set
+# CONFIG_TPL_DM_SPI is not set
+# CONFIG_TPL_DM_SPI_FLASH is not set
+# CONFIG_TPL_YMODEM_SUPPORT is not set
 # CONFIG_VPL is not set
+CONFIG_IMAGE_SIGN_INFO=y
+CONFIG_SPL_IMAGE_SIGN_INFO=y
 CONFIG_CMDLINE=y
 CONFIG_HUSH_PARSER=y
 
@@ -700,6 +820,7 @@ CONFIG_CMD_BDI=y
 # CONFIG_CMD_BDINFO_EXTRA is not set
 # CONFIG_CMD_CONFIG is not set
 CONFIG_CMD_CONSOLE=y
+# CONFIG_CMD_UFETCH is not set
 # CONFIG_CMD_HISTORY is not set
 # CONFIG_CMD_LICENSE is not set
 # CONFIG_CMD_PMC is not set
@@ -713,8 +834,9 @@ CONFIG_CMD_BOOTM=y
 CONFIG_CMD_BOOTDEV=y
 CONFIG_CMD_BOOTFLOW=y
 CONFIG_CMD_BOOTFLOW_FULL=y
-CONFIG_CMD_BOOTFLOW_BOOTDELAY=8
+CONFIG_CMD_BOOTFLOW_BOOTDELAY=30
 CONFIG_CMD_BOOTMETH=y
+CONFIG_CMD_BOOTSTD=y
 CONFIG_BOOTM_EFI=y
 CONFIG_BOOTM_ELF=y
 CONFIG_CMD_BOOTZ=y
@@ -725,17 +847,18 @@ CONFIG_BOOTM_NETBSD=y
 # CONFIG_BOOTM_OSE is not set
 CONFIG_BOOTM_PLAN9=y
 CONFIG_BOOTM_RTEMS=y
+# CONFIG_CMD_UPL is not set
 CONFIG_CMD_VBE=y
 CONFIG_BOOTM_VXWORKS=y
 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_BOOTVX=y
 # CONFIG_CMD_ELF_FDT_SETUP is not set
 CONFIG_CMD_FDT=y
 CONFIG_CMD_GO=y
@@ -826,10 +949,10 @@ 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_MMC_SPEED_MODE_SET=y
 # 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
 CONFIG_CMD_PINMUX=y
@@ -843,7 +966,6 @@ CONFIG_CMD_SPI=y
 CONFIG_DEFAULT_SPI_BUS=0
 CONFIG_DEFAULT_SPI_MODE=0x0
 CONFIG_CMD_USB=y
-# CONFIG_CMD_USB_SDP is not set
 # CONFIG_CMD_RKMTD is not set
 # CONFIG_CMD_WRITE is not set
 
@@ -856,13 +978,8 @@ CONFIG_CMD_ITEST=y
 CONFIG_CMD_SOURCE=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_XXD is not set
-
-#
-# Android support commands
-#
 CONFIG_CMD_NET=y
 CONFIG_CMD_BOOTP=y
-CONFIG_CMD_DHCP=y
 # CONFIG_BOOTP_MAY_FAIL is not set
 CONFIG_BOOTP_BOOTPATH=y
 # CONFIG_BOOTP_VENDOREX is not set
@@ -880,24 +997,25 @@ 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
 # CONFIG_CMD_TFTPSRV is not set
 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=y
-CONFIG_CMD_MDIO=y
-CONFIG_CMD_PING=y
 # CONFIG_CMD_CDP is not set
 # CONFIG_CMD_SNTP is not set
-# CONFIG_CMD_DNS is not set
 # CONFIG_CMD_LINK_LOCAL is not set
 # CONFIG_CMD_ETHSW is not set
-CONFIG_CMD_PXE=y
 # CONFIG_CMD_WOL is not set
+CONFIG_CMD_DHCP=y
+# CONFIG_CMD_DNS is not set
+CONFIG_CMD_MII=y
+CONFIG_CMD_MDIO=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_TFTPBOOT=y
+# CONFIG_CMD_WGET is not set
+CONFIG_CMD_PXE=y
 
 #
 # Misc commands
@@ -979,7 +1097,6 @@ CONFIG_CMD_CYCLIC=y
 # CONFIG_CMD_EVENT is not set
 CONFIG_CMD_LOG=y
 # CONFIG_CMD_UBI is not set
-CONFIG_MMC_SPEED_MODE_SET=y
 
 #
 # Partition Types
@@ -988,6 +1105,7 @@ CONFIG_PARTITIONS=y
 CONFIG_SPL_PARTITIONS=y
 # CONFIG_MAC_PARTITION is not set
 # CONFIG_SPL_MAC_PARTITION is not set
+# CONFIG_TEGRA_PARTITION is not set
 CONFIG_DOS_PARTITION=y
 CONFIG_SPL_DOS_PARTITION=y
 CONFIG_ISO_PARTITION=y
@@ -1013,9 +1131,11 @@ CONFIG_BINMAN=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_REAL=y
 CONFIG_SPL_OF_CONTROL=y
+CONFIG_TPL_OF_CONTROL=y
 CONFIG_OF_LIVE=y
 CONFIG_OF_UPSTREAM=y
 # CONFIG_OF_UPSTREAM_BUILD_VENDOR is not set
+# CONFIG_OF_UPSTREAM_INCLUDE_LOCAL_FALLBACK_DTBOS is not set
 CONFIG_OF_SEPARATE=y
 # CONFIG_OF_EMBED is not set
 # CONFIG_OF_INITIAL_DTB_READONLY is not set
@@ -1023,19 +1143,23 @@ CONFIG_OF_SEPARATE=y
 # CONFIG_OF_OMIT_DTB is not set
 CONFIG_DEVICE_TREE_INCLUDES=""
 CONFIG_OF_LIST="rockchip/rk3399-gru-kevin"
+CONFIG_OF_OVERLAY_LIST=""
 # CONFIG_MULTI_DTB_FIT is not set
 # CONFIG_SPL_MULTI_DTB_FIT is not set
 CONFIG_SPL_OF_LIST="rockchip/rk3399-gru-kevin"
 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_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 # CONFIG_OF_DTB_PROPS_REMOVE is not set
 # CONFIG_SPL_OF_PLATDATA is not set
 CONFIG_SPL_OF_REAL=y
+CONFIG_TPL_OF_REAL=y
+# CONFIG_TPL_OF_PLATDATA is not set
 
 #
 # Environment
 #
 CONFIG_ENV_SUPPORT=y
+CONFIG_ENV_CALLBACK_LIST_STATIC=""
 CONFIG_SAVEENV=y
 # CONFIG_ENV_OVERWRITE is not set
 # CONFIG_OVERWRITE_ETHADDR_ONCE is not set
@@ -1064,17 +1188,20 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 # CONFIG_USE_ETHPRIME is not set
 # CONFIG_USE_HOSTNAME is not set
 # CONFIG_VERSION_VARIABLE is not set
+
+#
+# Networking
+#
+# CONFIG_NO_NET is not set
 CONFIG_NET=y
+# CONFIG_NET_LWIP is not set
 CONFIG_ARP_TIMEOUT=5000
 CONFIG_NET_RETRY_COUNT=5
 # CONFIG_PROT_UDP is not set
-CONFIG_BOOTDEV_ETH=y
 # CONFIG_BOOTP_SEND_HOSTNAME is not set
-# CONFIG_NET_RANDOM_ETHADDR is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_IP_DEFRAG is not set
 # CONFIG_SYS_FAULT_ECHO_LINK_DOWN is not set
-CONFIG_TFTP_BLOCKSIZE=1468
 # CONFIG_TFTP_PORT is not set
 CONFIG_TFTP_WINDOWSIZE=1
 # CONFIG_TFTP_TSIZE is not set
@@ -1091,6 +1218,10 @@ CONFIG_BOOTP_MAX_ROOT_PATH_LEN=64
 # CONFIG_USE_SERVERIP is not set
 # CONFIG_PROT_TCP is not set
 # CONFIG_IPV6 is not set
+CONFIG_BOOTDEV_ETH=y
+# CONFIG_NET_RANDOM_ETHADDR is not set
+# CONFIG_WGET is not set
+CONFIG_TFTP_BLOCKSIZE=1468
 CONFIG_SYS_RX_ETH_BUFFER=4
 
 #
@@ -1102,6 +1233,7 @@ CONFIG_SYS_RX_ETH_BUFFER=4
 #
 CONFIG_DM=y
 CONFIG_SPL_DM=y
+CONFIG_TPL_DM=y
 # CONFIG_DM_WARN is not set
 # CONFIG_SPL_DM_WARN is not set
 # CONFIG_DM_DEBUG is not set
@@ -1113,18 +1245,24 @@ CONFIG_DM_EVENT=y
 CONFIG_DM_STDIO=y
 CONFIG_DM_SEQ_ALIAS=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+# CONFIG_TPL_DM_SEQ_ALIAS is not set
 CONFIG_SPL_DM_INLINE_OFNODE=y
+CONFIG_TPL_DM_INLINE_OFNODE=y
 # CONFIG_DM_DMA is not set
 CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
+CONFIG_TPL_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_SPL_SYSCON=y
+CONFIG_TPL_SYSCON=y
 # CONFIG_DEVRES is not set
 CONFIG_SIMPLE_BUS=y
 CONFIG_SPL_SIMPLE_BUS=y
+# CONFIG_TPL_SIMPLE_BUS is not set
 # CONFIG_SIMPLE_BUS_CORRECT_RANGE is not set
 CONFIG_OF_TRANSLATE=y
 # CONFIG_SPL_OF_TRANSLATE is not set
+# CONFIG_TPL_OF_TRANSLATE is not set
 # CONFIG_TRANSLATION_OFFSET is not set
 CONFIG_OFNODE_MULTI_TREE=y
 CONFIG_OFNODE_MULTI_TREE_MAX=4
@@ -1149,11 +1287,11 @@ CONFIG_SARADC_ROCKCHIP=y
 #
 CONFIG_BLK=y
 CONFIG_SPL_BLK=y
+# CONFIG_TPL_BLK is not set
 CONFIG_BLOCK_CACHE=y
 # CONFIG_BLKMAP is not set
 # CONFIG_SPL_BLOCK_CACHE is not set
 # CONFIG_EFI_MEDIA is not set
-# CONFIG_SPL_BLK_FS is not set
 # CONFIG_IDE is not set
 # CONFIG_LBA48 is not set
 # CONFIG_SYS_64BIT_LBA is not set
@@ -1180,10 +1318,12 @@ CONFIG_BLOCK_CACHE=y
 #
 CONFIG_CLK=y
 CONFIG_SPL_CLK=y
+CONFIG_TPL_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_STUB is not set
 # CONFIG_CLK_CDCE9XX is not set
 # CONFIG_CLK_ICS8N3QV01 is not set
 # CONFIG_CLK_K210 is not set
@@ -1193,6 +1333,7 @@ CONFIG_SPL_CLK=y
 # CONFIG_CLK_AT91 is not set
 # CONFIG_CLK_RCAR is not set
 # CONFIG_CLK_RCAR_CPG_LIB is not set
+# CONFIG_CLK_SOPHGO_CV1800B is not set
 # CONFIG_CLK_SIFIVE is not set
 # CONFIG_CLK_TI_AM3_DPLL is not set
 # CONFIG_CLK_TI_CTRL is not set
@@ -1262,6 +1403,7 @@ CONFIG_ARM_PSCI_FW=y
 # CONFIG_FWU_MDATA is not set
 CONFIG_GPIO=y
 CONFIG_SPL_DM_GPIO=y
+CONFIG_TPL_DM_GPIO=y
 # CONFIG_GPIO_HOG is not set
 # CONFIG_SPL_GPIO_HOG is not set
 # CONFIG_DM_GPIO_LOOKUP_LABEL is not set
@@ -1272,6 +1414,8 @@ CONFIG_SPL_DM_GPIO=y
 # CONFIG_AT91_GPIO is not set
 # CONFIG_ATMEL_PIO4 is not set
 # CONFIG_ASPEED_GPIO is not set
+# CONFIG_ASPEED_SGPIO is not set
+# CONFIG_ASPEED_G7_GPIO is not set
 # CONFIG_DA8XX_GPIO is not set
 # CONFIG_FXL6408_GPIO is not set
 # CONFIG_HIKEY_GPIO is not set
@@ -1289,6 +1433,7 @@ CONFIG_SPL_DM_GPIO=y
 # CONFIG_MXC_GPIO is not set
 # CONFIG_MXS_GPIO is not set
 # CONFIG_NPCM_GPIO is not set
+# CONFIG_NPCM_SGPIO is not set
 # CONFIG_CMD_PCA953X is not set
 # CONFIG_PCF8575_GPIO is not set
 CONFIG_ROCKCHIP_GPIO=y
@@ -1318,6 +1463,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_I2C=y
 CONFIG_DM_I2C=y
 CONFIG_SPL_DM_I2C=y
+# CONFIG_TPL_DM_I2C is not set
 CONFIG_I2C_CROS_EC_TUNNEL=y
 # CONFIG_I2C_CROS_EC_LDO is not set
 # CONFIG_I2C_SET_DEFAULT_BUS_NUM is not set
@@ -1348,8 +1494,10 @@ CONFIG_I2C_MUX=y
 # CONFIG_I2C_MUX_GPIO is not set
 CONFIG_INPUT=y
 # CONFIG_SPL_INPUT is not set
+# CONFIG_TPL_INPUT is not set
 CONFIG_DM_KEYBOARD=y
 # CONFIG_SPL_DM_KEYBOARD is not set
+# CONFIG_TPL_DM_KEYBOARD is not set
 # CONFIG_APPLE_SPI_KEYB is not set
 # CONFIG_BUTTON_KEYBOARD is not set
 CONFIG_CROS_EC_KEYB=y
@@ -1366,6 +1514,8 @@ CONFIG_CROS_EC_KEYB=y
 # LED Support
 #
 # CONFIG_LED is not set
+# CONFIG_LED_BOOT is not set
+# CONFIG_LED_ACTIVITY is not set
 # CONFIG_SPL_LED is not set
 # CONFIG_LED_STATUS is not set
 
@@ -1386,6 +1536,7 @@ CONFIG_CROS_EC_KEYB=y
 #
 CONFIG_MISC=y
 CONFIG_SPL_MISC=y
+CONFIG_TPL_MISC=y
 # CONFIG_NVMEM is not set
 # CONFIG_SPL_NVMEM is not set
 # CONFIG_ALTERA_SYSID is not set
@@ -1400,9 +1551,11 @@ CONFIG_ROCKCHIP_IODOMAIN=y
 # CONFIG_VEXPRESS_CONFIG is not set
 CONFIG_CROS_EC=y
 # CONFIG_SPL_CROS_EC is not set
+# CONFIG_TPL_CROS_EC is not set
 # CONFIG_CROS_EC_I2C is not set
 # CONFIG_CROS_EC_LPC is not set
 # CONFIG_SPL_CROS_EC_LPC is not set
+# CONFIG_TPL_CROS_EC_LPC is not set
 CONFIG_CROS_EC_SPI=y
 # CONFIG_DS4510 is not set
 # CONFIG_FSL_SEC_MON is not set
@@ -1440,6 +1593,7 @@ CONFIG_MMC_PWRSEQ=y
 # CONFIG_MMC_BROKEN_CD is not set
 CONFIG_DM_MMC=y
 CONFIG_SPL_DM_MMC=y
+# CONFIG_TPL_DM_MMC is not set
 # CONFIG_MMC_SPI is not set
 # CONFIG_ARM_PL180_MMCI is not set
 CONFIG_MMC_QUIRKS=y
@@ -1478,6 +1632,7 @@ CONFIG_MMC_SDHCI_ADMA_64BIT=y
 # CONFIG_MMC_SDHCI_NPCM is not set
 CONFIG_MMC_SDHCI_ROCKCHIP=y
 # CONFIG_MMC_SDHCI_S5P is not set
+# CONFIG_MMC_SDHCI_SNPS is not set
 # CONFIG_MMC_SDHCI_STI is not set
 # CONFIG_MMC_SDHCI_XENON is not set
 # CONFIG_MMC_SDHCI_TANGIER is not set
@@ -1498,7 +1653,6 @@ CONFIG_MTD=y
 # CONFIG_MTD_BLOCK 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
 # CONFIG_USE_SYS_MAX_FLASH_BANKS is not set
 # CONFIG_MTD_RAW_NAND is not set
@@ -1508,8 +1662,6 @@ CONFIG_MTD=y
 #
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
-CONFIG_SF_DEFAULT_BUS=1
-CONFIG_SF_DEFAULT_CS=0
 # CONFIG_BOOTDEV_SPI_FLASH is not set
 # CONFIG_SPI_FLASH_SFDP_SUPPORT is not set
 CONFIG_SPI_FLASH_SMART_HWCAPS=y
@@ -1523,6 +1675,7 @@ CONFIG_SPI_FLASH_UNLOCK_ALL=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 # CONFIG_SPI_FLASH_ISSI is not set
 # CONFIG_SPI_FLASH_MACRONIX is not set
+# CONFIG_SPI_FLASH_PUYA is not set
 # CONFIG_SPI_FLASH_SILICONKAISER is not set
 # CONFIG_SPI_FLASH_SPANSION is not set
 # CONFIG_SPI_FLASH_STMICRO is not set
@@ -1691,6 +1844,7 @@ CONFIG_PINMUX=y
 # CONFIG_PINCONF is not set
 CONFIG_PINCONF_RECURSIVE=y
 CONFIG_SPL_PINCTRL=y
+# CONFIG_TPL_PINCTRL is not set
 CONFIG_SPL_PINCTRL_FULL=y
 CONFIG_SPL_PINCTRL_GENERIC=y
 CONFIG_SPL_PINMUX=y
@@ -1714,6 +1868,7 @@ CONFIG_POWER=y
 # CONFIG_POWER_LEGACY is not set
 # CONFIG_ACPI_PMC is not set
 # CONFIG_SPL_ACPI_PMC is not set
+# CONFIG_TPL_ACPI_PMC is not set
 
 #
 # Power Domain Support
@@ -1774,13 +1929,15 @@ CONFIG_DM_REGULATOR=y
 CONFIG_REGULATOR_PWM=y
 # CONFIG_SPL_REGULATOR_PWM is not set
 CONFIG_DM_REGULATOR_COMMON=y
+CONFIG_SPL_DM_REGULATOR_COMMON=y
 CONFIG_DM_REGULATOR_FIXED=y
-# CONFIG_SPL_DM_REGULATOR_FIXED is not set
+CONFIG_SPL_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 # CONFIG_SPL_DM_REGULATOR_GPIO is not set
 CONFIG_REGULATOR_RK8XX=y
 # CONFIG_DM_REGULATOR_PBIAS is not set
 # CONFIG_DM_REGULATOR_TPS62360 is not set
+# CONFIG_DM_REGULATOR_TPS6287X is not set
 # CONFIG_DM_REGULATOR_ANATOP is not set
 # CONFIG_DM_REGULATOR_SCMI is not set
 # CONFIG_TPS6586X_POWER is not set
@@ -1801,6 +1958,7 @@ CONFIG_PWM_ROCKCHIP=y
 # CONFIG_U_QE is not set
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
+CONFIG_TPL_RAM=y
 # CONFIG_STM32_SDRAM is not set
 # CONFIG_MPC83XX_SDRAM is not set
 # CONFIG_K3_DDRSS is not set
@@ -1849,6 +2007,7 @@ CONFIG_RNG_ROCKCHIP=y
 #
 # CONFIG_DM_RTC is not set
 # CONFIG_SPL_DM_RTC is not set
+# CONFIG_TPL_DM_RTC is not set
 # CONFIG_RTC_ENABLE_32KHZ_OUTPUT is not set
 # CONFIG_RTC_DS1337 is not set
 # CONFIG_RTC_DS1338 is not set
@@ -1856,7 +2015,6 @@ CONFIG_RNG_ROCKCHIP=y
 # CONFIG_RTC_DS3231 is not set
 # CONFIG_RTC_PCF8563 is not set
 # CONFIG_RTC_PT7C4338 is not set
-# CONFIG_RTC_PL031 is not set
 # CONFIG_RTC_S35392A is not set
 # CONFIG_RTC_MC13XXX is not set
 # CONFIG_RTC_MC146818 is not set
@@ -1869,15 +2027,18 @@ CONFIG_REQUIRE_SERIAL_CONSOLE=y
 # CONFIG_SPECIFY_CONSOLE_INDEX is not set
 CONFIG_SERIAL_PRESENT=y
 CONFIG_SPL_SERIAL_PRESENT=y
+CONFIG_TPL_SERIAL_PRESENT=y
 CONFIG_DM_SERIAL=y
 # CONFIG_SERIAL_RX_BUFFER is not set
 # CONFIG_SERIAL_PUTS is not set
 # CONFIG_SERIAL_SEARCH_ALL is not set
 # CONFIG_SERIAL_PROBE_ALL is not set
 CONFIG_SPL_DM_SERIAL=y
+CONFIG_TPL_DM_SERIAL=y
 # CONFIG_VPL_DM_SERIAL is not set
 CONFIG_DEBUG_UART_NS16550=y
 CONFIG_SPL_DEBUG_UART_BASE=0xff1a0000
+CONFIG_TPL_DEBUG_UART_BASE=0xff1a0000
 CONFIG_DEBUG_UART_SHIFT=2
 # CONFIG_DEBUG_UART_ANNOUNCE is not set
 # CONFIG_DEBUG_UART_SKIP_INIT is not set
@@ -1935,27 +2096,18 @@ CONFIG_SPI_MEM=y
 # CONFIG_ALTERA_SPI is not set
 # CONFIG_APPLE_SPI is not set
 # CONFIG_ATCSPI200_SPI is not set
-# CONFIG_ATMEL_SPI is not set
-# CONFIG_BCMSTB_SPI is not set
 # 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
 # CONFIG_FSL_QSPI is not set
 # CONFIG_GXP_SPI is not set
-# 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
@@ -1969,17 +2121,11 @@ CONFIG_ROCKCHIP_SPI=y
 # CONFIG_SOFT_SPI is not set
 # CONFIG_SPI_SN_F_OSPI is not set
 # CONFIG_SPI_SUNXI is not set
-# CONFIG_TEGRA114_SPI is not set
-# CONFIG_TEGRA20_SFLASH is not set
-# CONFIG_TEGRA20_SLINK is not set
-# CONFIG_TEGRA210_QSPI is not set
-# CONFIG_TI_QSPI is not set
 # CONFIG_XILINX_SPI is not set
 # CONFIG_ZYNQ_SPI is not set
 # CONFIG_ZYNQ_QSPI is not set
 # CONFIG_ZYNQMP_GQSPI is not set
-# CONFIG_SH_QSPI is not set
-# CONFIG_MXC_SPI is not set
+# CONFIG_SPI_STACKED_PARALLEL is not set
 
 #
 # SPMI support
@@ -1992,6 +2138,7 @@ CONFIG_ROCKCHIP_SPI=y
 #
 CONFIG_SYSRESET=y
 CONFIG_SPL_SYSRESET=y
+CONFIG_TPL_SYSRESET=y
 CONFIG_SYSRESET_CMD_RESET=y
 CONFIG_SYSRESET_CMD_POWEROFF=y
 # CONFIG_SYSRESET_CV1800B is not set
@@ -2027,6 +2174,7 @@ CONFIG_USB_HOST=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_DWC3 is not set
 # CONFIG_USB_XHCI_DWC3_OF_SIMPLE is not set
+# CONFIG_USB_XHCI_GENERIC is not set
 # CONFIG_USB_XHCI_FSL is not set
 # CONFIG_USB_XHCI_BRCM is not set
 CONFIG_USB_EHCI_HCD=y
@@ -2055,6 +2203,7 @@ CONFIG_USB_DWC3_GENERIC=y
 # CONFIG_SPL_USB_DWC3_GENERIC is not set
 # CONFIG_USB_DWC3_AM62 is not set
 # CONFIG_USB_DWC3_LAYERSCAPE is not set
+# CONFIG_USB_DWC3_STI is not set
 
 #
 # PHY Subsystem
@@ -2079,6 +2228,7 @@ CONFIG_USB_DWC3_GENERIC=y
 #
 # CONFIG_TWL4030_USB is not set
 # CONFIG_ROCKCHIP_USB2_PHY is not set
+# CONFIG_TYPEC_TCPM is not set
 
 #
 # ULPI drivers
@@ -2159,6 +2309,7 @@ CONFIG_SIMPLE_PANEL=y
 # 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_SHARP_LQ101R1SX01 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
@@ -2248,7 +2399,6 @@ CONFIG_FS_FAT_MAX_CLUSTSIZE=65536
 # 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
 # CONFIG_FS_EROFS is not set
 
@@ -2260,6 +2410,7 @@ CONFIG_FS_FAT_MAX_CLUSTSIZE=65536
 # CONFIG_PHYSMEM is not set
 # CONFIG_BCH is not set
 # CONFIG_BINMAN_FDT is not set
+CONFIG_BINMAN_DTB=""
 # CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED is not set
 CONFIG_CHARSET=y
 # CONFIG_DYNAMIC_CRC_TABLE is not set
@@ -2270,12 +2421,16 @@ CONFIG_SPL_LIB_UUID=y
 # CONFIG_SPL_SEMIHOSTING is not set
 CONFIG_PRINTF=y
 CONFIG_SPL_PRINTF=y
+CONFIG_TPL_PRINTF=y
 CONFIG_SPRINTF=y
 CONFIG_SPL_SPRINTF=y
+CONFIG_TPL_SPRINTF=y
 CONFIG_STRTO=y
 CONFIG_SPL_STRTO=y
+CONFIG_TPL_STRTO=y
 CONFIG_SYS_HZ=1000
 CONFIG_SPL_USE_TINY_PRINTF=y
+CONFIG_TPL_USE_TINY_PRINTF=y
 CONFIG_PANIC_HANG=y
 CONFIG_REGEX=y
 CONFIG_LIB_RAND=y
@@ -2284,19 +2439,48 @@ CONFIG_SUPPORT_ACPI=y
 # CONFIG_ACPI is not set
 # CONFIG_SPL_ACPI is not set
 # CONFIG_SPL_TINY_MEMSET is not set
+CONFIG_TPL_TINY_MEMSET=y
 # CONFIG_BITREVERSE is not set
 # CONFIG_TRACE is not set
 # CONFIG_CIRCBUF is not set
 CONFIG_CMD_DHRYSTONE=y
 
 #
+# Alternative crypto libraries
+#
+CONFIG_LEGACY_HASHING_AND_CRYPTO=y
+# CONFIG_MBEDTLS_LIB is not set
+CONFIG_LEGACY_HASHING=y
+CONFIG_SHA1_LEGACY=y
+CONFIG_SHA256_LEGACY=y
+CONFIG_MD5_LEGACY=y
+CONFIG_LEGACY_CRYPTO=y
+CONFIG_SPL_LEGACY_HASHING_AND_CRYPTO=y
+# CONFIG_SPL_MBEDTLS_LIB is not set
+CONFIG_SPL_LEGACY_HASHING=y
+CONFIG_SPL_SHA1_LEGACY=y
+CONFIG_SPL_SHA256_LEGACY=y
+CONFIG_SPL_LEGACY_CRYPTO=y
+CONFIG_TPL_LEGACY_HASHING_AND_CRYPTO=y
+# CONFIG_TPL_MBEDTLS_LIB is not set
+CONFIG_TPL_LEGACY_HASHING=y
+
+#
 # Security support
 #
 # CONFIG_AES is not set
 # CONFIG_ECDSA is not set
-# CONFIG_RSA is not set
+CONFIG_RSA=y
+CONFIG_SPL_RSA=y
+CONFIG_SPL_RSA_VERIFY=y
+CONFIG_RSA_VERIFY=y
+# CONFIG_RSA_VERIFY_WITH_PKEY is not set
+# CONFIG_SPL_RSA_VERIFY_WITH_PKEY is not set
+CONFIG_RSA_SOFTWARE_EXP=y
+# CONFIG_ASYMMETRIC_KEY_TYPE is not set
 # CONFIG_TPM is not set
 # CONFIG_SPL_TPM is not set
+# CONFIG_TPL_TPM is not set
 
 #
 # Android Verified Boot
@@ -2320,7 +2504,9 @@ CONFIG_SPL_SHA256=y
 CONFIG_MD5=y
 # CONFIG_SPL_MD5 is not set
 CONFIG_CRC8=y
-# CONFIG_SPL_CRC8 is not set
+CONFIG_SPL_CRC8=y
+# CONFIG_TPL_CRC8 is not set
+CONFIG_CRC16=y
 # CONFIG_SPL_CRC16 is not set
 CONFIG_CRC32=y
 
@@ -2337,10 +2523,13 @@ CONFIG_ZLIB=y
 # CONFIG_ZSTD is not set
 # CONFIG_SPL_BZIP2 is not set
 # CONFIG_SPL_LZ4 is not set
+# CONFIG_TPL_LZ4 is not set
 # CONFIG_SPL_LZMA is not set
+# CONFIG_TPL_LZMA is not set
 CONFIG_VPL_LZMA=y
 # CONFIG_SPL_LZO is not set
 # CONFIG_SPL_GZIP is not set
+# CONFIG_TPL_GZIP is not set
 # CONFIG_SPL_ZSTD is not set
 CONFIG_ERRNO_STR=y
 # CONFIG_HEXDUMP is not set
@@ -2349,49 +2538,26 @@ CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT_ASSUME_MASK=0x0
 CONFIG_SYS_FDT_PAD=0x3000
 CONFIG_SPL_OF_LIBFDT=y
-CONFIG_SPL_OF_LIBFDT_ASSUME_MASK=0xff
+CONFIG_TPL_OF_LIBFDT=y
+CONFIG_TPL_OF_LIBFDT_ASSUME_MASK=0xff
 
 #
 # System tables
 #
+# CONFIG_BLOBLIST_TABLES is not set
 CONFIG_GENERATE_SMBIOS_TABLE=y
+# CONFIG_GENERATE_SMBIOS_TABLE_VERBOSE is not set
 # 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_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=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
-CONFIG_EFI_CAPSULE_MAX=15
-CONFIG_EFI_DEVICE_PATH_TO_TEXT=y
-CONFIG_EFI_DEVICE_PATH_UTIL=y
-CONFIG_EFI_DT_FIXUP=y
-CONFIG_EFI_LOADER_HII=y
-CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y
-CONFIG_EFI_UNICODE_CAPITALIZATION=y
-# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set
-CONFIG_EFI_PLATFORM_LANG_CODES="en-US"
-CONFIG_EFI_HAVE_RUNTIME_RESET=y
-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
 # CONFIG_TEST_FDTDEC is not set
 CONFIG_LIB_ELF=y
 CONFIG_LMB=y
-CONFIG_LMB_USE_MAX_REGIONS=y
-CONFIG_LMB_MAX_REGIONS=16
+# CONFIG_LMB_ARCH_MEM_MAP is not set
 # CONFIG_PHANDLE_CHECK_SEQ is not set
 
 #
@@ -2405,6 +2571,7 @@ CONFIG_LMB_MAX_REGIONS=16
 # Tools options
 #
 CONFIG_MKIMAGE_DTC_PATH="dtc"
+CONFIG_TOOLS_CRC16=y
 CONFIG_TOOLS_CRC32=y
 CONFIG_TOOLS_LIBCRYPTO=y
 CONFIG_TOOLS_KWBIMAGE=y