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

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

29 files changed, 369 insertions, 152 deletions

diff --git a/resources/depthcharge/patch/0001-arm-armv7-a-march-abi-flag-for-ARMv7-hardware.patch b/resources/depthcharge/patch/0001-arm-armv7-a-march-abi-flag-for-ARMv7-hardware.patch
index f295a63e..d99a574d 100644
--- a/resources/depthcharge/patch/0001-arm-armv7-a-march-abi-flag-for-ARMv7-hardware.patch
+++ b/resources/depthcharge/patch/0001-arm-armv7-a-march-abi-flag-for-ARMv7-hardware.patch
@@ -1,7 +1,7 @@
-From 095ae6281bb2d5bdab288fa042e5c4daa05c5ca3 Mon Sep 17 00:00:00 2001
+From 80e3428c2e50b5a6838d71a89007f610eda5e2dc Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
 Date: Mon, 3 Aug 2015 14:39:42 +0200
-Subject: [PATCH 1/7] arm: armv7-a march abi flag for ARMv7 hardware
+Subject: [PATCH 1/8] arm: armv7-a march abi flag for ARMv7 hardware
 
 Specifying the march is required to get depthcharge to build with e.g. the arm
 toolchain built by coreboot's crossgcc script. Without this flag, the toolchain
@@ -26,5 +26,5 @@ index b2fce32..455e370 100644
  
  ifeq ($(CONFIG_ARCH_ARM_V8),y)
 -- 
-1.9.1
+2.8.0
 
diff --git a/resources/depthcharge/patch/0002-Coreboot-image-integration-removal.patch b/resources/depthcharge/patch/0002-Coreboot-image-integration-removal.patch
index 28ee21ad..611be4ff 100644
--- a/resources/depthcharge/patch/0002-Coreboot-image-integration-removal.patch
+++ b/resources/depthcharge/patch/0002-Coreboot-image-integration-removal.patch
@@ -1,7 +1,7 @@
-From 4e7d727edf1939904bc516d569ceef9e295f454c Mon Sep 17 00:00:00 2001
+From f095d901afe02728fb0471d51e02553036cd2538 Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
 Date: Mon, 3 Aug 2015 14:49:34 +0200
-Subject: [PATCH 2/7] Coreboot image integration removal
+Subject: [PATCH 2/8] Coreboot image integration removal
 
 There is no need to integrate the built depthcharge binary inside a coreboot
 image right after building it, coreboot will handle this on its own.
@@ -29,5 +29,5 @@ index a73785b..564dd13 100644
  $(notdir $1)_unified: $1.bin $1.payload
  PHONY += $(notdir $1)_unified
 -- 
-1.9.1
+2.8.0
 
diff --git a/resources/depthcharge/patch/0003-DOTCONFIG-location-correction.patch b/resources/depthcharge/patch/0003-DOTCONFIG-location-correction.patch
index af070de5..d4b6ae98 100644
--- a/resources/depthcharge/patch/0003-DOTCONFIG-location-correction.patch
+++ b/resources/depthcharge/patch/0003-DOTCONFIG-location-correction.patch
@@ -1,7 +1,7 @@
-From 72bb1a69cf6c0f58d3c1a8f6ba98334640818566 Mon Sep 17 00:00:00 2001
+From dfdcd8c218215df4e1523bf6dd11270bc4f52605 Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
 Date: Sun, 9 Aug 2015 12:06:28 +0200
-Subject: [PATCH 3/7] DOTCONFIG location correction
+Subject: [PATCH 3/8] DOTCONFIG location correction
 
 The configuration file doesn't have to be in src and HAVE_DOTCONFIG holds its
 current location.
@@ -25,5 +25,5 @@ index a1a9d33..13305cd 100644
  ifeq ($(CONFIG_ARCH_X86),y)
  ARCH = x86
 -- 
-1.9.1
+2.8.0
 
diff --git a/resources/depthcharge/patch/0004-Adaptation-for-a-read-only-boot-path-when-no-vboot-h.patch b/resources/depthcharge/patch/0004-Adaptation-for-a-read-only-boot-path-when-no-vboot-h.patch
index 890791b2..ed491a4c 100644
--- a/resources/depthcharge/patch/0004-Adaptation-for-a-read-only-boot-path-when-no-vboot-h.patch
+++ b/resources/depthcharge/patch/0004-Adaptation-for-a-read-only-boot-path-when-no-vboot-h.patch
@@ -1,7 +1,7 @@
-From 5ad9900434045ea97c536c98cb514bdb43114c12 Mon Sep 17 00:00:00 2001
+From 0ec9edead1d9de5f913333e6aa77bcd3de83a617 Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
 Date: Sun, 9 Aug 2015 12:09:35 +0200
-Subject: [PATCH 4/7] Adaptation for a read-only boot path when no vboot
+Subject: [PATCH 4/8] Adaptation for a read-only boot path when no vboot
  handoff data is found
 
 When no vboot handoff data is found, this makes the unified depthcharge build
@@ -128,5 +128,5 @@ index 10fcb93..575dcfd 100644
  	return 0;
  }
 -- 
-1.9.1
+2.8.0
 
