Coreboot, vboot and depthcharge updates to Coreboot 4.3 for CrOS devices

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>

3 files changed, 38 insertions, 19 deletions

diff --git a/resources/libreboot/config/depthcharge/veyron_speedy/cbrevision b/resources/libreboot/config/depthcharge/veyron_speedy/cbrevision
index 5c2d606..073d413 100644
--- a/resources/libreboot/config/depthcharge/veyron_speedy/cbrevision
+++ b/resources/libreboot/config/depthcharge/veyron_speedy/cbrevision
@@ -1 +1 @@
-33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f
+1bf5e6409678d04fd15f9625460078853118521c
diff --git a/resources/libreboot/config/depthcharge/veyron_speedy/config b/resources/libreboot/config/depthcharge/veyron_speedy/config
index 4abf201..673759a 100644
--- a/resources/libreboot/config/depthcharge/veyron_speedy/config
+++ b/resources/libreboot/config/depthcharge/veyron_speedy/config
@@ -9,7 +9,7 @@
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
 CONFIG_COMMON_CBFS_SPI_WRAPPER=y
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
+CONFIG_MULTIPLE_CBFS_INSTANCES=y
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -29,12 +29,14 @@ CONFIG_HAS_PRECBMEM_TIMESTAMP_REGION=y
 CONFIG_FLASHMAP_OFFSET=0x100000
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
+# CONFIG_BOOTBLOCK_CUSTOM is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
+CONFIG_C_ENVIRONMENT_BOOTBLOCK=y
 # CONFIG_UPDATE_IMAGE is not set
 CONFIG_GENERIC_GPIO_LIB=y
 CONFIG_BOARD_ID_AUTO=y
 CONFIG_RAM_CODE_SUPPORT=y
+# CONFIG_BOOTSPLASH_IMAGE is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 
 #
@@ -48,7 +50,6 @@ CONFIG_RAM_CODE_SUPPORT=y
 # CONFIG_VENDOR_AMD is not set
 # CONFIG_VENDOR_AOPEN is not set
 # CONFIG_VENDOR_APPLE is not set
-# CONFIG_VENDOR_ARIMA is not set
 # CONFIG_VENDOR_ARTECGROUP is not set
 # CONFIG_VENDOR_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
@@ -66,13 +67,13 @@ CONFIG_RAM_CODE_SUPPORT=y
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
 # CONFIG_VENDOR_EMULATION is not set
+# CONFIG_VENDOR_ESD is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
 CONFIG_VENDOR_GOOGLE=y
 # CONFIG_VENDOR_HP is not set
 # CONFIG_VENDOR_IBASE is not set
-# CONFIG_VENDOR_IBM is not set
 # CONFIG_VENDOR_IEI is not set
 # CONFIG_VENDOR_INTEL is not set
 # CONFIG_VENDOR_IWAVE is not set
@@ -86,11 +87,11 @@ CONFIG_VENDOR_GOOGLE=y
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
-# CONFIG_VENDOR_NEWISYS is not set
 # CONFIG_VENDOR_NOKIA is not set
 # CONFIG_VENDOR_NVIDIA is not set
 # CONFIG_VENDOR_PACKARDBELL is not set
 # CONFIG_VENDOR_PCENGINES is not set
+# CONFIG_VENDOR_PURISM is not set
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
@@ -115,22 +116,30 @@ CONFIG_MAX_CPUS=1
 # CONFIG_VGA_BIOS is not set
 CONFIG_UDELAY_IO=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAX_REBOOT_CNT=3
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_CBFS_SIZE=0x100000
+CONFIG_POST_DEVICE=y
 # CONFIG_BOARD_GOOGLE_AURON is not set
 # CONFIG_BOARD_GOOGLE_BOLT is not set
 # CONFIG_BOARD_GOOGLE_BUTTERFLY is not set
+# CONFIG_BOARD_GOOGLE_CHELL is not set
 # CONFIG_BOARD_GOOGLE_COSMOS is not set
 # CONFIG_BOARD_GOOGLE_CYAN is not set
 # CONFIG_BOARD_GOOGLE_DAISY is not set
 # CONFIG_BOARD_GOOGLE_FALCO is not set
 # CONFIG_BOARD_GOOGLE_FOSTER is not set
 # CONFIG_BOARD_GOOGLE_GLADOS is not set
+# CONFIG_BOARD_GOOGLE_GUADO is not set
 # CONFIG_BOARD_GOOGLE_JECHT is not set
+# CONFIG_BOARD_GOOGLE_LARS is not set
 # CONFIG_BOARD_GOOGLE_LINK is not set
 # CONFIG_BOARD_GOOGLE_NYAN is not set
 # CONFIG_BOARD_GOOGLE_NYAN_BIG is not set
 # CONFIG_BOARD_GOOGLE_NYAN_BLAZE is not set
+# CONFIG_BOARD_GOOGLE_OAK is not set
 # CONFIG_BOARD_GOOGLE_PANTHER is not set
 # CONFIG_BOARD_GOOGLE_PARROT is not set
 # CONFIG_BOARD_GOOGLE_PEACH_PIT is not set
@@ -144,6 +153,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 # CONFIG_BOARD_GOOGLE_SMAUG is not set
 # CONFIG_BOARD_GOOGLE_STORM is not set
 # CONFIG_BOARD_GOOGLE_STOUT is not set
+# CONFIG_BOARD_GOOGLE_TIDUS is not set
 # CONFIG_BOARD_GOOGLE_URARA is not set
 # CONFIG_BOARD_GOOGLE_VEYRON_GUS is not set
 # CONFIG_BOARD_GOOGLE_VEYRON_JAQ is not set
