Merge branch 'cros-postmerge-fixes' of alpernebbi/lbmk into master

2 files changed, 125 insertions, 45 deletions

diff --git a/resources/u-boot/veyron_mickey/board.cfg b/resources/u-boot/veyron_mickey/board.cfg
index 094a8189..d5f9de8a 100644
--- a/resources/u-boot/veyron_mickey/board.cfg
+++ b/resources/u-boot/veyron_mickey/board.cfg
@@ -1,2 +1,2 @@
-ubtree="veyron"
+ubtree="default"
 arch="ARMv7"
diff --git a/resources/u-boot/veyron_mickey/config/default b/resources/u-boot/veyron_mickey/config/default
index 0924f1ff..4bc4a843 100644
--- a/resources/u-boot/veyron_mickey/config/default
+++ b/resources/u-boot/veyron_mickey/config/default
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# U-Boot 2022.07 Configuration
+# U-Boot 2022.10 Configuration
 #
 
 #
-# Compiler: gcc (Debian 12.2.0-1) 12.2.0
+# Compiler: gcc (Debian 12.2.0-9) 12.2.0
 #
 CONFIG_CREATE_ARCH_SYMLINK=y
 CONFIG_SYS_CACHE_SHIFT_6=y
@@ -81,6 +81,7 @@ CONFIG_SPL_USE_ARCH_MEMSET=y
 # 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
 # CONFIG_TARGET_BCMCYGNUS is not set
 # CONFIG_TARGET_BCMNS2 is not set
@@ -99,6 +100,7 @@ CONFIG_SPL_USE_ARCH_MEMSET=y
 # CONFIG_ARCH_IMX8 is not set
 # CONFIG_ARCH_IMX8M is not set
 # CONFIG_ARCH_IMX8ULP is not set
+# CONFIG_ARCH_IMX9 is not set
 # CONFIG_ARCH_IMXRT is not set
 # CONFIG_ARCH_MX23 is not set
 # CONFIG_ARCH_MX28 is not set
@@ -106,7 +108,6 @@ CONFIG_SPL_USE_ARCH_MEMSET=y
 # CONFIG_ARCH_MX7ULP is not set
 # CONFIG_ARCH_MX7 is not set
 # CONFIG_ARCH_MX6 is not set
-CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
 # CONFIG_ARCH_MX5 is not set
 # CONFIG_ARCH_NEXELL is not set
 # CONFIG_ARCH_NPCM is not set
@@ -125,6 +126,7 @@ CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
 # CONFIG_ARCH_ZYNQMP is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_VEXPRESS64 is not set
+# CONFIG_TARGET_CORSTONE1000 is not set
 # CONFIG_TARGET_TOTAL_COMPUTE is not set
 # CONFIG_TARGET_LS2080A_EMU is not set
 # CONFIG_TARGET_LS1088AQDS is not set
@@ -172,6 +174,7 @@ CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_TARGET_POMELO is not set
 # CONFIG_TARGET_PRESIDIO_ASIC is not set
 # CONFIG_TARGET_XENGUEST_ARM64 is not set
+# CONFIG_ARCH_GXP is not set
 # CONFIG_SUPPORT_PASSING_ATAGS is not set
 # CONFIG_STATIC_MACH_TYPE is not set
 CONFIG_SYS_TEXT_BASE=0x00100000
@@ -181,12 +184,14 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
+CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
 CONFIG_ENV_SIZE=0x1f000
 CONFIG_DM_GPIO=y
 CONFIG_SPL_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-mickey"
 CONFIG_SPL_TEXT_BASE=0xff704000
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
+CONFIG_SYS_PROMPT="=> "
 CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x8000
 # CONFIG_ROCKCHIP_PX30 is not set
 # CONFIG_ROCKCHIP_RK3036 is not set
@@ -212,10 +217,10 @@ CONFIG_ROCKCHIP_STIMER_BASE=0xff810020
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0
 # CONFIG_SPL_ROCKCHIP_EARLYRETURN_TO_BROM is not set
 # CONFIG_SPL_MMC is not set
+# CONFIG_ROCKCHIP_SPI_IMAGE is not set
 CONFIG_SPL_SERIAL=y
 CONFIG_TPL_LDSCRIPT="arch/arm/mach-rockchip/u-boot-tpl.lds"
 CONFIG_TPL_TEXT_BASE=0xff704000