diff --git a/resources/depthcharge/patch/0005-vboot-Only-initialize-cparams-once.patch b/resources/depthcharge/patch/0005-vboot-Only-initialize-cparams-once.patch
new file mode 100644
index 00000000..8bc56a73
--- /dev/null
+++ b/resources/depthcharge/patch/0005-vboot-Only-initialize-cparams-once.patch
@@ -0,0 +1,34 @@
+From 40668e8b5fb9a9e07a3b1ddf334bd4e12a38525f Mon Sep 17 00:00:00 2001
+From: Paul Kocialkowski <contact@paulk.fr>
+Date: Mon, 18 Apr 2016 11:14:19 +0200
+Subject: [PATCH 5/8] vboot: Only initialize cparams once
+
+Calling common_params_init multiple times in a row results in emptying cparams
+each time, causing the GBB data to be lost as it is only read once (the first
+time).
+
+Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
+---
+ src/vboot/util/commonparams.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/vboot/util/commonparams.c b/src/vboot/util/commonparams.c
+index 9f29473..3a71a8b 100644
+--- a/src/vboot/util/commonparams.c
++++ b/src/vboot/util/commonparams.c
+@@ -159,8 +159,10 @@ int is_cparams_initialized(void)
+ int common_params_init(int clear_shared_data)
+ {
+ 	// Set up the common param structure.
+-	memset(&cparams, 0, sizeof(cparams));
+-	cparams_initialized = 1;
++	if (!is_cparams_initialized()) {
++		memset(&cparams, 0, sizeof(cparams));
++		cparams_initialized = 1;
++	}
+ 
+ 	if (gbb_init())
+ 		return 1;
+-- 
+2.8.0
+
diff --git a/resources/depthcharge/patch/0005-Proper-firmware-index-report-for-read-only-boot-path.patch b/resources/depthcharge/patch/0006-Proper-firmware-index-report-for-read-only-boot-path.patch
index d883cbdf..7692ff2b 100644
--- a/resources/depthcharge/patch/0005-Proper-firmware-index-report-for-read-only-boot-path.patch
+++ b/resources/depthcharge/patch/0006-Proper-firmware-index-report-for-read-only-boot-path.patch
@@ -1,7 +1,7 @@
-From dce70fb042d91ba74359a6dfb519f31d77e2c328 Mon Sep 17 00:00:00 2001
+From 8acd4854603672dd1bc16900c9eb58dd5c8c342d Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
 Date: Mon, 10 Aug 2015 20:24:50 +0200
-Subject: [PATCH 5/7] Proper firmware index report for read-only boot path
+Subject: [PATCH 6/8] Proper firmware index report for read-only boot path
 
 When booting from a read-only boot path, the active firmware to report is RO.
 This is detected with the lack of a vboot handoff pointer.
@@ -66,5 +66,5 @@ index fb6f206..090e9d1 100644
  int get_active_fw_size(void);
  
 -- 
-1.9.1
+2.8.0
 
diff --git a/resources/depthcharge/patch/0006-fdt-nonvolatile-context-storage-report-to-mkbp-for-E.patch b/resources/depthcharge/patch/0007-fdt-nonvolatile-context-storage-report-to-mkbp-for-E.patch
index 7b39db6b..bfbe96b8 100644
--- a/resources/depthcharge/patch/0006-fdt-nonvolatile-context-storage-report-to-mkbp-for-E.patch
+++ b/resources/depthcharge/patch/0007-fdt-nonvolatile-context-storage-report-to-mkbp-for-E.patch
@@ -1,7 +1,7 @@
-From 9eb389b0273cf07add859cd162c1411d15806149 Mon Sep 17 00:00:00 2001
+From ff08bf3966b3c299d6ead9707cc17a71ff9e50c7 Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
 Date: Mon, 10 Aug 2015 20:30:14 +0200
-Subject: [PATCH 6/7] fdt: nonvolatile-context-storage report to mkbp for EC NV
+Subject: [PATCH 7/8] fdt: nonvolatile-context-storage report to mkbp for EC NV
  storage
 
 This allows old versions of crossystem to detect that it should use mosys to
@@ -26,5 +26,5 @@ index a79b192..0487513 100644
  		dt_add_string_prop(node, "nonvolatile-context-storage", "disk");
  		dt_add_u32_prop(node, "nonvolatile-context-lba",
 -- 
-1.9.1
+2.8.0
 
diff --git a/resources/depthcharge/patch/0007-vboot-Display-callbacks-for-developer-and-recovery-m.patch b/resources/depthcharge/patch/0008-vboot-Display-callbacks-for-developer-and-recovery-m.patch
index ea061212..cacc3ecd 100644
--- a/resources/depthcharge/patch/0007-vboot-Display-callbacks-for-developer-and-recovery-m.patch
+++ b/resources/depthcharge/patch/0008-vboot-Display-callbacks-for-developer-and-recovery-m.patch
@@ -1,7 +1,7 @@
-From 541a3f09ecb062e3f0778eb9846732cfabcbfbba Mon Sep 17 00:00:00 2001
+From 50a27cb948d3e944e3e466146b0d81939e8ce9a5 Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
 Date: Tue, 11 Aug 2015 11:22:54 +0200
-Subject: [PATCH 7/7] vboot: Display callbacks for developer and recovery mode
+Subject: [PATCH 8/8] vboot: Display callbacks for developer and recovery mode
  screens
 
 We don't want to use bitmaps stored in GBB since they recommend the use of non-
@@ -9,22 +9,27 @@ free software (Chrome OS), so this implements a text-based interface instead.
 
 Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
 ---
- src/vboot/callbacks/display.c | 168 +++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 156 insertions(+), 12 deletions(-)
+ src/vboot/callbacks/display.c | 200 ++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 185 insertions(+), 15 deletions(-)
 
 diff --git a/src/vboot/callbacks/display.c b/src/vboot/callbacks/display.c
-index efa0691..b659f7b 100644
+index 183e278..ece9140 100644
 --- a/src/vboot/callbacks/display.c
 +++ b/src/vboot/callbacks/display.c
-@@ -84,9 +84,17 @@ void print_on_center(const char *msg)
+@@ -86,12 +86,19 @@ void print_on_center(const char *msg)
  	print_string(msg);
  }
  
--VbError_t VbExDisplayScreen(uint32_t screen_type)
-+VbError_t VbExDisplayScreen(uint32_t screen_type, VbNvContext *vnc)
+-VbError_t VbExDisplayScreen(uint32_t screen_type, uint32_t locale)
++VbError_t VbExDisplayScreen(uint32_t screen_type, VbNvContext *vnc,
++                            uint32_t locale)
  {
 -	const char *msg = NULL;
+-
+-	if (vboot_draw_screen(screen_type, locale) == CBGFX_SUCCESS)
+-		return VBERROR_SUCCESS;
 +	unsigned int rows, cols;
++	uint32_t default_boot = 0;
 +	uint32_t boot_signed_only = 0;
 +	uint32_t boot_usb = 0;
 +	uint32_t boot_legacy = 0;
@@ -36,7 +41,7 @@ index efa0691..b659f7b 100644
  
  	/*
  	 * Show the debug messages for development. It is a backup method
-@@ -98,31 +106,167 @@ VbError_t VbExDisplayScreen(uint32_t screen_type)
+@@ -103,31 +110,194 @@ VbError_t VbExDisplayScreen(uint32_t screen_type, uint32_t locale)
  		video_console_clear();
  		break;
  	case VB_SCREEN_DEVELOPER_WARNING:
@@ -50,6 +55,8 @@ index efa0691..b659f7b 100644
 +
 +			VbNvGet(vnc, VBNV_DEV_BOOT_USB, &boot_usb);
 +			VbNvGet(vnc, VBNV_DEV_BOOT_LEGACY, &boot_legacy);
++
++			VbNvGet(vnc, VBNV_DEV_DEFAULT_BOOT, &default_boot);
 +		}
 +
 +		print_string(
@@ -89,6 +96,25 @@ index efa0691..b659f7b 100644
 +
 +			if (!boot_signed_only || boot_usb)
 +				print_string("\n");
++
++			print_string("Default boot medium: ");
++
++			switch (default_boot) {
++				case VBNV_DEV_DEFAULT_BOOT_DISK:
++					print_string("internal storage");
++					break;
++				case VBNV_DEV_DEFAULT_BOOT_USB:
++					print_string("external media");
++					break;
++				case VBNV_DEV_DEFAULT_BOOT_LEGACY:
++					print_string("legacy payload");
++					break;
++				default:
++					print_string("unknown");
++					break;
++			}
++
++			print_string("\n");
 +		}
 +
 +		find_common_params(&blob, &size);
@@ -202,6 +228,12 @@ index efa0691..b659f7b 100644
 +	case VB_SCREEN_TO_NORM_CONFIRMED:
 +		video_console_clear();
 +		print_on_center("Disabling developer mode.");
++		break;
++	case VB_SCREEN_OS_BROKEN:
++		video_console_clear();
++		print_on_center(
++			"Something went wrong and the device cannot boot.\n"
++			"Press Escape + Refresh + Power to access recovery.");
  		break;
  	default:
  		printf("Not a valid screen type: %d.\n", screen_type);
@@ -215,5 +247,5 @@ index efa0691..b659f7b 100644
  }
  
 -- 
-1.9.1
+2.8.0
 
diff --git a/resources/libreboot/config/depthcharge/veyron_speedy/cbrevision b/resources/libreboot/config/depthcharge/veyron_speedy/cbrevision
index 5c2d6062..073d4138 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 4abf2012..673759a2 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 1e02412a..7f14b36f 100644
--- a/resources/libreboot/config/depthcharge/veyron_speedy/vbootrevision
+++ b/resources/libreboot/config/depthcharge/veyron_speedy/vbootrevision
@@ -1 +1 @@
-fbf631c845c08299f0bcbae3f311c5807d34c0d6
+933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7
diff --git a/resources/libreboot/patch/coreboot/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0001-util-xcompile-Detect-toolchains-with-bare-arm-prefix.patch b/resources/libreboot/patch/coreboot/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0001-util-xcompile-Detect-toolchains-with-bare-arm-prefix.patch
new file mode 100644
index 00000000..1e71ecfa
--- /dev/null
+++ b/resources/libreboot/patch/coreboot/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0001-util-xcompile-Detect-toolchains-with-bare-arm-prefix.patch
@@ -0,0 +1,26 @@
+From 1a378294fa9afdc4d6d3b0e580ba78d33a62d044 Mon Sep 17 00:00:00 2001
+From: Paul Kocialkowski <contact@paulk.fr>
+Date: Tue, 19 Apr 2016 12:02:14 +0200
+Subject: [PATCH 1/4] util: xcompile: Detect toolchains with bare arm prefix
+
+Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
+---
+ util/xcompile/xcompile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
+index b0199eb..1765183 100755
+--- a/util/xcompile/xcompile
++++ b/util/xcompile/xcompile
+@@ -290,7 +290,7 @@ SUPPORTED_ARCHITECTURES="arm arm64 mipsel riscv x64 x86 power8"
+ arch_config_arm() {
+ 	TARCH="arm"
+ 	TBFDARCHS="littlearm"
+-	TCLIST="armv7-a armv7a"
++	TCLIST="armv7-a armv7a arm"
+ 	TWIDTH="32"
+ 	TSUPP="arm armv4 armv7 armv7_m"
+ 	TABI="eabi"
+-- 
+2.8.0
+
diff --git a/resources/libreboot/patch/coreboot/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0002-libpayload-use-32bit-access-when-accessing-4byte-wid.patch b/resources/libreboot/patch/coreboot/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0002-libpayload-use-32bit-access-when-accessing-4byte-wid.patch
new file mode 100644
index 00000000..b38cf561
--- /dev/null
+++ b/resources/libreboot/patch/coreboot/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0002-libpayload-use-32bit-access-when-accessing-4byte-wid.patch
@@ -0,0 +1,48 @@
+From be5ba870e006e8e7fe0f1ace2952b540c3aec3d9 Mon Sep 17 00:00:00 2001
+From: Patrick Georgi <pgeorgi@chromium.org>
+Date: Mon, 8 Feb 2016 21:17:12 +0100
+Subject: [PATCH 2/4] libpayload: use 32bit access when accessing 4byte wide
+ uart registers
+
+This fixes serial on rk3288.
+
+Change-Id: I3dbf3cc165e516ed7b0132332624f882c0c9b27f
+Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
+Reviewed-on: https://review.coreboot.org/13636
+Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
+Tested-by: build bot (Jenkins)
+---
+ payloads/libpayload/drivers/serial/8250.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/payloads/libpayload/drivers/serial/8250.c b/payloads/libpayload/drivers/serial/8250.c
+index 7fe9920..0386f23 100644
+--- a/payloads/libpayload/drivers/serial/8250.c
++++ b/payloads/libpayload/drivers/serial/8250.c
+@@ -46,7 +46,10 @@ static uint8_t serial_read_reg(int offset)
+ 		return inb(IOBASE + offset);
+ 	else
+ #endif
+-		return readb(MEMBASE + offset);
++		if (lib_sysinfo.serial->regwidth == 4)
++			return readl(MEMBASE + offset) & 0xff;
++		else
++			return readb(MEMBASE + offset);
+ }
+ 
+ static void serial_write_reg(uint8_t val, int offset)
+@@ -58,7 +61,10 @@ static void serial_write_reg(uint8_t val, int offset)
+ 		outb(val, IOBASE + offset);
+ 	else
+ #endif
+-		writeb(val, MEMBASE + offset);
++		if (lib_sysinfo.serial->regwidth == 4)
++			writel(val & 0xff, MEMBASE + offset);
++		else
++			writeb(val, MEMBASE + offset);
+ }
+ 
+ #if IS_ENABLED(CONFIG_LP_SERIAL_SET_SPEED)
+-- 
+2.8.0
+
diff --git a/resources/libreboot/patch/coreboot/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0003-rockchip-rk3288-UART-uses-32bit-wide-registers.patch b/resources/libreboot/patch/coreboot/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0003-rockchip-rk3288-UART-uses-32bit-wide-registers.patch
new file mode 100644
index 00000000..8a2d2533
--- /dev/null
+++ b/resources/libreboot/patch/coreboot/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0003-rockchip-rk3288-UART-uses-32bit-wide-registers.patch
@@ -0,0 +1,31 @@
+From 02bc24a863a9b580d5eb32b780296ff8a5c3d2c1 Mon Sep 17 00:00:00 2001
+From: Patrick Georgi <pgeorgi@chromium.org>
+Date: Mon, 8 Feb 2016 20:28:32 +0100
+Subject: [PATCH 3/4] rockchip/rk3288: UART uses 32bit wide registers
+
+Change-Id: I084eb4694a2aa8f66afc1f3148480608ac3ff02b
+Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
+Reviewed-on: https://review.coreboot.org/13635
+Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
+Tested-by: build bot (Jenkins)
+Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
+---
+ src/soc/rockchip/rk3288/uart.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/soc/rockchip/rk3288/uart.c b/src/soc/rockchip/rk3288/uart.c
+index 9847734..8576dc1 100644
+--- a/src/soc/rockchip/rk3288/uart.c
++++ b/src/soc/rockchip/rk3288/uart.c
+@@ -155,7 +155,7 @@ void uart_fill_lb(void *data)
+ 	serial.type = LB_SERIAL_TYPE_MEMORY_MAPPED;
+ 	serial.baseaddr = CONFIG_CONSOLE_SERIAL_UART_ADDRESS;
+ 	serial.baud = default_baudrate();
+-	serial.regwidth = 1;
++	serial.regwidth = 4;
+ 	lb_add_serial(&serial, data);
+ 
+ 	lb_add_console(LB_TAG_CONSOLE_SERIAL8250MEM, data);
+-- 
+2.8.0
+
diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/depthcharge/veyron_speedy/0001-chromeos-Allow-disabling-vboot-firmware-verification.patch b/resources/libreboot/patch/coreboot/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0004-chromeos-Allow-disabling-vboot-firmware-verification.patch
index f268922a..1139490a 100644
--- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/depthcharge/veyron_speedy/0001-chromeos-Allow-disabling-vboot-firmware-verification.patch
+++ b/resources/libreboot/patch/coreboot/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0004-chromeos-Allow-disabling-vboot-firmware-verification.patch
@@ -1,8 +1,8 @@
-From 2178bea1fbef28afbb9ffa2d95673407fac1907e Mon Sep 17 00:00:00 2001
+From 1122f7a00ad7b9cab11a548ed2ba24536bfc194e Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
 Date: Sun, 9 Aug 2015 10:23:38 +0200
-Subject: [PATCH] chromeos: Allow disabling vboot firmware verification when
- ChromeOS is enabled
+Subject: [PATCH 4/4] chromeos: Allow disabling vboot firmware verification
+ when ChromeOS is enabled
 
 Some ChromeOS bindings might be wanted without using vboot verification, for
 instance to boot up depthcharge from the version of Coreboot installed in the
@@ -22,15 +22,15 @@ Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
 ---
  src/lib/bootmode.c                            | 2 ++
  src/soc/rockchip/rk3288/Kconfig               | 2 +-
- src/vendorcode/google/chromeos/Kconfig        | 2 +-
+ src/vendorcode/google/chromeos/Kconfig        | 4 +---
  src/vendorcode/google/chromeos/vboot2/Kconfig | 4 ++++
- 4 files changed, 8 insertions(+), 2 deletions(-)
+ 4 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c
-index f2ff72a..13c0130 100644
+index 15f7a5a..e4be29e 100644
 --- a/src/lib/bootmode.c
 +++ b/src/lib/bootmode.c
-@@ -80,8 +80,10 @@ void gfx_set_init_done(int done)
+@@ -76,8 +76,10 @@ void gfx_set_init_done(int done)
  int display_init_required(void)
  {
  	/* For Chrome OS always honor vboot_skip_display_init(). */
@@ -42,10 +42,10 @@ index f2ff72a..13c0130 100644
  	/* By default always initialize display. */
  	return 1;
 diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig
-index bc484e3..74a63e7 100644
+index 65e6dc3..7947514 100644
 --- a/src/soc/rockchip/rk3288/Kconfig
 +++ b/src/soc/rockchip/rk3288/Kconfig
-@@ -35,7 +35,7 @@ config SOC_ROCKCHIP_RK3288
+@@ -31,7 +31,7 @@ config SOC_ROCKCHIP_RK3288
  
  if SOC_ROCKCHIP_RK3288
  
@@ -55,18 +55,32 @@ index bc484e3..74a63e7 100644
  	select SEPARATE_VERSTAGE
  	select RETURN_FROM_VERSTAGE
 diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig
-index 8309d19..694e0d7 100644
+index d2a42a1..4068419 100644
 --- a/src/vendorcode/google/chromeos/Kconfig
 +++ b/src/vendorcode/google/chromeos/Kconfig
-@@ -31,7 +31,6 @@ config CHROMEOS
+@@ -27,7 +27,6 @@ config CHROMEOS
  	select BOOTMODE_STRAPS
- 	select ELOG
+ 	select ELOG if SPI_FLASH
  	select COLLECT_TIMESTAMPS
 -	select VBOOT_VERIFY_FIRMWARE
+ 	select MULTIPLE_CBFS_INSTANCES
  	help
  	  Enable ChromeOS specific features like the GPIO sub table in
- 	  the coreboot table. NOTE: Enabling this option on an unsupported
-@@ -129,6 +128,7 @@ config VIRTUAL_DEV_SWITCH
+@@ -96,7 +95,6 @@ config CHROMEOS_RAMOOPS_RAM_SIZE
+ config EC_SOFTWARE_SYNC
+ 	bool "Enable EC software sync"
+ 	default n
+-	depends on VBOOT_VERIFY_FIRMWARE
+ 	help
+ 	  EC software sync is a mechanism where the AP helps the EC verify its
+ 	  firmware similar to how vboot verifies the main system firmware. This
+@@ -120,12 +118,12 @@ config VBOOT_OPROM_MATTERS
+ config VIRTUAL_DEV_SWITCH
+ 	bool "Virtual developer switch support"
+ 	default n
+-	depends on VBOOT_VERIFY_FIRMWARE
+ 	help
+ 	  Whether this platform has a virtual developer switch.
  
  config VBOOT_VERIFY_FIRMWARE
  	bool "Verify firmware with vboot."
@@ -75,11 +89,11 @@ index 8309d19..694e0d7 100644
  	depends on HAVE_HARD_RESET
  	help
 diff --git a/src/vendorcode/google/chromeos/vboot2/Kconfig b/src/vendorcode/google/chromeos/vboot2/Kconfig
-index 930b009..610a847 100644
+index 7580d8d..141b636 100644
 --- a/src/vendorcode/google/chromeos/vboot2/Kconfig
 +++ b/src/vendorcode/google/chromeos/vboot2/Kconfig
-@@ -16,6 +16,8 @@
- ## Foundation, Inc.
+@@ -12,6 +12,8 @@
+ ## GNU General Public License for more details.
  ##
  
 +if VBOOT_VERIFY_FIRMWARE
@@ -87,12 +101,12 @@ index 930b009..610a847 100644
  config VBOOT_STARTS_IN_BOOTBLOCK
  	bool "Vboot starts verifying in bootblock"
  	default n
-@@ -133,3 +135,5 @@ config VBOOT_DYNAMIC_WORK_BUFFER
+@@ -78,3 +80,5 @@ config VBOOT_DYNAMIC_WORK_BUFFER
  	  ram to allocate the vboot work buffer. That means vboot verification
  	  is after memory init and requires main memory to back the work
  	  buffer.
 +
 +endif # VBOOT_VERIFY_FIRMWARE
 -- 
-1.9.1
+2.8.0
 
diff --git a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0001-firmware-Developer-mode-timeout-delay-shortening-dow.patch b/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0001-firmware-Developer-mode-timeout-delay-shortening-dow.patch
index f843e506..53fc563e 100644
--- a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0001-firmware-Developer-mode-timeout-delay-shortening-dow.patch
+++ b/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0001-firmware-Developer-mode-timeout-delay-shortening-dow.patch
@@ -1,4 +1,4 @@
-From eaf081085930dd7614e2f77bbc1f80d6b1e003eb Mon Sep 17 00:00:00 2001
+From fe4c243dac0d308746c0103aa22b5e6f29dd494c Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
 Date: Mon, 10 Aug 2015 20:33:23 +0200
 Subject: [PATCH 1/7] firmware: Developer mode timeout delay shortening (down
@@ -12,11 +12,11 @@ Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/firmware/lib/vboot_audio.c b/firmware/lib/vboot_audio.c
-index e24a039..f96d5f4 100644
+index 6071b0d..fd03bfd 100644
 --- a/firmware/lib/vboot_audio.c
 +++ b/firmware/lib/vboot_audio.c
 @@ -30,11 +30,7 @@
- #define MAX_CUSTOM_DELAY      60000
+ #define MAX_CUSTOM_DELAY      300000
  
  /* These are visible externally only to make testing easier */
 -VbDevMusicNote default_notes_[] = { {20000, 0}, /* 20 seconds */
@@ -29,5 +29,5 @@ index e24a039..f96d5f4 100644
  
  VbDevMusicNote short_notes_[] = { {2000, 0} }; /* two seconds */
 -- 
-1.9.1
+2.8.0
 
diff --git a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0002-firmware-Text-based-screen-display-in-priority.patch b/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0002-firmware-Text-based-screen-display-in-priority.patch
index 3e2a997d..669e6ded 100644
--- a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0002-firmware-Text-based-screen-display-in-priority.patch
+++ b/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0002-firmware-Text-based-screen-display-in-priority.patch
@@ -1,4 +1,4 @@
-From ceb9ba56a8ef48e18712c38d97b8541a324c7edd Mon Sep 17 00:00:00 2001
+From b3b529bec8f07557632510663a350f6d2abbe742 Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
 Date: Mon, 10 Aug 2015 22:44:50 +0200
 Subject: [PATCH 2/7] firmware: Text-based screen display in priority
@@ -13,27 +13,27 @@ Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
  1 file changed, 4 insertions(+), 5 deletions(-)
 
 diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
-index c3cc636..542aaed 100644
+index f2978fb..b95a1eb 100644
 --- a/firmware/lib/vboot_display.c
 +++ b/firmware/lib/vboot_display.c
-@@ -324,13 +324,12 @@ VbError_t VbDisplayScreen(VbCommonParams *cparams, uint32_t screen,
+@@ -339,13 +339,12 @@ static VbError_t VbDisplayScreenLegacy(VbCommonParams *cparams, uint32_t screen,
  	/* Request the screen */
  	disp_current_screen = screen;
  
 -	/* Look in the GBB first */
 -	if (VBERROR_SUCCESS == VbDisplayScreenFromGBB(cparams, screen,
--						      vncptr))
+-						      vncptr, locale))
 +	/* Display default first */
-+	if (VBERROR_SUCCESS == VbExDisplayScreen(screen))
++	if (VBERROR_SUCCESS == VbExDisplayScreen(screen, locale))
  		return VBERROR_SUCCESS;
  
 -	/* If screen wasn't in the GBB bitmaps, fall back to a default */
--	return VbExDisplayScreen(screen);
+-	return VbExDisplayScreen(screen, locale);
 +	/* If default doesn't have anything to show, fall back to GBB bitmaps */
-+	return VbDisplayScreenFromGBB(cparams, screen,  vncptr);
++	return VbDisplayScreenFromGBB(cparams, screen, vncptr, locale);
  }
  
- static void Uint8ToString(char *buf, uint8_t val)
+ VbError_t VbDisplayScreen(VbCommonParams *cparams, uint32_t screen,
 -- 
-1.9.1
+2.8.0
 
diff --git a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0003-firmware-NV-context-pointer-handoff-to-VbExDisplaySc.patch b/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0003-firmware-NV-context-pointer-handoff-to-VbExDisplaySc.patch
index a9d85a07..c82c546f 100644
--- a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0003-firmware-NV-context-pointer-handoff-to-VbExDisplaySc.patch
+++ b/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0003-firmware-NV-context-pointer-handoff-to-VbExDisplaySc.patch
@@ -1,4 +1,4 @@
-From 5bd1373a9313bc31bacb2d765ede2c19242a7e9b Mon Sep 17 00:00:00 2001
+From 948b65615a4e84baa5862633e13705d1f283f0db Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
 Date: Mon, 10 Aug 2015 22:46:43 +0200
 Subject: [PATCH 3/7] firmware: NV context pointer handoff to VbExDisplayScreen
@@ -8,14 +8,14 @@ so it makes sense to pass that pointer along.
 
 Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
 ---
- firmware/include/vboot_api.h    | 3 ++-
- firmware/lib/vboot_display.c    | 2 +-
- firmware/stub/vboot_api_stub.c  | 2 +-
- tests/vboot_api_devmode_tests.c | 2 +-
- 4 files changed, 5 insertions(+), 4 deletions(-)
+ firmware/include/vboot_api.h    | 4 +++-
+ firmware/lib/vboot_display.c    | 4 ++--
+ firmware/stub/vboot_api_stub.c  | 3 ++-
+ tests/vboot_api_devmode_tests.c | 3 ++-
+ 4 files changed, 9 insertions(+), 5 deletions(-)
 
 diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h
-index 7e94773..66d1ee4 100644
+index ddc8cc6..c98fca4 100644
 --- a/firmware/include/vboot_api.h
 +++ b/firmware/include/vboot_api.h
 @@ -24,6 +24,7 @@
@@ -26,54 +26,66 @@ index 7e94773..66d1ee4 100644
  #include "gpt.h"
  
  /*****************************************************************************/
-@@ -765,7 +766,7 @@ VbError_t VbExDisplaySetDimension(uint32_t width, uint32_t height);
+@@ -771,7 +772,8 @@ VbError_t VbExDisplaySetDimension(uint32_t width, uint32_t height);
   * to be simple ASCII text such as "NO GOOD" or "INSERT"; these screens should
   * only be seen during development.
   */
--VbError_t VbExDisplayScreen(uint32_t screen_type);
-+VbError_t VbExDisplayScreen(uint32_t screen_type, VbNvContext *vnc);
+-VbError_t VbExDisplayScreen(uint32_t screen_type, uint32_t locale);
++VbError_t VbExDisplayScreen(uint32_t screen_type, VbNvContext *vnc,
++                            uint32_t locale);
  
  /**
   * Write an image to the display, with the upper left corner at the specified
 diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
-index 542aaed..0158cc2 100644
+index b95a1eb..472ca91 100644
 --- a/firmware/lib/vboot_display.c
 +++ b/firmware/lib/vboot_display.c
-@@ -325,7 +325,7 @@ VbError_t VbDisplayScreen(VbCommonParams *cparams, uint32_t screen,
+@@ -340,7 +340,7 @@ static VbError_t VbDisplayScreenLegacy(VbCommonParams *cparams, uint32_t screen,
  	disp_current_screen = screen;
  
  	/* Display default first */
--	if (VBERROR_SUCCESS == VbExDisplayScreen(screen))
-+	if (VBERROR_SUCCESS == VbExDisplayScreen(screen, vncptr))
+-	if (VBERROR_SUCCESS == VbExDisplayScreen(screen, locale))
++	if (VBERROR_SUCCESS == VbExDisplayScreen(screen, vncptr, locale))
  		return VBERROR_SUCCESS;
  
  	/* If default doesn't have anything to show, fall back to GBB bitmaps */
+@@ -357,7 +357,7 @@ VbError_t VbDisplayScreen(VbCommonParams *cparams, uint32_t screen,
+ 	VbNvGet(vncptr, VBNV_LOCALIZATION_INDEX, &locale);
+ 
+ 	if (gbb->bmpfv_size == 0) {
+-		VbError_t ret = VbExDisplayScreen(screen, locale);
++		VbError_t ret = VbExDisplayScreen(screen, vncptr, locale);
+ 
+ 		/* Keep track of the currently displayed screen */
+ 		if (ret == VBERROR_SUCCESS)
 diff --git a/firmware/stub/vboot_api_stub.c b/firmware/stub/vboot_api_stub.c
-index 7320b6c..f773b6e 100644
+index 2299a03..9c86fc7 100644
 --- a/firmware/stub/vboot_api_stub.c
 +++ b/firmware/stub/vboot_api_stub.c
-@@ -43,7 +43,7 @@ VbError_t VbExDisplaySetDimension(uint32_t width, uint32_t height)
+@@ -43,7 +43,8 @@ VbError_t VbExDisplaySetDimension(uint32_t width, uint32_t height)
  	return VBERROR_SUCCESS;
  }
  
--VbError_t VbExDisplayScreen(uint32_t screen_type)
-+VbError_t VbExDisplayScreen(uint32_t screen_type, VbNvContext *vnc)
+-VbError_t VbExDisplayScreen(uint32_t screen_type, uint32_t locale)
++VbError_t VbExDisplayScreen(uint32_t screen_type, VbNvContext *vnc,
++                            uint32_t locale)
  {
  	return VBERROR_SUCCESS;
  }
 diff --git a/tests/vboot_api_devmode_tests.c b/tests/vboot_api_devmode_tests.c
-index 925a146..af90f7f 100644
+index cd927a8..16abc6e 100644
 --- a/tests/vboot_api_devmode_tests.c
 +++ b/tests/vboot_api_devmode_tests.c
-@@ -265,7 +265,7 @@ VbError_t VbExBeep(uint32_t msec, uint32_t frequency) {
+@@ -265,7 +265,8 @@ VbError_t VbExBeep(uint32_t msec, uint32_t frequency) {
    return beep_return;
  }
  
--VbError_t VbExDisplayScreen(uint32_t screen_type) {
-+VbError_t VbExDisplayScreen(uint32_t screen_type, VbNvContext *vnc) {
+-VbError_t VbExDisplayScreen(uint32_t screen_type, uint32_t locale) {
++VbError_t VbExDisplayScreen(uint32_t screen_type, VbNvContext *vnc,
++                            uint32_t locale) {
    switch(screen_type) {
    case VB_SCREEN_BLANK:
      VBDEBUG(("VbExDisplayScreen(BLANK)\n"));
 -- 
-1.9.1
+2.8.0
 
diff --git a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0004-firmware-Hold-key-combination-in-developer-mode.patch b/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0004-firmware-Hold-key-combination-in-developer-mode.patch
index 1980d773..1a7db50d 100644
--- a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0004-firmware-Hold-key-combination-in-developer-mode.patch
+++ b/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0004-firmware-Hold-key-combination-in-developer-mode.patch
@@ -1,4 +1,4 @@
-From 741adbf4fdb4ef72245f9373a2980ecade41f3f5 Mon Sep 17 00:00:00 2001
+From 1c60b7224562b50a9aef90d533cdfd918dced867 Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
 Date: Mon, 10 Aug 2015 22:59:50 +0200
 Subject: [PATCH 4/7] firmware: Hold key combination in developer mode
@@ -7,23 +7,22 @@ This binds the Ctrl + H key combination to hold the developer mode screen.
 
 Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
 ---
- firmware/lib/vboot_api_kernel.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
+ firmware/lib/vboot_api_kernel.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
-index 312014b..e191137 100644
+index fff3056..5e784eb 100644
 --- a/firmware/lib/vboot_api_kernel.c
 +++ b/firmware/lib/vboot_api_kernel.c
-@@ -251,7 +251,7 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
- 	GoogleBinaryBlockHeader *gbb = cparams->gbb;
- 	VbSharedDataHeader *shared =
- 		(VbSharedDataHeader *)cparams->shared_data_blob;
--	uint32_t allow_usb = 0, allow_legacy = 0, ctrl_d_pressed = 0;
-+	uint32_t allow_usb = 0, allow_legacy = 0, ctrl_d_pressed = 0, hold = 0;
+@@ -292,6 +292,7 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
+ 	uint32_t use_legacy = 0;
+ 	uint32_t default_boot = 0;
+ 	uint32_t ctrl_d_pressed = 0;
++	uint32_t hold = 0;
+ 
  	VbAudioContext *audio = 0;
  
- 	VBDEBUG(("Entering %s()\n", __func__));
-@@ -364,6 +364,12 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
+@@ -417,6 +418,12 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
  			ctrl_d_pressed = 1;
  			goto fallout;
  			break;
@@ -36,7 +35,7 @@ index 312014b..e191137 100644
  		case 0x0c:
  			VBDEBUG(("VbBootDeveloper() - "
  				 "user pressed Ctrl+L; Try legacy boot\n"));
-@@ -430,7 +436,7 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
+@@ -467,7 +474,7 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
  			VbCheckDisplayKey(cparams, key, &vnc);
  			break;
  		}
@@ -46,5 +45,5 @@ index 312014b..e191137 100644
   fallout:
  
 -- 
-1.9.1
+2.8.0
 
diff --git a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0005-firmware-Screen-blank-and-wait-at-disabled-USB-boot-.patch b/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0005-firmware-Screen-blank-and-wait-at-disabled-USB-boot-.patch
index 82d0d951..152aee80 100644
--- a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0005-firmware-Screen-blank-and-wait-at-disabled-USB-boot-.patch
+++ b/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0005-firmware-Screen-blank-and-wait-at-disabled-USB-boot-.patch
@@ -1,4 +1,4 @@
-From 05a34ae55a702d0e415811fedb959f71bbd782d5 Mon Sep 17 00:00:00 2001
+From 5f41175ef44c71f2aa3e3bebd33a079c93f60a5f Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
 Date: Mon, 10 Aug 2015 23:13:49 +0200
 Subject: [PATCH 5/7] firmware: Screen blank and wait at disabled USB boot
@@ -14,18 +14,18 @@ Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
-index e191137..6463571 100644
+index 5e784eb..7d22c93 100644
 --- a/firmware/lib/vboot_api_kernel.c
 +++ b/firmware/lib/vboot_api_kernel.c
-@@ -266,6 +266,7 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
- 	if (gbb->flags & GBB_FLAG_FORCE_DEV_BOOT_LEGACY)
- 		allow_legacy = 1;
+@@ -320,6 +320,7 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
+ 		use_usb = 0;
+ 	}
  
 +developer_mode_screen:
  	/* Show the dev mode warning screen */
  	VbDisplayScreen(cparams, VB_SCREEN_DEVELOPER_WARNING, 0, &vnc);
  
-@@ -388,14 +389,23 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
+@@ -442,14 +443,23 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
  			if (!allow_usb) {
  				VBDEBUG(("VbBootDeveloper() - "
  					 "USB booting is disabled\n"));
@@ -51,5 +51,5 @@ index e191137..6463571 100644
  				/*
  				 * Clear the screen to show we get the Ctrl+U
 -- 
-1.9.1
+2.8.0
 
diff --git a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0006-firmware-Separate-screen-and-wait-at-device-informat.patch b/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0006-firmware-Separate-screen-and-wait-at-device-informat.patch
index e2d4ef7e..52f77d16 100644
--- a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0006-firmware-Separate-screen-and-wait-at-device-informat.patch
+++ b/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0006-firmware-Separate-screen-and-wait-at-device-informat.patch
@@ -1,4 +1,4 @@
-From b724719ae34c3fd7c25502339f9029ee9e0bbb1e Mon Sep 17 00:00:00 2001
+From 4be2a60b0ebb845c8f5043ef3f27b691a51df7c2 Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
 Date: Mon, 10 Aug 2015 23:53:48 +0200
 Subject: [PATCH 6/7] firmware: Separate screen and wait at device information
@@ -14,10 +14,10 @@ Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
  2 files changed, 20 insertions(+), 5 deletions(-)
 
 diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
-index 6463571..2f33258 100644
+index 7d22c93..4e6de18 100644
 --- a/firmware/lib/vboot_api_kernel.c
 +++ b/firmware/lib/vboot_api_kernel.c
-@@ -371,6 +371,18 @@ developer_mode_screen:
+@@ -425,6 +425,18 @@ developer_mode_screen:
  				 "hold developer mode screen\n"));
  			hold = 1;
  			break;
@@ -37,10 +37,10 @@ index 6463571..2f33258 100644
  			VBDEBUG(("VbBootDeveloper() - "
  				 "user pressed Ctrl+L; Try legacy boot\n"));
 diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
-index 0158cc2..c3d504d 100644
+index 472ca91..e092189 100644
 --- a/firmware/lib/vboot_display.c
 +++ b/firmware/lib/vboot_display.c
-@@ -503,7 +503,7 @@ const char *RecoveryReasonString(uint8_t code)
+@@ -541,7 +541,7 @@ const char *RecoveryReasonString(uint8_t code)
  	return "We have no idea what this means";
  }
  
@@ -49,7 +49,7 @@ index 0158cc2..c3d504d 100644
  
  VbError_t VbDisplayDebugInfo(VbCommonParams *cparams, VbNvContext *vncptr)
  {
-@@ -518,8 +518,8 @@ VbError_t VbDisplayDebugInfo(VbCommonParams *cparams, VbNvContext *vncptr)
+@@ -556,8 +556,8 @@ VbError_t VbDisplayDebugInfo(VbCommonParams *cparams, VbNvContext *vncptr)
  	VbError_t ret;
  	uint32_t i;
  
@@ -60,7 +60,7 @@ index 0158cc2..c3d504d 100644
  
  	/* Add hardware ID */
  	VbRegionReadHWID(cparams, hwid, sizeof(hwid));
-@@ -622,8 +622,11 @@ VbError_t VbDisplayDebugInfo(VbCommonParams *cparams, VbNvContext *vncptr)
+@@ -666,8 +666,11 @@ VbError_t VbDisplayDebugInfo(VbCommonParams *cparams, VbNvContext *vncptr)
  		used += StrnAppend(buf + used, sha1sum, DEBUG_INFO_SIZE - used);
  	}
  
@@ -75,5 +75,5 @@ index 0158cc2..c3d504d 100644
  	/* TODO: add more interesting data:
  	 * - Information on current disks */
 -- 
-1.9.1
+2.8.0
 
diff --git a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0007-firmware-Localization-keys-removal.patch b/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0007-firmware-Localization-keys-removal.patch
index ca0e6840..770f4c1a 100644
--- a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0007-firmware-Localization-keys-removal.patch
+++ b/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0007-firmware-Localization-keys-removal.patch
@@ -1,4 +1,4 @@
-From 982044d150604b74e2bb619ca00042430dd0b73d Mon Sep 17 00:00:00 2001
+From ed1da3f76c1c19f9e078d0a19bac06151d5988d6 Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
 Date: Tue, 11 Aug 2015 00:07:18 +0200
 Subject: [PATCH 7/7] firmware: Localization keys removal
@@ -8,14 +8,14 @@ changes has no effect and only makes the screen flicker.
 
 Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
 ---
- firmware/lib/vboot_api_kernel.c | 6 ------
- 1 file changed, 6 deletions(-)
+ firmware/lib/vboot_api_kernel.c | 5 -----
+ 1 file changed, 5 deletions(-)
 
 diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
-index 2f33258..a5d2f03 100644
+index 4e6de18..62efd0f 100644
 --- a/firmware/lib/vboot_api_kernel.c
 +++ b/firmware/lib/vboot_api_kernel.c
-@@ -229,7 +229,6 @@ int VbUserConfirms(VbCommonParams *cparams, uint32_t confirm_flags)
+@@ -263,7 +263,6 @@ int VbUserConfirms(VbCommonParams *cparams, uint32_t confirm_flags)
  					return 1;
  				}
  			}
@@ -23,7 +23,7 @@ index 2f33258..a5d2f03 100644
  		}
  		VbExSleepMs(CONFIRM_KEY_DELAY);
  	}
-@@ -455,7 +454,6 @@ developer_mode_screen:
+@@ -493,7 +492,6 @@ developer_mode_screen:
  			break;
  		default:
  			VBDEBUG(("VbBootDeveloper() - pressed key %d\n", key));
@@ -31,16 +31,15 @@ index 2f33258..a5d2f03 100644
  			break;
  		}
  	} while(hold || VbAudioLooping(audio));
-@@ -539,8 +537,6 @@ VbError_t VbBootRecovery(VbCommonParams *cparams, LoadKernelParams *p)
- 			 * platforms don't like to scan USB too rapidly.
- 			 */
- 			for (i = 0; i < REC_DISK_DELAY; i += REC_KEY_DELAY) {
--				VbCheckDisplayKey(cparams, VbExKeyboardRead(),
--						  &vnc);
- 				if (VbWantShutdown(cparams->gbb->flags))
- 					return VBERROR_SHUTDOWN_REQUESTED;
- 				VbExSleepMs(REC_KEY_DELAY);
-@@ -638,8 +634,6 @@ VbError_t VbBootRecovery(VbCommonParams *cparams, LoadKernelParams *p)
+@@ -557,7 +555,6 @@ VbError_t VbBootRecovery(VbCommonParams *cparams, LoadKernelParams *p)
+ 		VbDisplayScreen(cparams, VB_SCREEN_OS_BROKEN, 0, &vnc);
+ 		VBDEBUG(("VbBootRecovery() waiting for manual recovery\n"));
+ 		while (1) {
+-			VbCheckDisplayKey(cparams, VbExKeyboardRead(), &vnc);
+ 			if (VbWantShutdown(cparams->gbb->flags))
+ 				return VBERROR_SHUTDOWN_REQUESTED;
+ 			VbExSleepMs(REC_KEY_DELAY);
+@@ -655,8 +652,6 @@ VbError_t VbBootRecovery(VbCommonParams *cparams, LoadKernelParams *p)
  					i = 4;
  					break;
  				}
@@ -50,5 +49,5 @@ index 2f33258..a5d2f03 100644
  			if (VbWantShutdown(cparams->gbb->flags))
  				return VBERROR_SHUTDOWN_REQUESTED;
 -- 
-1.9.1
+2.8.0
 
diff --git a/resources/scripts/helpers/download/depthcharge b/resources/scripts/helpers/download/depthcharge
index 1d1e769e..9827a346 100755
--- a/resources/scripts/helpers/download/depthcharge
+++ b/resources/scripts/helpers/download/depthcharge
@@ -40,7 +40,7 @@ git clone https://chromium.googlesource.com/chromiumos/platform/depthcharge
 cd "depthcharge/"
 
 # reset to the latest previously tested revision
-git reset --hard 3a5d54e31267578f48fb283fae56a405108f1498
+git reset --hard 065ba14bc56c9044247fef6337d8f9e9a3055820
 
 # Patch depthcharge
 # ------------------------------------------------------------------------------
@@ -57,14 +57,17 @@ git am "../resources/depthcharge/patch/0003-DOTCONFIG-location-correction.patch"
 printf "Adaptation for a read-only boot path when no vboot handoff data is found\n"
 git am "../resources/depthcharge/patch/0004-Adaptation-for-a-read-only-boot-path-when-no-vboot-h.patch"
 
+printf "vboot: Only initialize cparams once\n"
+git am "../resources/depthcharge/patch/0005-vboot-Only-initialize-cparams-once.patch"
+
 printf "Proper firmware index report for read-only boot path\n"
-git am "../resources/depthcharge/patch/0005-Proper-firmware-index-report-for-read-only-boot-path.patch"
+git am "../resources/depthcharge/patch/0006-Proper-firmware-index-report-for-read-only-boot-path.patch"
 
 printf "fdt: nonvolatile-context-storage report to mkbp for EC NV storage\n"
-git am "../resources/depthcharge/patch/0006-fdt-nonvolatile-context-storage-report-to-mkbp-for-E.patch"
+git am "../resources/depthcharge/patch/0007-fdt-nonvolatile-context-storage-report-to-mkbp-for-E.patch"
 
 printf "vboot: Display callbacks for developer and recovery mode screens\n"
-git am "../resources/depthcharge/patch/0007-vboot-Display-callbacks-for-developer-and-recovery-m.patch"
+git am "../resources/depthcharge/patch/0008-vboot-Display-callbacks-for-developer-and-recovery-m.patch"
 
 # leave the tree
 cd "../"
diff --git a/resources/utilities/coreboot-libre/blobs/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/blobs.list b/resources/utilities/coreboot-libre/blobs/coreboot/1bf5e6409678d04fd15f9625460078853118521c/blobs.list
index a8a9a964..a8a9a964 100644
--- a/resources/utilities/coreboot-libre/blobs/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/blobs.list
+++ b/resources/utilities/coreboot-libre/blobs/coreboot/1bf5e6409678d04fd15f9625460078853118521c/blobs.list
diff --git a/resources/utilities/coreboot-libre/blobs/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/nonblobs.list b/resources/utilities/coreboot-libre/blobs/coreboot/1bf5e6409678d04fd15f9625460078853118521c/nonblobs.list
index 6f672156..6f672156 100644
--- a/resources/utilities/coreboot-libre/blobs/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/nonblobs.list
+++ b/resources/utilities/coreboot-libre/blobs/coreboot/1bf5e6409678d04fd15f9625460078853118521c/nonblobs.list
diff --git a/resources/utilities/coreboot-libre/blobs/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/nonblobs_notes b/resources/utilities/coreboot-libre/blobs/coreboot/1bf5e6409678d04fd15f9625460078853118521c/nonblobs_notes
index 551da4a8..551da4a8 100644
--- a/resources/utilities/coreboot-libre/blobs/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/nonblobs_notes
+++ b/resources/utilities/coreboot-libre/blobs/coreboot/1bf5e6409678d04fd15f9625460078853118521c/nonblobs_notes
diff --git a/resources/utilities/coreboot-libre/blobs/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/blobs.list b/resources/utilities/coreboot-libre/blobs/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/blobs.list
index d16f9ec5..d16f9ec5 100644
--- a/resources/utilities/coreboot-libre/blobs/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/blobs.list
+++ b/resources/utilities/coreboot-libre/blobs/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/blobs.list
diff --git a/resources/utilities/coreboot-libre/blobs/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/nonblobs.list b/resources/utilities/coreboot-libre/blobs/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/nonblobs.list
index 9293e3b8..9293e3b8 100644
--- a/resources/utilities/coreboot-libre/blobs/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/nonblobs.list
+++ b/resources/utilities/coreboot-libre/blobs/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/nonblobs.list
diff --git a/resources/utilities/coreboot-libre/blobs/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/nonblobs_notes b/resources/utilities/coreboot-libre/blobs/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/nonblobs_notes
index 1999d4f5..1999d4f5 100644
--- a/resources/utilities/coreboot-libre/blobs/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/nonblobs_notes
+++ b/resources/utilities/coreboot-libre/blobs/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/nonblobs_notes