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

2 files changed, 89 insertions, 41 deletions

diff --git a/resources/u-boot/peach_pit/board.cfg b/resources/u-boot/peach_pit/board.cfg
index 17bafe44..d5f9de8a 100644
--- a/resources/u-boot/peach_pit/board.cfg
+++ b/resources/u-boot/peach_pit/board.cfg
@@ -1,2 +1,2 @@
-ubtree="peach"
+ubtree="default"
 arch="ARMv7"
diff --git a/resources/u-boot/peach_pit/config/default b/resources/u-boot/peach_pit/config/default
index 9375212f..39bf9a64 100644
--- a/resources/u-boot/peach_pit/config/default
+++ b/resources/u-boot/peach_pit/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
@@ -69,6 +69,7 @@ CONFIG_USE_ARCH_MEMCPY=y
 CONFIG_SPL_USE_ARCH_MEMCPY=y
 CONFIG_USE_ARCH_MEMSET=y
 CONFIG_SPL_USE_ARCH_MEMSET=y
+CONFIG_S5P=y
 # CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_KIRKWOOD is not set
@@ -81,6 +82,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 +101,7 @@ CONFIG_ARCH_EXYNOS=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 +109,6 @@ CONFIG_ARCH_EXYNOS=y
 # CONFIG_ARCH_MX7ULP is not set
 # CONFIG_ARCH_MX7 is not set
 # CONFIG_ARCH_MX6 is not set
-CONFIG_SPL_LDSCRIPT="board/samsung/common/exynos-uboot-spl.lds"
 # CONFIG_ARCH_MX5 is not set
 # CONFIG_ARCH_NEXELL is not set
 # CONFIG_ARCH_NPCM is not set
@@ -125,6 +127,7 @@ CONFIG_SPL_LDSCRIPT="board/samsung/common/exynos-uboot-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 +175,7 @@ CONFIG_SPL_LDSCRIPT="board/samsung/common/exynos-uboot-spl.lds"
 # 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=0x23E00000
@@ -181,6 +185,8 @@ CONFIG_BOARD_COMMON=y
 # CONFIG_ARCH_EXYNOS4 is not set
 CONFIG_ARCH_EXYNOS5=y
 # CONFIG_ARCH_EXYNOS7 is not set
+CONFIG_EXYNOS5420=y
+CONFIG_EXYNOS5_DT=y
 CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -192,13 +198,17 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 # CONFIG_TARGET_SMDK5420 is not set
 # CONFIG_TARGET_PEACH_PI is not set
 CONFIG_TARGET_PEACH_PIT=y
+CONFIG_EXYNOS_ACE_SHA=y
+CONFIG_EXYNOS_TMU=y
 CONFIG_NR_DRAM_BANKS=4
+CONFIG_SPL_LDSCRIPT="board/samsung/common/exynos-uboot-spl.lds"
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_OFFSET=0x3FC000
 CONFIG_ENV_SECT_SIZE=0x4000
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit"
 CONFIG_SPL_TEXT_BASE=0x02024410
+CONFIG_SYS_PROMPT="Peach-Pit # "
 CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x8000
 # CONFIG_SPL_MMC is not set
 # CONFIG_SPL_SERIAL is not set
@@ -237,6 +247,11 @@ CONFIG_BUILD_TARGET=""
 # CONFIG_DEBUG_UART is not set
 # 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
@@ -259,6 +274,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=0x2073800
 CONFIG_SYS_MALLOC_F=y
 # CONFIG_VALGRIND is not set
 CONFIG_EXPERT=y
@@ -304,25 +321,29 @@ CONFIG_FIT_PRINT=y
 # CONFIG_SPL_LOAD_FIT is not set
 # CONFIG_SPL_LOAD_FIT_FULL is not set
 # CONFIG_USE_SPL_FIT_GENERATOR 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_VBE=y
+CONFIG_BOOTMETH_VBE_SIMPLE=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_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
@@ -373,8 +394,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=y
 # CONFIG_SILENT_U_BOOT_ONLY is not set
 CONFIG_SILENT_CONSOLE_UPDATE_ON_SET=y
@@ -417,6 +436,7 @@ CONFIG_BOARD_EARLY_INIT_F=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
 
@@ -425,6 +445,7 @@ CONFIG_BOARD_EARLY_INIT_F=y
 #
 CONFIG_HASH=y
 # CONFIG_STACKPROTECTOR is not set
+# CONFIG_BOARD_RNG_SEED is not set
 
 #
 # Update support