-CONFIG_TPL_MAX_SIZE=32768
 CONFIG_TPL_STACK=0xff718000
 # CONFIG_TARGET_CHROMEBOOK_JERRY is not set
 CONFIG_TARGET_CHROMEBIT_MICKEY=y
@@ -239,9 +244,9 @@ CONFIG_SPL=y
 CONFIG_PRE_CON_BUF_ADDR=0x0f000000
 CONFIG_PRE_CON_BUF_SZ=4096
 CONFIG_BOOTSTAGE_STASH_ADDR=0
-CONFIG_DEBUG_UART_BOARD_INIT=y
 CONFIG_DEBUG_UART_BASE=0xff690000
 CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
 CONFIG_IDENT_STRING=""
 CONFIG_SYS_CLK_FREQ=0
 # CONFIG_CHIP_DIP_SCAN is not set
@@ -271,6 +276,11 @@ CONFIG_BUILD_TARGET=""
 CONFIG_DEBUG_UART=y
 # CONFIG_AHCI is not set
 # CONFIG_OF_BOARD_FIXUP is not set
+# CONFIG_NXP_ESBC is not set
+
+#
+# Other functionality shared between NXP SoCs
+#
 
 #
 # General setup
@@ -293,6 +303,8 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
 # CONFIG_SYS_BOOT_GET_CMDLINE is not set
 # CONFIG_SYS_BOOT_GET_KBD is not set
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000
 CONFIG_SYS_MALLOC_F=y
 # CONFIG_VALGRIND is not set
 CONFIG_EXPERT=y
@@ -326,23 +338,27 @@ CONFIG_SYS_SRAM_SIZE=0x0
 # CONFIG_ANDROID_BOOT_IMAGE is not set
 # CONFIG_FIT is not set
 # CONFIG_TIMESTAMP is not set
+CONFIG_PXE_UTILS=y
 CONFIG_BOOTSTD=y
 # CONFIG_BOOTSTD_FULL is not set
 # CONFIG_BOOTSTD_BOOTCOMMAND is not set
+CONFIG_BOOTMETH_GLOBAL=y
 CONFIG_BOOTMETH_DISTRO=y
+CONFIG_BOOTMETH_DISTRO_PXE=y
+CONFIG_BOOTMETH_EFILOADER=y
 # CONFIG_BOOTMETH_SCRIPT is not set
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_SUPPORT_RAW_INITRD=y
 CONFIG_OF_BOARD_SETUP=y
 # CONFIG_OF_SYSTEM_SETUP is not set
 # CONFIG_OF_STDOUT_VIA_ALIAS is not set
-CONFIG_SYS_EXTRA_OPTIONS=""
 CONFIG_HAVE_SYS_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
+CONFIG_SYS_BOOT_RAMDISK_HIGH=y
 
 #
 # Boot timing
@@ -394,8 +410,6 @@ CONFIG_MENU=y
 # CONFIG_DISABLE_CONSOLE is not set
 CONFIG_LOGLEVEL=4
 CONFIG_SPL_LOGLEVEL=4
-CONFIG_TPL_LOGLEVEL=4
-CONFIG_VPL_LOGLEVEL=4
 # CONFIG_SILENT_CONSOLE is not set
 CONFIG_PRE_CONSOLE_BUFFER=y
 CONFIG_CONSOLE_MUX=y
@@ -423,7 +437,9 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 #
 # Start-up hooks
 #
-# CONFIG_EVENT is not set
+CONFIG_EVENT=y
+CONFIG_EVENT_DYNAMIC=y
+# CONFIG_EVENT_DEBUG is not set
 # CONFIG_ARCH_EARLY_INIT_R is not set
 # CONFIG_ARCH_MISC_INIT is not set
 # CONFIG_BOARD_EARLY_INIT_F is not set
@@ -433,6 +449,7 @@ CONFIG_BOARD_LATE_INIT=y
 # CONFIG_CLOCKS is not set
 # CONFIG_LAST_STAGE_INIT is not set
 # CONFIG_MISC_INIT_R is not set
+# CONFIG_SYS_MALLOC_BOOTPARAMS is not set
 # CONFIG_ID_EEPROM is not set
 # CONFIG_RESET_PHY_R is not set
 
