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

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

11 files changed, 230 insertions, 101 deletions

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 0000000..1e71ecf
--- /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 0000000..b38cf56
--- /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 0000000..8a2d253
--- /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 f268922..1139490 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 f843e50..53fc563 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 3e2a997..669e6de 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 a9d85a0..c82c546 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 1980d77..1a7db50 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 82d0d95..152aee8 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 e2d4ef7..52f77d1 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 ca0e684..770f4c1 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