@@ -436,21 +457,22 @@ CONFIG_HASH=y
 # Blob list
 #
 # CONFIG_BLOBLIST is not set
+CONFIG_SUPPORT_SPL=y
 
 #
-# SPL / TPL / VPL
+# SPL configuration options
 #
-CONFIG_SUPPORT_SPL=y
 # CONFIG_SPL_FRAMEWORK is not set
+CONFIG_SPL_MAX_SIZE=0x0
+CONFIG_SPL_PAD_TO=0x0
+# CONFIG_SPL_NO_BSS_LIMIT is not set
+# CONFIG_SPL_BSS_LIMIT is not set
+CONFIG_SPL_FOOTPRINT_LIMIT=y
+CONFIG_SPL_MAX_FOOTPRINT=0x7800
 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
-
-#
-# PowerPC and LayerScape SPL Boot options
-#
 # 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=y
 CONFIG_SPL_LEGACY_IMAGE_FORMAT=y
@@ -458,7 +480,6 @@ CONFIG_SPL_LEGACY_IMAGE_FORMAT=y
 # CONFIG_SPL_SYS_MALLOC_SIMPLE is not set
 # CONFIG_SPL_STACK_R is not set
 # CONFIG_SPL_SEPARATE_BSS is not set
-# CONFIG_TPL_SEPARATE_BSS is not set
 CONFIG_SPL_BANNER_PRINT=y
 # CONFIG_SPL_EARLY_BSS is not set
 # CONFIG_SPL_DISPLAY_PRINT is not set
@@ -477,7 +498,6 @@ CONFIG_SPL_CRC32=y
 # CONFIG_SPL_FAT_WRITE is not set
 # CONFIG_SPL_FPGA is not set
 # CONFIG_SPL_I2C is not set
-# CONFIG_SPL_DM_MAILBOX is not set
 CONFIG_SYS_MMCSD_FS_BOOT_PARTITION=1
 # CONFIG_SPL_MPC8XXX_INIT_DDR is not set
 # CONFIG_SPL_MTD_SUPPORT is not set
@@ -488,7 +508,6 @@ CONFIG_SYS_MMCSD_FS_BOOT_PARTITION=1
 # CONFIG_SPL_NAND_SIMPLE is not set
 # CONFIG_SPL_UBI is not set
 # 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
@@ -496,7 +515,6 @@ CONFIG_SYS_MMCSD_FS_BOOT_PARTITION=1
 # CONFIG_SPL_PCI is not set
 # CONFIG_SPL_PCH is not set
 # CONFIG_SPL_POST_MEM_SUPPORT is not set
-# 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
@@ -508,8 +526,8 @@ CONFIG_SYS_MMCSD_FS_BOOT_PARTITION=1
 # CONFIG_SPL_USB_HOST is not set
 # CONFIG_SPL_USB_GADGET is not set
 # CONFIG_SPL_WATCHDOG is not set
-# CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set
 # CONFIG_SPL_OPTEE_IMAGE is not set
+CONFIG_SPL_TARGET=""
 # CONFIG_VPL is not set
 # CONFIG_FDT_SIMPLEFB is not set
 
@@ -522,8 +540,10 @@ CONFIG_CMDLINE_EDITING=y
 # CONFIG_CMDLINE_PS_SUPPORT is not set
 CONFIG_AUTO_COMPLETE=y
 CONFIG_SYS_LONGHELP=y
-CONFIG_SYS_PROMPT="Peach-Pit # "
 CONFIG_SYS_PROMPT_HUSH_PS2="> "
+CONFIG_SYS_MAXARGS=16
+CONFIG_SYS_CBSIZE=1024
+CONFIG_SYS_PBSIZE=1024
 CONFIG_SYS_XTRACE=y
 
 #
@@ -555,7 +575,9 @@ CONFIG_BOOTM_NETBSD=y
 # CONFIG_BOOTM_OSE is not set
 CONFIG_BOOTM_PLAN9=y
 CONFIG_BOOTM_RTEMS=y
+# CONFIG_CMD_VBE is not set
 CONFIG_BOOTM_VXWORKS=y
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_BOOTEFI=y
 CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y
 # CONFIG_CMD_BOOTEFI_HELLO is not set
@@ -644,6 +666,7 @@ CONFIG_CMD_GPIO=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
@@ -709,6 +732,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
@@ -733,6 +757,8 @@ CONFIG_CMD_CLS=y
 # CONFIG_CMD_DATE is not set
 CONFIG_CMD_TIME=y
 # CONFIG_CMD_GETTIME is not set