@@ -441,6 +458,7 @@ CONFIG_BOARD_LATE_INIT=y
 #
 CONFIG_HASH=y
 # CONFIG_STACKPROTECTOR is not set
+# CONFIG_BOARD_RNG_SEED is not set
 
 #
 # Update support
@@ -451,33 +469,37 @@ CONFIG_HASH=y
 # Blob list
 #
 # CONFIG_BLOBLIST is not set
+CONFIG_SUPPORT_SPL=y
+CONFIG_SUPPORT_TPL=y
 
 #
-# SPL / TPL / VPL
+# SPL configuration options
 #
-CONFIG_SUPPORT_SPL=y
-CONFIG_SUPPORT_TPL=y
 CONFIG_SPL_FRAMEWORK=y
 # CONFIG_SPL_FRAMEWORK_BOARD_INIT_F is not set
+CONFIG_SPL_MAX_SIZE=0x0
+CONFIG_SPL_PAD_TO=0x7f8000
+# CONFIG_SPL_HAS_BSS_LINKER_SECTION is not set
+CONFIG_SPL_NO_BSS_LIMIT=y
+# CONFIG_SPL_BSS_LIMIT is not set
+# CONFIG_SPL_FOOTPRINT_LIMIT is not set
 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
 CONFIG_SPL_BINMAN_SYMBOLS=y
-
-#
-# PowerPC and LayerScape SPL Boot options
-#
+CONFIG_SPL_BINMAN_UBOOT_SYMBOLS=y
 # CONFIG_SPL_BOARD_INIT is not set
-# CONFIG_VPL_BOARD_INIT is not set
 # CONFIG_SPL_BOOTROM_SUPPORT is not set
 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
 CONFIG_SPL_LEGACY_IMAGE_FORMAT=y
 # CONFIG_SPL_LEGACY_IMAGE_CRC_CHECK is not set
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
+# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
+CONFIG_SPL_STACK=0xff718000
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 # CONFIG_SPL_SEPARATE_BSS is not set
-# CONFIG_TPL_SEPARATE_BSS is not set
+# CONFIG_SYS_SPL_MALLOC is not set
 CONFIG_SPL_BANNER_PRINT=y
 # CONFIG_SPL_EARLY_BSS is not set
 # CONFIG_SPL_DISPLAY_PRINT is not set
@@ -507,7 +529,6 @@ CONFIG_SYS_MMCSD_FS_BOOT_PARTITION=1
 # CONFIG_SPL_UBI is not set
 CONFIG_SPL_DM_SPI_FLASH=y
 # CONFIG_SPL_NET is not set
-# CONFIG_SPL_NO_CPU_SUPPORT is not set
 # CONFIG_SPL_NOR_SUPPORT is not set
 # CONFIG_SPL_XIP_SUPPORT is not set
 # CONFIG_SPL_ONENAND_SUPPORT is not set
@@ -531,8 +552,8 @@ CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
 # CONFIG_SPL_USB_GADGET is not set
 # CONFIG_SPL_WATCHDOG is not set
 # CONFIG_SPL_YMODEM_SUPPORT is not set
-# CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set
 # CONFIG_SPL_OPTEE_IMAGE is not set
+CONFIG_SPL_TARGET=""
 # CONFIG_TPL is not set
 # CONFIG_VPL is not set
 # CONFIG_FDT_SIMPLEFB is not set
@@ -546,8 +567,10 @@ 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_XTRACE=y
 
 #
@@ -579,6 +602,11 @@ CONFIG_BOOTM_NETBSD=y
 CONFIG_BOOTM_PLAN9=y
 CONFIG_BOOTM_RTEMS=y
 CONFIG_BOOTM_VXWORKS=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
+CONFIG_CMD_BOOTEFI=y
+CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y
+# CONFIG_CMD_BOOTEFI_HELLO is not set
+# CONFIG_CMD_BOOTEFI_SELFTEST is not set
 # CONFIG_CMD_BOOTMENU is not set
 # CONFIG_CMD_ADTIMG is not set
 CONFIG_CMD_ELF=y
@@ -605,6 +633,7 @@ CONFIG_CMD_SAVEENV=y
 CONFIG_CMD_ENV_EXISTS=y
 # CONFIG_CMD_ENV_CALLBACK is not set
 # CONFIG_CMD_ENV_FLAGS is not set