@@ -157,6 +167,7 @@ CONFIG_BOARD_GOOGLE_VEYRON_SPEEDY=y
 # CONFIG_BOARD_GOOGLE_VEYRON_THEA is not set
 # CONFIG_BOARD_GOOGLE_VEYRON_BRAIN is not set
 # CONFIG_BOARD_GOOGLE_VEYRON_DANGER is not set
+# CONFIG_BOARD_GOOGLE_VEYRON_EMILE is not set
 # CONFIG_BOARD_GOOGLE_VEYRON_MICKEY is not set
 # CONFIG_BOARD_GOOGLE_VEYRON_RIALTO is not set
 # CONFIG_BOARD_GOOGLE_VEYRON_ROMY is not set
@@ -169,11 +180,9 @@ CONFIG_CONSOLE_SERIAL_UART_ADDRESS=0xFF690000
 CONFIG_BOARD_GOOGLE_VEYRON=y
 CONFIG_EC_GOOGLE_CHROMEEC_SPI_WAKEUP_DELAY_US=100
 CONFIG_PMIC_BUS=0
-CONFIG_CBFS_SIZE=0x100000
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
-CONFIG_POST_DEVICE=y
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
+# CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_4096=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -187,7 +196,9 @@ CONFIG_COREBOOT_ROMSIZE_KB_4096=y
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=4096
 CONFIG_ROM_SIZE=0x400000
-# CONFIG_SYSTEM_TYPE_LAPTOP is not set
+CONFIG_FMDFILE="src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd"
+CONFIG_SYSTEM_TYPE_LAPTOP=y
+# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
 #
 # Chipset
@@ -197,10 +208,10 @@ CONFIG_ROM_SIZE=0x400000
 # SoC
 #
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
-CONFIG_BOOTBLOCK_CPU_INIT="soc/rockchip/rk3288/bootblock.c"
 CONFIG_TTYS0_BASE=0x3f8
 CONFIG_HEAP_SIZE=0x4000
 # CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
 # CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
@@ -232,12 +243,15 @@ CONFIG_NUM_IPI_STARTS=2
 # CONFIG_TSC_SYNC_MFENCE is not set
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_SMM_TSEG is not set
+# CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
+# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
 # CONFIG_SUPPORT_CPU_UCODE_IN_CBFS is not set
+# CONFIG_USES_MICROCODE_HEADER_FILES is not set
 
 #
 # Northbridge
@@ -290,6 +304,7 @@ CONFIG_VIRTUAL_DEV_SWITCH=y
 # CONFIG_PHYSICAL_REC_SWITCH is not set
 # CONFIG_LID_SWITCH is not set
 # CONFIG_WIPEOUT_SUPPORTED is not set
+# CONFIG_HAVE_REGULATORY_DOMAIN is not set
 # CONFIG_UEFI_2_4_BINDING is not set
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_BOOTBLOCK_ARM=y
@@ -306,7 +321,6 @@ CONFIG_ARCH_ROMSTAGE_ARMV7=y
 CONFIG_ARCH_RAMSTAGE_ARMV7=y
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
-# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -317,7 +331,6 @@ CONFIG_ARCH_RAMSTAGE_ARMV7=y
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
-# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARM64_A53_ERRATUM_843419 is not set
 # CONFIG_ARCH_MIPS is not set
 # CONFIG_ARCH_BOOTBLOCK_MIPS is not set
@@ -329,7 +342,6 @@ CONFIG_ARCH_RAMSTAGE_ARMV7=y
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
-# CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_X86 is not set
 # CONFIG_ARCH_BOOTBLOCK_X86_32 is not set
 # CONFIG_ARCH_VERSTAGE_X86_32 is not set
@@ -353,6 +365,7 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
 CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 # CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
 # CONFIG_PCI is not set
 # CONFIG_PXE_ROM is not set
@@ -386,8 +399,6 @@ CONFIG_I2C_TPM=y
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
-CONFIG_TPM_INIT_FAILURE_IS_FATAL=y
-CONFIG_SKIP_TPM_STARTUP_ON_NORMAL_BOOT=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
 CONFIG_SPI_FLASH=y
@@ -427,6 +438,10 @@ CONFIG_CONSOLE_SERIAL=y
 #
 # device-specific UART
 #
+
+#
+# Serial port base address = 0x3f8
+#
 CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
@@ -446,13 +461,16 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
-# CONFIG_NO_POST is not set
 # CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
+# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 # CONFIG_HAVE_ACPI_RESUME is not set
 CONFIG_HAVE_HARD_RESET=y
+# CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
+# CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
+# CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
 CONFIG_HAVE_MONOTONIC_TIMER=y
 CONFIG_GENERIC_UDELAY=y
 # CONFIG_TIMER_QUEUE is not set
@@ -465,6 +483,7 @@ CONFIG_GENERIC_UDELAY=y
 # CONFIG_VGA is not set
 # CONFIG_GFXUMA is not set
 # CONFIG_COMMON_FADT is not set
+# CONFIG_ACPI_NHLT is not set
 
 #
 # System tables
@@ -500,10 +519,10 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_TRACE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
+CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 # CONFIG_REG_SCRIPT is not set
-CONFIG_MAX_REBOOT_CNT=3
diff --git a/resources/libreboot/config/depthcharge/veyron_speedy/vbootrevision b/resources/libreboot/config/depthcharge/veyron_speedy/vbootrevision
index 1e02412..7f14b36 100644
--- a/resources/libreboot/config/depthcharge/veyron_speedy/vbootrevision
+++ b/resources/libreboot/config/depthcharge/veyron_speedy/vbootrevision
@@ -1 +1 @@
-fbf631c845c08299f0bcbae3f311c5807d34c0d6
+933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7