+# CONFIG_CMD_RNG is not set
+# CONFIG_CMD_KASLRSEED is not set
 CONFIG_CMD_SLEEP=y
 # CONFIG_CMD_TIMER is not set
 CONFIG_CMD_SOUND=y
@@ -835,7 +861,6 @@ CONFIG_DEVICE_TREE_INCLUDES=""
 CONFIG_OF_LIST="exynos5420-peach-pit"
 # CONFIG_MULTI_DTB_FIT is not set
 # CONFIG_OF_DTB_PROPS_REMOVE is not set
-CONFIG_VPL_OF_REAL=y
 
 #
 # Environment
@@ -844,6 +869,8 @@ CONFIG_ENV_SUPPORT=y
 CONFIG_ENV_SOURCE_FILE=""
 CONFIG_SAVEENV=y
 CONFIG_ENV_OVERWRITE=y
+CONFIG_ENV_MIN_ENTRIES=64
+CONFIG_ENV_MAX_ENTRIES=512
 # CONFIG_ENV_IS_NOWHERE is not set
 # CONFIG_ENV_IS_IN_EEPROM is not set
 # CONFIG_ENV_IS_IN_FAT is not set
@@ -891,6 +918,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
 
 #
@@ -904,6 +932,7 @@ CONFIG_DM=y
 # CONFIG_SPL_DM is not set
 CONFIG_DM_WARN=y
 # CONFIG_DM_DEBUG is not set
+# CONFIG_DM_STATS is not set
 CONFIG_DM_DEVICE_REMOVE=y
 CONFIG_DM_EVENT=y
 CONFIG_DM_STDIO=y
@@ -939,6 +968,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
 
 #
@@ -969,7 +1000,10 @@ CONFIG_BLOCK_CACHE=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
@@ -994,6 +1028,7 @@ CONFIG_BLOCK_CACHE=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
@@ -1003,6 +1038,7 @@ CONFIG_BLOCK_CACHE=y
 # CONFIG_FPGA_XILINX is not set
 CONFIG_GPIO=y
 # CONFIG_GPIO_HOG is not set
+# CONFIG_SPL_GPIO_HOG is not set
 # CONFIG_DM_GPIO_LOOKUP_LABEL is not set
 # CONFIG_ALTERA_PIO is not set
 # CONFIG_BCM2835_GPIO is not set
@@ -1038,12 +1074,12 @@ CONFIG_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
@@ -1065,6 +1101,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 is not set
 # CONFIG_SYS_I2C_SOFT is not set
@@ -1111,13 +1148,11 @@ CONFIG_CROS_EC_KEYB=y
 # Multifunction device drivers
 #
 # CONFIG_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
@@ -1148,13 +1183,9 @@ CONFIG_MMC_HW_PARTITIONING=y
 # CONFIG_SUPPORT_EMMC_RPMB is not set
 CONFIG_SUPPORT_EMMC_BOOT=y
 # 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
@@ -1164,18 +1195,17 @@ CONFIG_MMC_DW_EXYNOS=y
 # CONFIG_MMC_DW_ROCKCHIP is not set
 # CONFIG_MMC_MXC is not set
 # CONFIG_MMC_PCI is not set
-# CONFIG_PXA_MMC_GENERIC is not set
 # CONFIG_MMC_OMAP_HS is not set
 CONFIG_MMC_SDHCI=y
 # CONFIG_MMC_SDHCI_SDMA is not set
 # CONFIG_MMC_SDHCI_ADMA is not set
-# CONFIG_SPL_MMC_SDHCI_ADMA is not set
 # CONFIG_MMC_SDHCI_BCMSTB is not set
 # CONFIG_MMC_SDHCI_CADENCE 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
 # CONFIG_MMC_SDHCI_MSM is not set
+# CONFIG_MMC_SDHCI_NPCM is not set
 CONFIG_MMC_SDHCI_S5P=y
 # CONFIG_MMC_SDHCI_SPEAR is not set
 # CONFIG_MMC_SDHCI_STI is not set
@@ -1197,6 +1227,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_CONCAT is not set
 # CONFIG_SYS_MTDPARTS_RUNTIME is not set
 # CONFIG_FLASH_CFI_DRIVER 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
 
@@ -1211,6 +1242,7 @@ CONFIG_SF_DEFAULT_MODE=0x0
 CONFIG_SF_DEFAULT_SPEED=50000000
 # 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