+# CONFIG_CMD_NVEDIT_EFI is not set
 # CONFIG_CMD_NVEDIT_INDIRECT is not set
 # CONFIG_CMD_NVEDIT_INFO is not set
 # CONFIG_CMD_NVEDIT_LOAD is not set
@@ -663,6 +692,7 @@ CONFIG_RANDOM_UUID=y
 # CONFIG_CMD_IOTRACE is not set
 CONFIG_CMD_I2C=y
 CONFIG_CMD_LOADB=y
+# CONFIG_CMD_LOADM is not set
 CONFIG_CMD_LOADS=y
 # CONFIG_CMD_LSBLK is not set
 # CONFIG_CMD_MBR is not set
@@ -729,6 +759,7 @@ CONFIG_NET_TFTP_VARS=y
 # CONFIG_CMD_RARP is not set
 CONFIG_CMD_NFS=y
 CONFIG_NFS_TIMEOUT=2000
+# CONFIG_SYS_DISABLE_AUTOLOAD is not set
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_CDP is not set
@@ -748,6 +779,7 @@ CONFIG_CMD_BLOCK_CACHE=y
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_CONITRACE is not set
 # CONFIG_CMD_CLS is not set
+# CONFIG_CMD_EFIDEBUG is not set
 # CONFIG_CMD_EXCEPTION is not set
 # CONFIG_CMD_DATE is not set
 CONFIG_CMD_TIME=y
@@ -855,7 +887,6 @@ CONFIG_SPL_OF_PLATDATA=y
 CONFIG_SPL_OF_PLATDATA_PARENT=y
 # CONFIG_SPL_OF_PLATDATA_INST is not set
 CONFIG_SPL_OF_PLATDATA_DRIVER_RT=y
-CONFIG_VPL_OF_REAL=y
 
 #
 # Environment
@@ -864,6 +895,8 @@ CONFIG_ENV_SUPPORT=y
 CONFIG_ENV_SOURCE_FILE=""
 CONFIG_SAVEENV=y
 # CONFIG_ENV_OVERWRITE is not set
+CONFIG_ENV_MIN_ENTRIES=64
+CONFIG_ENV_MAX_ENTRIES=512
 CONFIG_ENV_IS_NOWHERE=y
 # CONFIG_ENV_IS_IN_EEPROM is not set
 # CONFIG_ENV_IS_IN_FAT is not set
@@ -905,6 +938,7 @@ CONFIG_SERVERIP_FROM_PROXYDHCP_DELAY_MS=100
 # CONFIG_KEEP_SERVERADDR is not set
 # CONFIG_UDP_CHECKSUM is not set
 # CONFIG_BOOTP_SERVERIP is not set
+CONFIG_BOOTP_MAX_ROOT_PATH_LEN=64
 CONFIG_SYS_RX_ETH_BUFFER=4
 
 #
@@ -919,8 +953,9 @@ CONFIG_SPL_DM=y
 CONFIG_DM_WARN=y
 # CONFIG_SPL_DM_WARN is not set
 # CONFIG_DM_DEBUG is not set
+# CONFIG_DM_STATS is not set
 CONFIG_DM_DEVICE_REMOVE=y
-# CONFIG_DM_EVENT is not set
+CONFIG_DM_EVENT=y
 # CONFIG_SPL_DM_DEVICE_REMOVE is not set
 CONFIG_DM_STDIO=y
 CONFIG_DM_SEQ_ALIAS=y
@@ -931,7 +966,6 @@ CONFIG_REGMAP=y
 CONFIG_SPL_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 is not set
@@ -964,6 +998,8 @@ CONFIG_HAVE_BLOCK_DEVICE=y
 CONFIG_BLOCK_CACHE=y
 # CONFIG_EFI_MEDIA is not set
 # CONFIG_IDE is not set
+# CONFIG_LBA48 is not set
+# CONFIG_SYS_64BIT_LBA is not set
 # CONFIG_BOOTCOUNT_LIMIT is not set
 
 #
@@ -1007,7 +1043,10 @@ CONFIG_SPL_CLK=y
 # CONFIG_FSL_CAAM is not set
 # CONFIG_SYS_FSL_SEC_BE is not set
 # CONFIG_SYS_FSL_SEC_LE is not set
+# CONFIG_NPCM_AES is not set
+# CONFIG_NPCM_SHA is not set
 # CONFIG_DDR_SPD is not set
+# CONFIG_IMX_SNPS_DDR_PHY is not set
 
 #
 # Demo for driver model
@@ -1032,6 +1071,7 @@ CONFIG_SPL_CLK=y
 # CONFIG_UDP_FUNCTION_FASTBOOT is not set
 # CONFIG_FIRMWARE is not set
 # CONFIG_ZYNQMP_FIRMWARE is not set
+# CONFIG_DM_FUZZING_ENGINE is not set
 
 #
 # FPGA support
@@ -1076,12 +1116,12 @@ CONFIG_ROCKCHIP_GPIO=y
 # CONFIG_ZYNQ_GPIO is not set
 # CONFIG_DM_74X164 is not set
 # CONFIG_DM_PCA953X is not set
-# CONFIG_SPL_DM_PCA953X is not set
 # CONFIG_MPC8XXX_GPIO is not set
 # CONFIG_NX_GPIO is not set
 # 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
 
 #
 # Hardware Spinlock Support
@@ -1103,6 +1143,7 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
 # CONFIG_SYS_I2C_MICROCHIP is not set
 # CONFIG_SYS_I2C_MXC is not set
 # CONFIG_SYS_I2C_NEXELL is not set
+# CONFIG_SYS_I2C_NPCM is not set
 # CONFIG_SYS_I2C_OCORES is not set
 CONFIG_SYS_I2C_ROCKCHIP=y
 # CONFIG_SYS_I2C_SOFT is not set
@@ -1152,20 +1193,18 @@ CONFIG_CROS_EC_KEYB=y
 #
 # CONFIG_MISC is not set
 # CONFIG_SPL_MISC is not set
+# CONFIG_NVMEM is not set
+# CONFIG_SPL_NVMEM is not set
 CONFIG_CROS_EC=y
-# CONFIG_SPL_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_VPL_CROS_EC_LPC is not set
 CONFIG_CROS_EC_SPI=y
 # CONFIG_DS4510 is not set
 # CONFIG_FSL_SEC_MON is not set
 # CONFIG_IRQ is not set
+# CONFIG_NPCM_HOST is not set
 # CONFIG_NUVOTON_NCT6102D is not set
 CONFIG_PWRSEQ=y
-# CONFIG_SPL_PWRSEQ is not set
 # CONFIG_PCA9551_LED is not set
 # CONFIG_TEST_DRV is not set
 # CONFIG_USB_HUB_USB251XB is not set
@@ -1192,13 +1231,9 @@ CONFIG_MMC_HW_PARTITIONING=y
 # CONFIG_SUPPORT_EMMC_RPMB is not set
 # CONFIG_SUPPORT_EMMC_BOOT is not set
 # CONFIG_MMC_IO_VOLTAGE is not set
-# CONFIG_SPL_MMC_IO_VOLTAGE is not set
 # CONFIG_MMC_HS400_ES_SUPPORT is not set
-# CONFIG_SPL_MMC_HS400_ES_SUPPORT is not set
 # CONFIG_MMC_HS400_SUPPORT is not set
-# CONFIG_SPL_MMC_HS400_SUPPORT is not set
 # CONFIG_MMC_HS200_SUPPORT is not set
-# CONFIG_SPL_MMC_HS200_SUPPORT is not set
 CONFIG_MMC_VERBOSE=y
 # CONFIG_MMC_TRACE is not set
 CONFIG_MMC_DW=y
@@ -1207,7 +1242,6 @@ CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 # CONFIG_MMC_DW_SNPS is not set
 # CONFIG_MMC_MXC is not set
-# CONFIG_PXA_MMC_GENERIC is not set
 # CONFIG_MMC_OMAP_HS is not set
 # CONFIG_MMC_SDHCI is not set
 # CONFIG_MMC_PITON is not set
@@ -1226,6 +1260,7 @@ CONFIG_MTD=y
 # 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
 
@@ -1240,6 +1275,7 @@ CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SF_DEFAULT_SPEED=20000000
 # CONFIG_SPI_FLASH_SFDP_SUPPORT is not set
 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_UNLOCK_ALL=y
@@ -1271,37 +1307,57 @@ CONFIG_SPI_FLASH_USE_4K_SECTORS=y
 # CONFIG_BITBANGMII is not set
 # CONFIG_MV88E6352_SWITCH is not set
 # CONFIG_PHYLIB is not set