@@ -1242,6 +1274,7 @@ 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
@@ -1267,6 +1300,7 @@ CONFIG_NETDEVICES=y
 # 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
@@ -1324,7 +1358,6 @@ CONFIG_POWER=y
 # 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
@@ -1381,6 +1414,7 @@ CONFIG_PWM_EXYNOS=y
 # CONFIG_PWM_MTK is not set
 # CONFIG_PWM_ROCKCHIP is not set
 # CONFIG_PWM_SANDBOX is not set
+CONFIG_PWM_S5P=y
 # CONFIG_PWM_SIFIVE is not set
 # CONFIG_PWM_TEGRA is not set
 # CONFIG_PWM_SUNXI is not set
@@ -1401,7 +1435,11 @@ CONFIG_PWM_EXYNOS=y
 #
 # CONFIG_DM_RESET is not set
 # CONFIG_RESET_SCMI is not set
-# CONFIG_DM_RNG is not set
+CONFIG_DM_RNG=y
+# CONFIG_RNG_MSM is not set
+# CONFIG_RNG_NPCM is not set
+# CONFIG_RNG_IPROC200 is not set
+CONFIG_TPM_RNG=y
 
 #
 # Real Time Clock
@@ -1450,7 +1488,6 @@ CONFIG_S5P_SERIAL=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
@@ -1496,6 +1533,7 @@ CONFIG_SPI_MEM=y
 CONFIG_EXYNOS_SPI=y
 # 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
@@ -1574,6 +1612,7 @@ CONFIG_USB_HOST=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 # CONFIG_USB_XHCI_DWC3_OF_SIMPLE is not set
+CONFIG_USB_XHCI_EXYNOS=y
 # CONFIG_USB_XHCI_PCI is not set
 # CONFIG_USB_XHCI_FSL is not set
 # CONFIG_USB_XHCI_BRCM is not set
@@ -1582,6 +1621,7 @@ CONFIG_USB_XHCI_DWC3=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_DWC2 is not set
 # CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_ISP1760 is not set
 # CONFIG_USB_CDNS3 is not set
 # CONFIG_USB_DWC3 is not set
 
@@ -1633,6 +1673,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
@@ -1649,6 +1690,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
@@ -1671,6 +1716,10 @@ CONFIG_DISPLAY=y
 # CONFIG_NXP_TDA19988 is not set
 # CONFIG_ATMEL_HLCD is not set
 # CONFIG_AM335X_LCD is not set
+CONFIG_VIDEO_EXYNOS=y
+CONFIG_EXYNOS_DP=y
+CONFIG_EXYNOS_FB=y
+# CONFIG_EXYNOS_MIPI_DSIM is not set
 # CONFIG_LOGICORE_DP_TX is not set
 # CONFIG_VIDEO_ROCKCHIP is not set
 # CONFIG_VIDEO_ARM_MALIDP is not set
@@ -1720,7 +1769,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_PVBLOCK is not set
 # CONFIG_PHYS_TO_BUS is not set
@@ -1769,7 +1817,6 @@ CONFIG_LIB_RAND=y
 CONFIG_SUPPORT_ACPI=y
 # CONFIG_GENERATE_ACPI_TABLE is not set
 # CONFIG_SPL_TINY_MEMSET is not set
-# CONFIG_TPL_TINY_MEMSET is not set
 # CONFIG_BITREVERSE is not set
 # CONFIG_TRACE is not set
 # CONFIG_CIRCBUF is not set
@@ -1829,11 +1876,9 @@ 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 is not set
 CONFIG_SPL_OF_LIBFDT_ASSUME_MASK=0xff
-CONFIG_TPL_OF_LIBFDT_ASSUME_MASK=0xff
-# CONFIG_VPL_OF_LIBFDT is not set
-CONFIG_VPL_OF_LIBFDT_ASSUME_MASK=0xff
 
 #
 # System tables
@@ -1858,9 +1903,12 @@ 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_RNG_PROTOCOL=y
 CONFIG_EFI_TCG2_PROTOCOL=y
 CONFIG_EFI_TCG2_PROTOCOL_EVENTLOG_SIZE=65536
 CONFIG_EFI_LOAD_FILE2_INITRD=y
+CONFIG_EFI_ECPT=y
+CONFIG_EFI_EBBR_2_0_CONFORMANCE=y
 # CONFIG_OPTEE_LIB is not set
 # CONFIG_OPTEE_IMAGE is not set
 # CONFIG_BOOTM_OPTEE is not set
@@ -1869,7 +1917,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
 
@@ -1893,3 +1940,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