+# CONFIG_FSL_MEMAC is not set
 CONFIG_PHY_RESET_DELAY=0
 # CONFIG_FSL_PFE is not set
+# CONFIG_BNXT_ETH is not set
 CONFIG_ETH=y
-# CONFIG_DM_ETH is not set
+CONFIG_DM_ETH=y
 # CONFIG_DM_ETH_PHY is not set
 CONFIG_NETDEVICES=y
 # CONFIG_PHY_GIGE is not set
+# CONFIG_ALTERA_TSE is not set
 # CONFIG_BCM_SF2_ETH is not set
+# CONFIG_BCMGENET is not set
+# CONFIG_CALXEDA_XGMAC is not set
 # CONFIG_DRIVER_DM9000 is not set
+# CONFIG_DWC_ETH_QOS is not set
 # CONFIG_EEPRO100 is not set
 # CONFIG_ETH_DESIGNWARE is not set
+# CONFIG_ETH_DESIGNWARE_MESON8B is not set
 # CONFIG_ETHOC is not set
 # CONFIG_FMAN_ENET is not set
 # 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_MACB is not set
+# CONFIG_NET_NPCM750 is not set
+# CONFIG_PCH_GBE is not set
 # CONFIG_RGMII is not set
 # CONFIG_MII is not set
 # CONFIG_RMII is not set
 # CONFIG_PCNET is not set
+# CONFIG_QE_UEC is not set
 # CONFIG_RTL8139 is not set
 # CONFIG_RTL8169 is not set
 # CONFIG_SMC911X is not set
 # CONFIG_SUN7I_GMAC is not set
+# CONFIG_SUN4I_EMAC is not set
+# CONFIG_SUN8I_EMAC is not set
 # CONFIG_SH_ETHER is not set
 # CONFIG_DRIVER_TI_CPSW is not set
 # CONFIG_DRIVER_TI_EMAC is not set
 # CONFIG_DRIVER_TI_KEYSTONE_NET is not set
 # CONFIG_TULIP is not set
+# CONFIG_XILINX_AXIEMAC is not set
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_ZYNQ_GEM is not set
 # CONFIG_SYS_DPAA_QBMAN is not set
 # CONFIG_TSEC_ENET is not set
+# CONFIG_MEDIATEK_ETH is not set
+# CONFIG_HIGMACV300_ETH is not set
 # CONFIG_NVME is not set
 # CONFIG_NVME_APPLE is not set
 # CONFIG_PCI is not set
@@ -1351,10 +1407,8 @@ CONFIG_SPL_PINCTRL=y
 CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_POWER=y
 # CONFIG_POWER_LEGACY is not set
-# CONFIG_SPL_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
@@ -1431,7 +1485,6 @@ 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
@@ -1509,7 +1562,6 @@ CONFIG_SYS_NS16550=y
 # CONFIG_MSM_SERIAL is not set
 # CONFIG_MSM_GENI_SERIAL is not set
 # CONFIG_OMAP_SERIAL is not set
-# CONFIG_PXA_SERIAL is not set
 # CONFIG_SIFIVE_SERIAL is not set
 # CONFIG_ZYNQ_SERIAL is not set
 # CONFIG_MTK_SERIAL is not set
@@ -1542,6 +1594,7 @@ CONFIG_SPI_MEM=y
 # 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
@@ -1618,6 +1671,7 @@ CONFIG_USB_HOST=y
 CONFIG_USB_DWC2=y
 CONFIG_USB_DWC2_BUFFER_SIZE=64
 # CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_ISP1760 is not set
 
 #
 # Legacy MUSB Support
@@ -1662,6 +1716,7 @@ CONFIG_VIDEO_LOGO=y
 CONFIG_BACKLIGHT=y
 CONFIG_VIDEO_PCI_DEFAULT_FB_SIZE=0
 # CONFIG_VIDEO_COPY is not set
+CONFIG_VIDEO_DAMAGE=y
 CONFIG_BACKLIGHT_PWM=y
 # CONFIG_BACKLIGHT_GPIO is not set
 CONFIG_CMD_VIDCONSOLE=y
@@ -1678,6 +1733,10 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_NO_FB_CLEAR is not set
 CONFIG_PANEL=y
 CONFIG_SIMPLE_PANEL=y
+# CONFIG_VIDEO_FONT_4X6 is not set
+CONFIG_VIDEO_FONT_8X16=y
+# CONFIG_VIDEO_FONT_SUN12X22 is not set
+# CONFIG_VIDEO_FONT_TER16X32 is not set
 
 #
 # TrueType Fonts
@@ -1699,6 +1758,7 @@ CONFIG_DISPLAY=y
 # CONFIG_NXP_TDA19988 is not set
 # CONFIG_ATMEL_HLCD is not set
 # CONFIG_AM335X_LCD is not set
+# CONFIG_VIDEO_EXYNOS is not set
 # CONFIG_LOGICORE_DP_TX is not set
 CONFIG_VIDEO_ROCKCHIP=y
 CONFIG_VIDEO_ROCKCHIP_MAX_XRES=3840
@@ -1750,7 +1810,6 @@ CONFIG_VIDEO_BMP_RLE8=y
 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
 # CONFIG_IMX_WATCHDOG is not set
 # CONFIG_ULP_WATCHDOG is not set
-# CONFIG_DESIGNWARE_WATCHDOG is not set
 # CONFIG_WDT is not set
 # CONFIG_SPL_WDT is not set
 # CONFIG_PVBLOCK is not set
@@ -1782,6 +1841,7 @@ CONFIG_FS_FAT_MAX_CLUSTSIZE=65536
 # CONFIG_BCH is not set
 CONFIG_BINMAN_FDT=y
 # CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED is not set
+CONFIG_CHARSET=y
 # CONFIG_DYNAMIC_CRC_TABLE is not set
 CONFIG_HAVE_PRIVATE_LIBGCC=y
 CONFIG_LIB_UUID=y
@@ -1801,7 +1861,6 @@ CONFIG_LIB_RAND=y
 CONFIG_SUPPORT_ACPI=y
 # CONFIG_GENERATE_ACPI_TABLE is not set
 CONFIG_SPL_TINY_MEMSET=y
-# CONFIG_TPL_TINY_MEMSET is not set
 # CONFIG_BITREVERSE is not set
 # CONFIG_TRACE is not set
 # CONFIG_CIRCBUF is not set
@@ -1860,16 +1919,37 @@ CONFIG_ERRNO_STR=y
 CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT_ASSUME_MASK=0
 # CONFIG_OF_LIBFDT_OVERLAY is not set
+CONFIG_SYS_FDT_PAD=0x3000
 CONFIG_SPL_OF_LIBFDT=y
 CONFIG_SPL_OF_LIBFDT_ASSUME_MASK=0xff
-# CONFIG_VPL_OF_LIBFDT is not set
 
 #
 # System tables
 #
+CONFIG_GENERATE_SMBIOS_TABLE=y
 # CONFIG_LIB_RATIONAL is not set
 # CONFIG_SPL_LIB_RATIONAL is not set
 # CONFIG_SMBIOS_PARSER 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
+CONFIG_EFI_VAR_BUF_SIZE=16384
+# CONFIG_EFI_RUNTIME_UPDATE_CAPSULE is not set
+# CONFIG_EFI_CAPSULE_ON_DISK is not set
+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_PLATFORM_LANG_CODES="en-US"
+CONFIG_EFI_GRUB_ARM32_WORKAROUND=y
+CONFIG_EFI_LOAD_FILE2_INITRD=y
+CONFIG_EFI_ECPT=y
+CONFIG_EFI_EBBR_2_0_CONFORMANCE=y
 # CONFIG_OPTEE_LIB is not set
 # CONFIG_OPTEE_IMAGE is not set
 # CONFIG_BOOTM_OPTEE is not set
@@ -1878,7 +1958,6 @@ CONFIG_LIB_ELF=y
 CONFIG_LMB=y
 CONFIG_LMB_USE_MAX_REGIONS=y
 CONFIG_LMB_MAX_REGIONS=8
-# CONFIG_PHANDLE_CHECK_SEQ is not set
 # CONFIG_UNIT_TEST is not set
 # CONFIG_SPL_UNIT_TEST is not set
 
@@ -1902,3 +1981,4 @@ CONFIG_TOOLS_SHA256=y
 CONFIG_TOOLS_SHA384=y
 CONFIG_TOOLS_SHA512=y
 # CONFIG_TOOLS_MKEFICAPSULE is not set
+# CONFIG_FSPI_CONF_HEADER is not set