remove CrOS boards/utils from old build system (new build system has them)

author: 4 of 7 (Leah Rowe) info@minifree.org <info@minifree.org> 2017-01-22 03:18:10 +0000
committer: 4 of 7 (Leah Rowe) info@minifree.org <info@minifree.org> 2017-01-22 03:25:50 +0000
commit: cab47f3178db195d797db89486dc56383c28aace (patch)
tree: e515305d51c8220dda5c74e3c91de876fa4931f5 /resources
parent: bae4652b291d4310c9ff105a874c009b3cdbaedc (diff)
download: librebootfr-cab47f3178db195d797db89486dc56383c28aace.tar.gz
librebootfr-cab47f3178db195d797db89486dc56383c28aace.zip
32 files changed, 0 insertions, 2384 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
deleted file mode 100644
index d99a574d..00000000
--- a/resources/depthcharge/patch/0001-arm-armv7-a-march-abi-flag-for-ARMv7-hardware.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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/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
-will complain that some ARM mrc/mcr ASM instructions are not defined.
-
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
----
- src/arch/arm/build_vars | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/arch/arm/build_vars b/src/arch/arm/build_vars
-index b2fce32..455e370 100644
---- a/src/arch/arm/build_vars
-+++ b/src/arch/arm/build_vars
-@@ -17,7 +17,7 @@
- 
- VB_FIRMWARE_ARCH=arm
- ifeq ($(CONFIG_ARCH_ARM_V7),y)
--ARCH_ABI_FLAGS += -mthumb
-+ARCH_ABI_FLAGS += -mthumb -march=armv7-a
- endif
- 
- ifeq ($(CONFIG_ARCH_ARM_V8),y)
--- 
-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
deleted file mode 100644
index 611be4ff..00000000
--- a/resources/depthcharge/patch/0002-Coreboot-image-integration-removal.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/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.
-
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
----
- src/Makefile.inc | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/src/Makefile.inc b/src/Makefile.inc
-index a73785b..564dd13 100644
---- a/src/Makefile.inc
-+++ b/src/Makefile.inc
-@@ -77,12 +77,6 @@ $(eval $(call declare_bin,$1,$2 $$$$(VB_LIB),$3))
- 
- $1.payload: $1.elf
- 	@printf "    PAYLOAD    $$(subst $$(obj)/,,$$@)\n"
--	$$(Q)-rm -f $1.rom $1.bb
--	$$(Q)dd if=/dev/zero of=$1.bb bs=512 count=1
--	$$(Q)cbfstool $1.rom create -m $$(ARCH) -s 1024K -B $1.bb
--	$$(Q)cbfstool $1.rom add-payload -f $$< -n dc.elf -c lzma
--	$$(Q)cbfstool $1.rom extract -n dc.elf -f $$@
--	$$(Q)rm -f $1.rom $1.bb
- 
- $(notdir $1)_unified: $1.bin $1.payload
- PHONY += $(notdir $1)_unified
--- 
-2.8.0
-
diff --git a/resources/depthcharge/patch/0003-DOTCONFIG-location-correction.patch b/resources/depthcharge/patch/0003-DOTCONFIG-location-correction.patch
deleted file mode 100644
index d4b6ae98..00000000
--- a/resources/depthcharge/patch/0003-DOTCONFIG-location-correction.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/8] DOTCONFIG location correction
-
-The configuration file doesn't have to be in src and HAVE_DOTCONFIG holds its
-current location.
-
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index a1a9d33..13305cd 100644
---- a/Makefile
-+++ b/Makefile
-@@ -73,7 +73,7 @@ all: help
- 
- else
- 
--include $(src)/.config
-+include $(HAVE_DOTCONFIG)
- 
- ifeq ($(CONFIG_ARCH_X86),y)
- ARCH = x86
--- 
-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
deleted file mode 100644
index ed491a4c..00000000
--- a/resources/depthcharge/patch/0004-Adaptation-for-a-read-only-boot-path-when-no-vboot-h.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-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/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
-attempt to follow the read-only boot path.
-
-vboot_select_firmware is called to grab the kernel key from the firmware header,
-but it won't actually jump to a RW version of depthcharge.
-
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
----
- src/image/Makefile.inc                |  1 +
- src/image/startrw_stub.c              | 34 ++++++++++++++++++++++++++++++++++
- src/vboot/main.c                      | 17 ++++++++++++++++-
- src/vboot/util/commonparams-unified.c | 11 +++++++++--
- 4 files changed, 60 insertions(+), 3 deletions(-)
- create mode 100644 src/image/startrw_stub.c
-
-diff --git a/src/image/Makefile.inc b/src/image/Makefile.inc
-index 95aeda1..4b74c11 100644
---- a/src/image/Makefile.inc
-+++ b/src/image/Makefile.inc
-@@ -18,6 +18,7 @@
- depthcharge-y += fmap.c
- depthcharge-y += index.c
- readonly-y += startrw.c
-+unified-y += startrw_stub.c
- 
- trampoline-y += load_elf.c
- 
-diff --git a/src/image/startrw_stub.c b/src/image/startrw_stub.c
-new file mode 100644
-index 0000000..8e40302
---- /dev/null
-+++ b/src/image/startrw_stub.c
-@@ -0,0 +1,34 @@
-+/*
-+ * Copyright 2012 Google Inc.
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but without any warranty; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include <libpayload.h>
-+#include <lzma.h>
-+
-+#include "base/elf.h"
-+#include "image/enter_trampoline.h"
-+#include "image/startrw.h"
-+#include "image/symbols.h"
-+
-+int start_rw_firmware(const void *compressed_image, uint32_t size)
-+{
-+	return 0;
-+}
-diff --git a/src/vboot/main.c b/src/vboot/main.c
-index 7dc05f5..97a218d 100644
---- a/src/vboot/main.c
-+++ b/src/vboot/main.c
-@@ -82,6 +82,20 @@ static int vboot_init_handoff()
- 	return vboot_do_init_out_flags(vboot_handoff->init_params.out_flags);
- }
- 
-+static int vboot_init_ro()
-+{
-+	// Set up the common param structure, clearing shared data.
-+	if (common_params_init(1))
-+		return 1;
-+
-+	// Initialize vboot.
-+	if (vboot_init())
-+		return 1;
-+
-+	// Select firmware.
-+	return vboot_select_firmware();
-+}
-+
- int main(void)
- {
- 	// Let the world know we're alive.
-@@ -108,7 +122,8 @@ int main(void)
- 
- 	// Set up the common param structure, not clearing shared data.
- 	if (vboot_init_handoff())
--		halt();
-+		if (vboot_init_ro())
-+			halt();
- 
- 	/* Fastboot is only entered in recovery path */
- 	if (vboot_in_recovery())
-diff --git a/src/vboot/util/commonparams-unified.c b/src/vboot/util/commonparams-unified.c
-index 10fcb93..575dcfd 100644
---- a/src/vboot/util/commonparams-unified.c
-+++ b/src/vboot/util/commonparams-unified.c
-@@ -28,7 +28,14 @@
- int find_common_params(void **blob, int *size)
- {
- 	struct vboot_handoff *vboot_handoff = lib_sysinfo.vboot_handoff;
--	*blob = &vboot_handoff->shared_data[0];
--	*size = ARRAY_SIZE(vboot_handoff->shared_data);
-+
-+	if (vboot_handoff != NULL) {
-+		*blob = &vboot_handoff->shared_data[0];
-+		*size = ARRAY_SIZE(vboot_handoff->shared_data);
-+	} else {
-+		*blob = shared_data_blob;
-+		*size = sizeof(shared_data_blob);
-+	}
-+
- 	return 0;
- }
--- 
-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
deleted file mode 100644
index 8bc56a73..00000000
--- a/resources/depthcharge/patch/0005-vboot-Only-initialize-cparams-once.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/0006-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
deleted file mode 100644
index 7692ff2b..00000000
--- a/resources/depthcharge/patch/0006-Proper-firmware-index-report-for-read-only-boot-path.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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 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.
-
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
----
- src/vboot/crossystem/fdt.c | 2 +-
- src/vboot/firmware_id.c    | 6 +++++-
- src/vboot/firmware_id.h    | 1 +
- 3 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/vboot/crossystem/fdt.c b/src/vboot/crossystem/fdt.c
-index ca39dac..a79b192 100644
---- a/src/vboot/crossystem/fdt.c
-+++ b/src/vboot/crossystem/fdt.c
-@@ -73,7 +73,7 @@ static int install_crossystem_data(DeviceTreeFixup *fixup, DeviceTree *tree)
- 				nvstorage_flash_get_blob_size());
- 	}
- 
--	int fw_index = vdat->firmware_index;
-+	int fw_index = get_active_fw_index(vdat);
- 	const char *fwid;
- 	int fwid_size;
- 
-diff --git a/src/vboot/firmware_id.c b/src/vboot/firmware_id.c
-index 3662921..955bc84 100644
---- a/src/vboot/firmware_id.c
-+++ b/src/vboot/firmware_id.c
-@@ -36,6 +36,7 @@ static struct fwid {
- } fw_fmap_ops[] = {
- 	{VDAT_RW_A, "RW_FWID_A", NULL, 0, "RW A: ID NOT FOUND"},
- 	{VDAT_RW_B, "RW_FWID_B", NULL, 0, "RW B: ID NOT FOUND"},
-+	{VDAT_RO, "RO_FRID", NULL, 0, "RO: ID NOT FOUND"},
- 	{VDAT_RECOVERY, "RO_FRID", NULL, 0, "RO: ID NOT FOUND"},
- };
- 
-@@ -130,10 +131,13 @@ static VbSharedDataHeader *get_vdat(void)
- 	return NULL;
- }
- 
--static inline int get_active_fw_index(VbSharedDataHeader *vdat)
-+int get_active_fw_index(VbSharedDataHeader *vdat)
- {
- 	int fw_index = VDAT_UNKNOWN;
- 
-+	if (lib_sysinfo.vboot_handoff == NULL)
-+		return VDAT_RO;
-+
- 	if (vdat)
- 		fw_index = vdat->firmware_index;
- 
-diff --git a/src/vboot/firmware_id.h b/src/vboot/firmware_id.h
-index fb6f206..090e9d1 100644
---- a/src/vboot/firmware_id.h
-+++ b/src/vboot/firmware_id.h
-@@ -49,6 +49,7 @@ int get_rwb_fw_size(void);
-  * Get firmware details for currently active fw type. It looks up vdat,
-  * identifies fw_index and returns appropriate id and size for that index.
-  */
-+int get_active_fw_index(VbSharedDataHeader *vdat);
- const char *get_active_fw_id(void);
- int get_active_fw_size(void);
- 
--- 
-2.8.0
-
diff --git a/resources/depthcharge/patch/0007-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
deleted file mode 100644
index bfbe96b8..00000000
--- a/resources/depthcharge/patch/0007-fdt-nonvolatile-context-storage-report-to-mkbp-for-E.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 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
-access NV storage in case it is stored on the EC.
-
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
----
- src/vboot/crossystem/fdt.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/vboot/crossystem/fdt.c b/src/vboot/crossystem/fdt.c
-index a79b192..0487513 100644
---- a/src/vboot/crossystem/fdt.c
-+++ b/src/vboot/crossystem/fdt.c
-@@ -56,7 +56,7 @@ static int install_crossystem_data(DeviceTreeFixup *fixup, DeviceTree *tree)
- 		dt_add_string_prop(node, "nonvolatile-context-storage","nvram");
- 	} else if (CONFIG_NV_STORAGE_CROS_EC) {
- 		dt_add_string_prop(node,
--				"nonvolatile-context-storage", "cros-ec");
-+				"nonvolatile-context-storage", "mkbp");
- 	} else if (CONFIG_NV_STORAGE_DISK) {
- 		dt_add_string_prop(node, "nonvolatile-context-storage", "disk");
- 		dt_add_u32_prop(node, "nonvolatile-context-lba",
--- 
-2.8.0
-
diff --git a/resources/depthcharge/patch/0008-vboot-Display-callbacks-for-developer-and-recovery-m.patch b/resources/depthcharge/patch/0008-vboot-Display-callbacks-for-developer-and-recovery-m.patch
deleted file mode 100644
index cacc3ecd..00000000
--- a/resources/depthcharge/patch/0008-vboot-Display-callbacks-for-developer-and-recovery-m.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-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 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-
-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 | 200 ++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 185 insertions(+), 15 deletions(-)
-
-diff --git a/src/vboot/callbacks/display.c b/src/vboot/callbacks/display.c
-index 183e278..ece9140 100644
---- a/src/vboot/callbacks/display.c
-+++ b/src/vboot/callbacks/display.c
-@@ -86,12 +86,19 @@ void print_on_center(const char *msg)
- 	print_string(msg);
- }
- 
--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;
-+	const char *fw_id;
-+	int fw_index;
-+	void *blob = NULL;
-+	int size = 0;
-+	char *msg;
- 
- 	/*
- 	 * Show the debug messages for development. It is a backup method
-@@ -103,31 +110,194 @@ VbError_t VbExDisplayScreen(uint32_t screen_type, uint32_t locale)
- 		video_console_clear();
- 		break;
- 	case VB_SCREEN_DEVELOPER_WARNING:
--		msg = "developer mode warning";
-+		video_console_clear();
-+		video_console_set_cursor(0, 0);
-+
-+		if (vnc != NULL) {
-+			VbNvGet(vnc, VBNV_DEV_BOOT_SIGNED_ONLY,
-+				&boot_signed_only);
-+
-+			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(
-+			"Welcome to developer mode!\n\n"
-+			"Useful key combinations:\n"
-+			"- Ctrl + H: Hold developer mode\n"
-+			"- Ctrl + D: Boot from internal storage\n");
-+
-+		if (boot_usb)
-+			print_string("- Ctrl + U: Boot from external media\n");
-+
-+		if (boot_legacy)
-+			print_string("- Ctrl + L: Boot from legacy payload\n");
-+
-+		print_string(
-+			"- Ctrl + I: Show device information\n"
-+			"- Space: Disable developer mode\n\n"
-+			"This screen is shown for 3 seconds (if not held)."
-+			"\n\n");
-+
-+		if (vnc != NULL) {
-+			if (!boot_signed_only)
-+				print_string(
-+					"Warning: this device will boot kernels"
-+					" without verifying their signature!"
-+					"\n");
-+
-+			if (boot_usb)
-+				print_string(
-+					"Warning: this device will boot from "
-+					"external media!\n");
-+
-+			if (boot_legacy)
-+				print_string(
-+					"Warning: this device will boot legacy "
-+					"payloads!\n");
-+
-+			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);
-+
-+		if (blob != NULL) {
-+			VbSharedDataHeader *vdat = (VbSharedDataHeader *) blob;
-+			fw_index = get_active_fw_index(vdat);
-+			fw_id = get_fw_id(fw_index);
-+
-+			if (fw_id == NULL)
-+				fw_id = "NOT FOUND";
-+
-+			print_string("Active firmware id: ");
-+			print_string(fw_id);
-+
-+			switch (fw_index) {
-+				case VDAT_RW_A:
-+					print_string(" (RW A)\n");
-+					break;
-+				case VDAT_RW_B:
-+					print_string(" (RW A)\n");
-+					break;
-+				case VDAT_RO:
-+					print_string(" (RO)\n");
-+					break;
-+				default:
-+					print_string(" (UNKNOWN)\n");
-+					break;
-+			}
-+		}
- 		break;
- 	case VB_SCREEN_DEVELOPER_EGG:
--		msg = "easter egg";
-+		video_console_clear();
-+		print_on_center("Free as in Freedom!");
- 		break;
- 	case VB_SCREEN_RECOVERY_REMOVE:
--		msg = "remove inserted devices";
-+		video_console_clear();
-+		print_on_center(
-+			"Please remove any external media before accessing "
-+			"recovery screen.");
- 		break;
- 	case VB_SCREEN_RECOVERY_INSERT:
--		msg = "insert recovery image";
--		break;
- 	case VB_SCREEN_RECOVERY_NO_GOOD:
--		msg = "insert image invalid";
-+		video_console_clear();
-+		print_string(
-+			"Welcome to recovery mode!\n\n"
-+			"Useful key combinations:\n"
-+			"- Ctrl + D: Enable developer mode (if possible)\n\n");
-+
-+		if (screen_type == VB_SCREEN_RECOVERY_NO_GOOD)
-+			print_on_center(
-+				"Invalid recovery media, please instert a "
-+				"valid one.");
-+		else
-+			print_on_center(
-+				"Please insert an external recovery media.");
-+		break;
-+	case VB_SCREEN_RECOVERY_TO_DEV:
-+		video_console_clear();
-+		video_get_rows_cols(&rows, &cols);
-+
-+		video_console_set_cursor(0, 0);
-+
-+		print_string(
-+			"Enabling developer mode will allow booting unsigned "
-+			"kernels and booting from external media (when enabled "
-+			"with crossystem).\n\n"
-+			"Developer mode can be disabled via the developer mode "
-+			"screen.");
-+
-+		msg = "Developer mode will be enabled.";
-+		video_console_set_cursor((cols - strlen(msg)) / 2, rows / 2);
-+		print_string(msg);
-+
-+		msg = "Press enter to confirm or escape to go back.";
-+		video_console_set_cursor((cols - strlen(msg)) / 2,
-+					 rows / 2 + 2);
-+		print_string(msg);
-+		break;
-+	case VB_SCREEN_DEVELOPER_TO_NORM:
-+		video_console_clear();
-+		video_get_rows_cols(&rows, &cols);
-+
-+		video_console_set_cursor(0, 0);
-+
-+		print_string(
-+			"Disabling developer mode will restrict boot to signed "
-+			"kernels stored on internal memory only.\n\n"
-+			"Developer mode can be enabled again via the recovery "
-+			"mode screen.");
-+
-+		msg = "Developer mode will be disabled.";
-+		video_console_set_cursor((cols - strlen(msg)) / 2, rows / 2);
-+		print_string(msg);
-+
-+		msg = "Press enter to confirm or escape to go back.";
-+		video_console_set_cursor((cols - strlen(msg)) / 2,
-+					 rows / 2 + 2);
-+		print_string(msg);
- 		break;
- 	case VB_SCREEN_WAIT:
--		msg = "wait for ec update";
-+		video_console_clear();
-+		print_on_center("Waiting for EC update...");
-+		break;
-+	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);
- 		return VBERROR_INVALID_SCREEN_INDEX;
- 	}
- 
--	if (msg)
--		print_on_center(msg);
--
- 	return VBERROR_SUCCESS;
- }
- 
--- 
-2.8.0
-
diff --git a/resources/libreboot/config/depthcharge/veyron_speedy/architecture b/resources/libreboot/config/depthcharge/veyron_speedy/architecture
deleted file mode 100644
index fb05f39d..00000000
--- a/resources/libreboot/config/depthcharge/veyron_speedy/architecture
+++ /dev/null
@@ -1 +0,0 @@
-arm
diff --git a/resources/libreboot/config/depthcharge/veyron_speedy/cbrevision b/resources/libreboot/config/depthcharge/veyron_speedy/cbrevision
deleted file mode 100644
index 073d4138..00000000
--- a/resources/libreboot/config/depthcharge/veyron_speedy/cbrevision
+++ /dev/null
@@ -1 +0,0 @@
-1bf5e6409678d04fd15f9625460078853118521c
diff --git a/resources/libreboot/config/depthcharge/veyron_speedy/config b/resources/libreboot/config/depthcharge/veyron_speedy/config
deleted file mode 100644
index 8baf734f..00000000
--- a/resources/libreboot/config/depthcharge/veyron_speedy/config
+++ /dev/null
@@ -1,528 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# coreboot configuration
-#
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_CBFS_PREFIX="fallback"
-CONFIG_COMMON_CBFS_SPI_WRAPPER=y
-CONFIG_MULTIPLE_CBFS_INSTANCES=y
-CONFIG_COMPILER_GCC=y
-# CONFIG_COMPILER_LLVM_CLANG is not set
-# CONFIG_ANY_TOOLCHAIN is not set
-# CONFIG_CCACHE is not set
-# CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
-CONFIG_UNCOMPRESSED_RAMSTAGE=y
-# CONFIG_COMPRESS_RAMSTAGE is not set
-CONFIG_INCLUDE_CONFIG_FILE=y
-CONFIG_EARLY_CBMEM_INIT=y
-CONFIG_COLLECT_TIMESTAMPS=y
-CONFIG_HAS_PRECBMEM_TIMESTAMP_REGION=y
-# CONFIG_USE_BLOBS is not set
-# CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-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_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
-
-#
-# Mainboard
-#
-# CONFIG_VENDOR_A_TREND is not set
-# CONFIG_VENDOR_AAEON is not set
-# CONFIG_VENDOR_ABIT is not set
-# CONFIG_VENDOR_ADLINK is not set
-# CONFIG_VENDOR_ADVANSUS is not set
-# CONFIG_VENDOR_AMD is not set
-# CONFIG_VENDOR_AOPEN is not set
-# CONFIG_VENDOR_APPLE is not set
-# CONFIG_VENDOR_ARTECGROUP is not set
-# CONFIG_VENDOR_ASROCK is not set
-# CONFIG_VENDOR_ASUS is not set
-# CONFIG_VENDOR_AVALUE is not set
-# CONFIG_VENDOR_AZZA is not set
-# CONFIG_VENDOR_BACHMANN is not set
-# CONFIG_VENDOR_BAP is not set
-# CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
-# CONFIG_VENDOR_BIOSTAR is not set
-# CONFIG_VENDOR_BROADCOM is not set
-# CONFIG_VENDOR_COMPAQ is not set
-# CONFIG_VENDOR_CUBIETECH is not set
-# CONFIG_VENDOR_DIGITALLOGIC is not set
-# 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_IEI is not set
-# CONFIG_VENDOR_INTEL is not set
-# CONFIG_VENDOR_IWAVE is not set
-# CONFIG_VENDOR_IWILL is not set
-# CONFIG_VENDOR_JETWAY is not set
-# CONFIG_VENDOR_KONTRON is not set
-# CONFIG_VENDOR_LANNER is not set
-# CONFIG_VENDOR_LENOVO is not set
-# CONFIG_VENDOR_LINUTOP is not set
-# CONFIG_VENDOR_LIPPERT is not set
-# CONFIG_VENDOR_MITAC is not set
-# CONFIG_VENDOR_MSI is not set
-# CONFIG_VENDOR_NEC 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
-# CONFIG_VENDOR_SIEMENS is not set
-# CONFIG_VENDOR_SOYO is not set
-# CONFIG_VENDOR_SUNW is not set
-# CONFIG_VENDOR_SUPERMICRO is not set
-# CONFIG_VENDOR_TECHNEXION is not set
-# CONFIG_VENDOR_THOMSON is not set
-# CONFIG_VENDOR_TI is not set
-# CONFIG_VENDOR_TRAVERSE is not set
-# CONFIG_VENDOR_TYAN is not set
-# CONFIG_VENDOR_VIA is not set
-# CONFIG_VENDOR_WINENT is not set
-# CONFIG_VENDOR_WYSE is not set
-CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="google/veyron"
-CONFIG_MAINBOARD_PART_NUMBER="Veyron"
-CONFIG_MAINBOARD_VENDOR="Google"
-CONFIG_MAX_CPUS=1
-# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
-# 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
-# CONFIG_BOARD_GOOGLE_PEPPY is not set
-# CONFIG_BOARD_GOOGLE_PURIN is not set
-# CONFIG_BOARD_GOOGLE_RAMBI is not set
-# CONFIG_BOARD_GOOGLE_RUSH is not set
-# CONFIG_BOARD_GOOGLE_RUSH_RYU is not set
-# CONFIG_BOARD_GOOGLE_SAMUS is not set
-# CONFIG_BOARD_GOOGLE_SLIPPY is not set
-# 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
-# CONFIG_BOARD_GOOGLE_VEYRON_JERRY is not set
-# CONFIG_BOARD_GOOGLE_VEYRON_MIGHTY is not set
-# CONFIG_BOARD_GOOGLE_VEYRON_MINNIE is not set
-# CONFIG_BOARD_GOOGLE_VEYRON_NICKY is not set
-# CONFIG_BOARD_GOOGLE_VEYRON_PINKY is not set
-# CONFIG_BOARD_GOOGLE_VEYRON_SHARK is not set
-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
-CONFIG_CHROMEOS=y
-CONFIG_BOOT_MEDIA_SPI_BUS=2
-CONFIG_DRIVER_TPM_I2C_BUS=0x1
-CONFIG_DRIVER_TPM_I2C_ADDR=0x20
-CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS=0
-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_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
-# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
-# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
-# CONFIG_COREBOOT_ROMSIZE_KB_1024 is not set
-# CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
-CONFIG_COREBOOT_ROMSIZE_KB_4096=y
-# CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
-# CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
-# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
-CONFIG_COREBOOT_ROMSIZE_KB=4096
-CONFIG_ROM_SIZE=0x400000
-CONFIG_FMDFILE="src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd"
-CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
-
-#
-# Chipset
-#
-
-#
-# SoC
-#
-# CONFIG_SOC_BROADCOM_CYGNUS is not set
-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
-# CONFIG_SOC_QC_IPQ806X is not set
-CONFIG_SOC_ROCKCHIP_RK3288=y
-# CONFIG_VBOOT_VERIFY_FIRMWARE is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_UCB_RISCV is not set
-
-#
-# CPU
-#
-# CONFIG_CPU_ALLWINNER_A10 is not set
-CONFIG_XIP_ROM_SIZE=0x10000
-CONFIG_NUM_IPI_STARTS=2
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
-# CONFIG_CPU_TI_AM335X is not set
-# CONFIG_PARALLEL_CPU_INIT is not set
-# CONFIG_UDELAY_LAPIC is not set
-# CONFIG_UDELAY_TSC is not set
-# CONFIG_UDELAY_TIMER2 is not set
-# CONFIG_TSC_CALIBRATE_WITH_IO is not set
-# CONFIG_TSC_SYNC_LFENCE is not set
-# 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
-#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_AMD_NB_CIMX is not set
-# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
-CONFIG_HPET_ADDRESS=0xfed00000
-CONFIG_MAX_PIRQ_LINKS=4
-
-#
-# Southbridge
-#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON is not set
-
-#
-# Super I/O
-#
-
-#
-# Embedded Controllers
-#
-CONFIG_EC_GOOGLE_CHROMEEC=y
-# CONFIG_EC_GOOGLE_CHROMEEC_I2C is not set
-# CONFIG_EC_GOOGLE_CHROMEEC_PD is not set
-CONFIG_EC_GOOGLE_CHROMEEC_SPI=y
-CONFIG_EC_GOOGLE_CHROMEEC_SPI_CHIP=0
-CONFIG_MAINBOARD_HAS_CHROMEOS=y
-
-#
-# ChromeOS
-#
-# CONFIG_CHROMEOS_VBNV_CMOS is not set
-CONFIG_CHROMEOS_VBNV_EC=y
-# CONFIG_CHROMEOS_VBNV_FLASH is not set
-CONFIG_CHROMEOS_RAMOOPS=y
-# CONFIG_CHROMEOS_RAMOOPS_NON_ACPI is not set
-CONFIG_CHROMEOS_RAMOOPS_RAM_START=0x00f00000
-CONFIG_CHROMEOS_RAMOOPS_RAM_SIZE=0x00100000
-CONFIG_EC_SOFTWARE_SYNC=y
-# CONFIG_VBOOT_EC_SLOW_UPDATE is not set
-CONFIG_VIRTUAL_DEV_SWITCH=y
-# CONFIG_NO_TPM_RESUME is not set
-# 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
-CONFIG_ARCH_VERSTAGE_ARM=y
-CONFIG_ARCH_ROMSTAGE_ARM=y
-CONFIG_ARCH_RAMSTAGE_ARM=y
-# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
-# CONFIG_ARCH_VERSTAGE_ARMV4 is not set
-# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
-# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
-CONFIG_ARCH_BOOTBLOCK_ARMV7=y
-CONFIG_ARCH_VERSTAGE_ARMV7=y
-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_LPAE is not set
-# CONFIG_ARCH_ARM64 is not set
-# CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
-# CONFIG_ARCH_VERSTAGE_ARM64 is not set
-# CONFIG_ARCH_ROMSTAGE_ARM64 is not set
-# CONFIG_ARCH_RAMSTAGE_ARM64 is not set
-# CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
-# 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_A53_ERRATUM_843419 is not set
-# CONFIG_ARCH_MIPS is not set
-# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
-# CONFIG_ARCH_VERSTAGE_MIPS is not set
-# CONFIG_ARCH_ROMSTAGE_MIPS is not set
-# CONFIG_ARCH_RAMSTAGE_MIPS is not set
-# CONFIG_ARCH_RISCV is not set
-# CONFIG_ARCH_BOOTBLOCK_RISCV is not set
-# CONFIG_ARCH_VERSTAGE_RISCV is not set
-# CONFIG_ARCH_ROMSTAGE_RISCV is not set
-# CONFIG_ARCH_RAMSTAGE_RISCV 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
-# CONFIG_ARCH_ROMSTAGE_X86_32 is not set
-# CONFIG_ARCH_RAMSTAGE_X86_32 is not set
-# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
-# CONFIG_ARCH_VERSTAGE_X86_64 is not set
-# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
-# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
-# CONFIG_ROMCC is not set
-# CONFIG_LATE_CBMEM_INIT is not set
-# CONFIG_HAVE_CMOS_DEFAULT is not set
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_COMPILE_IN_DSDT is not set
-
-#
-# Devices
-#
-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
-# CONFIG_SOFTWARE_I2C is not set
-
-#
-# Display
-#
-
-#
-# Generic Drivers
-#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-CONFIG_ELOG=y
-# CONFIG_ELOG_DEBUG is not set
-CONFIG_ELOG_FLASH_BASE=0
-CONFIG_ELOG_AREA_SIZE=0x1000
-# CONFIG_ELOG_CBMEM is not set
-# CONFIG_ELOG_BOOT_COUNT is not set
-# CONFIG_GIC is not set
-# CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
-# CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_I2C_TPM=y
-# CONFIG_INTEL_DP is not set
-# CONFIG_INTEL_DDI is not set
-# CONFIG_INTEL_EDID is not set
-# CONFIG_INTEL_INT15 is not set
-# CONFIG_INTEL_GMA_ACPI is not set
-# CONFIG_DRIVER_INTEL_I210 is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_SPI_FLASH=y
-# CONFIG_SPI_ATOMIC_SEQUENCING is not set
-# CONFIG_SPI_FLASH_MEMORY_MAPPED is not set
-# CONFIG_SPI_FLASH_NO_FAST_READ is not set
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_WINBOND=y
-# CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
-# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-CONFIG_DRIVERS_UART=y
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# CONFIG_DRIVERS_UART_8250MEM is not set
-# CONFIG_DRIVERS_UART_8250MEM_32 is not set
-CONFIG_HAVE_UART_SPECIAL=y
-# CONFIG_DRIVERS_UART_PL011 is not set
-# CONFIG_HAVE_USBDEBUG is not set
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
-# CONFIG_DRIVER_XPOWERS_AXP209 is not set
-CONFIG_RTC=y
-CONFIG_TPM=y
-CONFIG_STACK_SIZE=0x0
-# CONFIG_MMCONF_SUPPORT_DEFAULT is not set
-# CONFIG_MMCONF_SUPPORT is not set
-CONFIG_BOOTMODE_STRAPS=y
-
-#
-# Console
-#
-CONFIG_BOOTBLOCK_CONSOLE=y
-CONFIG_SQUELCH_EARLY_SMP=y
-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
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
-# CONFIG_SPKMODEM is not set
-# CONFIG_CONSOLE_NE2K is not set
-CONFIG_CONSOLE_CBMEM=y
-CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_4 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_3 is not set
-# 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_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
-# CONFIG_HAVE_OPTION_TABLE is not set
-# CONFIG_PIRQ_ROUTE is not set
-# CONFIG_HAVE_SMI_HANDLER is not set
-# CONFIG_PCI_IO_CFG_EXT is not set
-# CONFIG_IOAPIC is not set
-# CONFIG_USE_WATCHDOG_ON_BOOT is not set
-# CONFIG_VGA is not set
-# CONFIG_GFXUMA is not set
-# CONFIG_COMMON_FADT is not set
-# CONFIG_ACPI_NHLT is not set
-
-#
-# System tables
-#
-# CONFIG_GENERATE_MP_TABLE is not set
-# CONFIG_GENERATE_PIRQ_TABLE is not set
-
-#
-# Payload
-#
-# CONFIG_PAYLOAD_NONE is not set
-CONFIG_PAYLOAD_ELF=y
-# CONFIG_PAYLOAD_FILO is not set
-# CONFIG_PAYLOAD_GRUB2 is not set
-# CONFIG_PAYLOAD_LINUX is not set
-# CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="payload.elf"
-CONFIG_COMPRESSED_PAYLOAD_LZMA=y
-
-#
-# Debugging
-#
-# CONFIG_GDB_STUB is not set
-# CONFIG_FATAL_ASSERTS is not set
-# CONFIG_DEBUG_CBFS is not set
-# CONFIG_HAVE_DEBUG_RAM_SETUP is not set
-# CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
-# CONFIG_DEBUG_MALLOC is not set
-# CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_TPM is not set
-# CONFIG_DEBUG_SPI_FLASH is not set
-# 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
diff --git a/resources/libreboot/config/depthcharge/veyron_speedy/vbootrevision b/resources/libreboot/config/depthcharge/veyron_speedy/vbootrevision
deleted file mode 100644
index 7f14b36f..00000000
--- a/resources/libreboot/config/depthcharge/veyron_speedy/vbootrevision
+++ /dev/null
@@ -1 +0,0 @@
-933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7
diff --git a/resources/libreboot/install/depthcharge/cros-flash-replace b/resources/libreboot/install/depthcharge/cros-flash-replace
deleted file mode 100755
index 4ad3fabd..00000000
--- a/resources/libreboot/install/depthcharge/cros-flash-replace
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-
-#  replace the requested parts in the flash image with separate parts images
-#
-#	Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-[ "x${DEBUG+set}" = 'xset' ] && set -v
-
-regex="\([0-9a-fA-F]*\):\([0-9a-fA-F]*\)[[:space:]]*\(.*\)"
-block=256
-layout="layout.txt"
-flash=$1
-
-shift 1
-
-if [ ! -f "$flash" ]
-then
-	echo "Usage: $0 [flash image] [image] ..."
-	exit 1
-fi
-
-if [ ! -f "$layout" ]
-then
-	echo "Missing layout file: $layout"
-	exit 1
-fi
-
-flashsize=$( stat $flash -c "%s" )
-
-for image in $@; do
-	range=$( grep "$image" "$layout" )
-	name=$( echo "$range" | sed "s/$regex/\3/g" )
-	file="$name.img"
-
-	if [ -z "$range" ] || [ ! -f "$file" ]
-	then
-		echo "Invalid image name: $name"
-		continue
-	fi
-
-	start=$( echo "$range" | sed "s/$regex/\1/g" )
-	start=$( printf "%d\n" "0x$start" )
-	stop=$( echo "$range" | sed "s/$regex/\2/g" )
-	stop=$( printf "%d\n" "0x$stop" )
-
-	size=$(( $stop - $start + 1 ))
-	filesize=$( stat $file -c "%s" )
-
-	if [ $size -ne $filesize ]
-	then
-		echo "Invalid file size: expected $size, read $filesize"
-		continue
-	fi
-
-	if [ $size -gt $flashsize ]
-	then
-		echo "Image size too big for flash"
-		continue
-	fi
-
-	printf "Replacing $image in $flash\n\n"
-
-	if [ $start -gt 0 ]
-	then
-		dd if=$flash of=before.img bs=$block count=$(( $start / $block ))
-	else
-		touch before.img
-	fi
-
-	if [ $(( $stop + 1 )) -lt $flashsize ]
-	then
-		dd if=$flash of=after.img skip=$(( ($stop + 1) / $block )) bs=$block count=$(( ($flashsize - $stop - 1) / $block ))
-	else
-		touch after.img
-	fi
-
-	cat before.img $file after.img > $flash
-
-	rm before.img after.img
-
-	printf "\n"
-done
diff --git a/resources/libreboot/install/depthcharge/veyron_speedy/layout.txt b/resources/libreboot/install/depthcharge/veyron_speedy/layout.txt
deleted file mode 100644
index bf397b80..00000000
--- a/resources/libreboot/install/depthcharge/veyron_speedy/layout.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-00000000:000fffff coreboot
-001eff00:001effff ro-frid
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
deleted file mode 100644
index 1e71ecfa..00000000
--- a/resources/libreboot/patch/coreboot/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0001-util-xcompile-Detect-toolchains-with-bare-arm-prefix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index b38cf561..00000000
--- a/resources/libreboot/patch/coreboot/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0002-libpayload-use-32bit-access-when-accessing-4byte-wid.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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
deleted file mode 100644
index 8a2d2533..00000000
--- a/resources/libreboot/patch/coreboot/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0003-rockchip-rk3288-UART-uses-32bit-wide-registers.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0004-chromeos-Allow-disabling-vboot-firmware-verification.patch b/resources/libreboot/patch/coreboot/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0004-chromeos-Allow-disabling-vboot-firmware-verification.patch
deleted file mode 100644
index 1139490a..00000000
--- a/resources/libreboot/patch/coreboot/1bf5e6409678d04fd15f9625460078853118521c/depthcharge/veyron_speedy/0004-chromeos-Allow-disabling-vboot-firmware-verification.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-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 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
-write-protected part of the SPI flash (without jumping to a RW firmware).
-
-Vboot firmware verification is still selected by default when ChromeOS is
-enabled, but this allows more flexibility since vboot firmware verification is
-no longer a hard requirement for ChromeOS (that this particular use case still
-allows booting ChromeOS).
-
-In the future, it would make sense to have all the separate components that
-CONFIG_CHROMEOS enables have their own config options, so that they can be
-enabled separately.
-
-Change-Id: Ia4057a56838aa05dcf3cb250ae1a27fd91402ddb
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
----
- src/lib/bootmode.c                            | 2 ++
- src/soc/rockchip/rk3288/Kconfig               | 2 +-
- src/vendorcode/google/chromeos/Kconfig        | 4 +---
- src/vendorcode/google/chromeos/vboot2/Kconfig | 4 ++++
- 4 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c
-index 15f7a5a..e4be29e 100644
---- a/src/lib/bootmode.c
-+++ b/src/lib/bootmode.c
-@@ -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(). */
-+#if CONFIG_VBOOT_VERIFY_FIRMWARE
- 	if (IS_ENABLED(CONFIG_CHROMEOS))
- 		return !vboot_skip_display_init();
-+#endif
- 
- 	/* By default always initialize display. */
- 	return 1;
-diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig
-index 65e6dc3..7947514 100644
---- a/src/soc/rockchip/rk3288/Kconfig
-+++ b/src/soc/rockchip/rk3288/Kconfig
-@@ -31,7 +31,7 @@ config SOC_ROCKCHIP_RK3288
- 
- if SOC_ROCKCHIP_RK3288
- 
--config CHROMEOS
-+config VBOOT_VERIFY_FIRMWARE
- 	select VBOOT_STARTS_IN_BOOTBLOCK
- 	select SEPARATE_VERSTAGE
- 	select RETURN_FROM_VERSTAGE
-diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig
-index d2a42a1..4068419 100644
---- a/src/vendorcode/google/chromeos/Kconfig
-+++ b/src/vendorcode/google/chromeos/Kconfig
-@@ -27,7 +27,6 @@ config CHROMEOS
- 	select BOOTMODE_STRAPS
- 	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
-@@ -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."
-+	default y if CHROMEOS
- 	default n
- 	depends on HAVE_HARD_RESET
- 	help
-diff --git a/src/vendorcode/google/chromeos/vboot2/Kconfig b/src/vendorcode/google/chromeos/vboot2/Kconfig
-index 7580d8d..141b636 100644
---- a/src/vendorcode/google/chromeos/vboot2/Kconfig
-+++ b/src/vendorcode/google/chromeos/vboot2/Kconfig
-@@ -12,6 +12,8 @@
- ## GNU General Public License for more details.
- ##
- 
-+if VBOOT_VERIFY_FIRMWARE
-+
- config VBOOT_STARTS_IN_BOOTBLOCK
- 	bool "Vboot starts verifying in bootblock"
- 	default n
-@@ -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
--- 
-2.8.0
-
diff --git a/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/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
deleted file mode 100644
index 53fc563e..00000000
--- a/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0001-firmware-Developer-mode-timeout-delay-shortening-dow.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
- to 3 seconds)
-
-A timeout delay of 3 seconds, with no bip, is much more appreciable for users.
-
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
----
- firmware/lib/vboot_audio.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/firmware/lib/vboot_audio.c b/firmware/lib/vboot_audio.c
-index 6071b0d..fd03bfd 100644
---- a/firmware/lib/vboot_audio.c
-+++ b/firmware/lib/vboot_audio.c
-@@ -30,11 +30,7 @@
- #define MAX_CUSTOM_DELAY      300000
- 
- /* These are visible externally only to make testing easier */
--VbDevMusicNote default_notes_[] = { {20000, 0}, /* 20 seconds */
--                                    {250, 400}, /* two beeps */
--                                    {250, 0},
--                                    {250, 400},
--                                    {9250, 0} }; /* total 30 seconds */
-+VbDevMusicNote default_notes_[] = { {3000, 0} }; /* three seconds */
- uint32_t default_count_ = sizeof(default_notes_) / sizeof(VbDevMusicNote);
- 
- VbDevMusicNote short_notes_[] = { {2000, 0} }; /* two seconds */
--- 
-2.8.0
-
diff --git a/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/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
deleted file mode 100644
index 669e6ded..00000000
--- a/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0002-firmware-Text-based-screen-display-in-priority.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
-
-This allows showing text-based screen displays before looking at the GBB bitmaps
-since those encourage the use of non-free software (Chrome OS) and don't display
-enough information to the user.
-
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
----
- firmware/lib/vboot_display.c | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
-index f2978fb..b95a1eb 100644
---- a/firmware/lib/vboot_display.c
-+++ b/firmware/lib/vboot_display.c
-@@ -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, locale))
-+	/* Display default first */
-+	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, locale);
-+	/* If default doesn't have anything to show, fall back to GBB bitmaps */
-+	return VbDisplayScreenFromGBB(cparams, screen, vncptr, locale);
- }
- 
- VbError_t VbDisplayScreen(VbCommonParams *cparams, uint32_t screen,
--- 
-2.8.0
-
diff --git a/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/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
deleted file mode 100644
index c82c546f..00000000
--- a/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0003-firmware-NV-context-pointer-handoff-to-VbExDisplaySc.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-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
-
-VbExDisplayScreen might need to display some information based on the NV context
-so it makes sense to pass that pointer along.
-
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
----
- 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 ddc8cc6..c98fca4 100644
---- a/firmware/include/vboot_api.h
-+++ b/firmware/include/vboot_api.h
-@@ -24,6 +24,7 @@
- #include <stdint.h>
- #include <stdlib.h>
- 
-+#include "vboot_nvstorage.h"
- #include "gpt.h"
- 
- /*****************************************************************************/
-@@ -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, 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 b95a1eb..472ca91 100644
---- a/firmware/lib/vboot_display.c
-+++ b/firmware/lib/vboot_display.c
-@@ -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, 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 2299a03..9c86fc7 100644
---- a/firmware/stub/vboot_api_stub.c
-+++ b/firmware/stub/vboot_api_stub.c
-@@ -43,7 +43,8 @@ VbError_t VbExDisplaySetDimension(uint32_t width, uint32_t height)
- 	return VBERROR_SUCCESS;
- }
- 
--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 cd927a8..16abc6e 100644
---- a/tests/vboot_api_devmode_tests.c
-+++ b/tests/vboot_api_devmode_tests.c
-@@ -265,7 +265,8 @@ VbError_t VbExBeep(uint32_t msec, uint32_t frequency) {
-   return beep_return;
- }
- 
--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"));
--- 
-2.8.0
-
diff --git a/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/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
deleted file mode 100644
index 1a7db50d..00000000
--- a/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0004-firmware-Hold-key-combination-in-developer-mode.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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
-
-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 | 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 fff3056..5e784eb 100644
---- a/firmware/lib/vboot_api_kernel.c
-+++ b/firmware/lib/vboot_api_kernel.c
-@@ -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;
- 
-@@ -417,6 +418,12 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
- 			ctrl_d_pressed = 1;
- 			goto fallout;
- 			break;
-+		case 0x08:
-+			/* Ctrl+H = hold */
-+			VBDEBUG(("VbBootDeveloper() - "
-+				 "hold developer mode screen\n"));
-+			hold = 1;
-+			break;
- 		case 0x0c:
- 			VBDEBUG(("VbBootDeveloper() - "
- 				 "user pressed Ctrl+L; Try legacy boot\n"));
-@@ -467,7 +474,7 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
- 			VbCheckDisplayKey(cparams, key, &vnc);
- 			break;
- 		}
--	} while(VbAudioLooping(audio));
-+	} while(hold || VbAudioLooping(audio));
- 
-  fallout:
- 
--- 
-2.8.0
-
diff --git a/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/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
deleted file mode 100644
index 152aee80..00000000
--- a/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0005-firmware-Screen-blank-and-wait-at-disabled-USB-boot-.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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
- warning
-
-This blanks the screen before showing the disabled USB boot warning.
-It also waits for the user to press any key to come back to the developer mode
-screen.
-
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
----
- firmware/lib/vboot_api_kernel.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
-index 5e784eb..7d22c93 100644
---- a/firmware/lib/vboot_api_kernel.c
-+++ b/firmware/lib/vboot_api_kernel.c
-@@ -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);
- 
-@@ -442,14 +443,23 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
- 			if (!allow_usb) {
- 				VBDEBUG(("VbBootDeveloper() - "
- 					 "USB booting is disabled\n"));
-+
-+				VbDisplayScreen(cparams, VB_SCREEN_BLANK, 1,
-+						&vnc);
-+
- 				VbExDisplayDebugInfo(
- 					"WARNING: Booting from external media "
- 					"(USB/SD) has not been enabled. Refer "
- 					"to the developer-mode documentation "
--					"for details.\n");
-+					"for details.\n\n"
-+					"Press any key to continue.\n\n");
- 				VbExBeep(120, 400);
- 				VbExSleepMs(120);
- 				VbExBeep(120, 400);
-+
-+				while (!VbExKeyboardRead()) ;
-+
-+				goto developer_mode_screen;
- 			} else {
- 				/*
- 				 * Clear the screen to show we get the Ctrl+U
--- 
-2.8.0
-
diff --git a/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/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
deleted file mode 100644
index 52f77d16..00000000
--- a/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0006-firmware-Separate-screen-and-wait-at-device-informat.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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
- screen
-
-This blanks the screen (instead of redrawing it) at device information and
-waits for the user to press any key to come back to the developer mode screen.
-
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
----
- firmware/lib/vboot_api_kernel.c | 12 ++++++++++++
- firmware/lib/vboot_display.c    | 13 ++++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
-index 7d22c93..4e6de18 100644
---- a/firmware/lib/vboot_api_kernel.c
-+++ b/firmware/lib/vboot_api_kernel.c
-@@ -425,6 +425,18 @@ developer_mode_screen:
- 				 "hold developer mode screen\n"));
- 			hold = 1;
- 			break;
-+		case 0x09:
-+			/* Ctrl+I = device information */
-+			VBDEBUG(("VbBootDeveloper() - "
-+				 "device info\n"));
-+
-+			hold = 1;
-+			VbDisplayDebugInfo(cparams, &vnc);
-+
-+			while (!VbExKeyboardRead()) ;
-+
-+			goto developer_mode_screen;
-+			break;
- 		case 0x0c:
- 			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 472ca91..e092189 100644
---- a/firmware/lib/vboot_display.c
-+++ b/firmware/lib/vboot_display.c
-@@ -541,7 +541,7 @@ const char *RecoveryReasonString(uint8_t code)
- 	return "We have no idea what this means";
- }
- 
--#define DEBUG_INFO_SIZE 512
-+#define DEBUG_INFO_SIZE 768
- 
- VbError_t VbDisplayDebugInfo(VbCommonParams *cparams, VbNvContext *vncptr)
- {
-@@ -556,8 +556,8 @@ VbError_t VbDisplayDebugInfo(VbCommonParams *cparams, VbNvContext *vncptr)
- 	VbError_t ret;
- 	uint32_t i;
- 
--	/* Redisplay current screen to overwrite any previous debug output */
--	VbDisplayScreen(cparams, disp_current_screen, 1, vncptr);
-+	/* Blank screen */
-+	VbDisplayScreen(cparams, VB_SCREEN_BLANK, 1, vncptr);
- 
- 	/* Add hardware ID */
- 	VbRegionReadHWID(cparams, hwid, sizeof(hwid));
-@@ -666,8 +666,11 @@ VbError_t VbDisplayDebugInfo(VbCommonParams *cparams, VbNvContext *vncptr)
- 		used += StrnAppend(buf + used, sha1sum, DEBUG_INFO_SIZE - used);
- 	}
- 
--	/* Make sure we finish with a newline */
--	used += StrnAppend(buf + used, "\n", DEBUG_INFO_SIZE - used);
-+	/* Make sure we finish with newlines */
-+	used += StrnAppend(buf + used, "\n\n", DEBUG_INFO_SIZE - used);
-+
-+	used += StrnAppend(buf + used, "Press any key to continue\n\n",
-+			   DEBUG_INFO_SIZE - used);
- 
- 	/* TODO: add more interesting data:
- 	 * - Information on current disks */
--- 
-2.8.0
-
diff --git a/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0007-firmware-Localization-keys-removal.patch b/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0007-firmware-Localization-keys-removal.patch
deleted file mode 100644
index 770f4c1a..00000000
--- a/resources/libreboot/patch/vboot/933c4e7aa4b873f0ad9cd4c348a1ea4f37f66aa7/depthcharge/veyron_speedy/0007-firmware-Localization-keys-removal.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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
-
-Since we're using a text-based interface, binding the arrow keys to localization
-changes has no effect and only makes the screen flicker.
-
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
----
- 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 4e6de18..62efd0f 100644
---- a/firmware/lib/vboot_api_kernel.c
-+++ b/firmware/lib/vboot_api_kernel.c
-@@ -263,7 +263,6 @@ int VbUserConfirms(VbCommonParams *cparams, uint32_t confirm_flags)
- 					return 1;
- 				}
- 			}
--			VbCheckDisplayKey(cparams, key, &vnc);
- 		}
- 		VbExSleepMs(CONFIRM_KEY_DELAY);
- 	}
-@@ -493,7 +492,6 @@ developer_mode_screen:
- 			break;
- 		default:
- 			VBDEBUG(("VbBootDeveloper() - pressed key %d\n", key));
--			VbCheckDisplayKey(cparams, key, &vnc);
- 			break;
- 		}
- 	} while(hold || VbAudioLooping(audio));
-@@ -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;
- 				}
--			} else {
--				VbCheckDisplayKey(cparams, key, &vnc);
- 			}
- 			if (VbWantShutdown(cparams->gbb->flags))
- 				return VBERROR_SHUTDOWN_REQUESTED;
--- 
-2.8.0
-
diff --git a/resources/scripts/helpers/build/clean/depthcharge b/resources/scripts/helpers/build/clean/depthcharge
deleted file mode 100755
index 9751d924..00000000
--- a/resources/scripts/helpers/build/clean/depthcharge
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-#  helper script: clean the dependencies that were built in depthcharge
-#
-#	Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# This script assumes that the current working directory is the root
-# of libreboot_src or libreboot git
-
-[ "x${DEBUG+set}" = 'xset' ] && set -v
-set -u -e
-
-# clean depthcharge
-# --------------------------------------------------------
-
-cd "depthcharge/"
-
-printf "Cleaning the previous build of depthcharge\n"
-make distclean
-
-# done. go back to main directoy
-cd "../"
-
-printf "\n\n"
diff --git a/resources/scripts/helpers/build/config/dcmodify b/resources/scripts/helpers/build/config/dcmodify
deleted file mode 100755
index 81e8756e..00000000
--- a/resources/scripts/helpers/build/config/dcmodify
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-
-#
-#  helper script: run "make menuconfig" on config(s) to modify them
-#
-#	Copyright (C) 2014, 2015, 2016 Leah Rowe <info@minifree.org>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# This script assumes that the working directory is the root
-# of libreboot_src or git
-
-[ "x${DEBUG+set}" = 'xset' ] && set -v
-set -u -e
-
-payload="depthcharge"
-configpath="resources/libreboot/config/${payload}"
-
-hackconfig () {
-	board="${1}"
-    cbrevision="$(cat ${configpath}/${board}/cbrevision)"
-    vbootrevision="$(cat ${configpath}/${board}/vbootrevision)"
-(
-	cd "coreboot/${cbrevision}/${cbrevision}/"
-    git checkout ${payload}_${board}
-    (
-        cd "3rdparty/vboot/"
-        git checkout ${payload}_${board}
-    )
-
-	printf "Modifying config for %s (%s payload)\n" "${board}" "${payload}"
-	sleep 2
-
-	if [ ! -d "../../../${configpath}/${board}/" ]; then
-		printf "build/config/dcmodify WARNING: config '%s' does not exist. Skipping.\n" "${board}"
-        git checkout master
-        (
-            cd "3rdparty/vboot/"
-            git checkout master
-        )
-		return
-	fi
-	
-	mv "../../../${configpath}/${board}/config" ".config"
-	make menuconfig
-	mv ".config" "../../../${configpath}/${board}/config"
-
-    git checkout master
-    (
-        cd "3rdparty/vboot/"
-        git checkout master
-    )
-)
-}
-
-if [ $# -lt 1 ]; then
-	for config in ${configpath}/*; do hackconfig "${config##*/}"; done
-else
-	for config in "${@}"; do hackconfig "${config}"; done
-fi
diff --git a/resources/scripts/helpers/build/config/dcreplace b/resources/scripts/helpers/build/config/dcreplace
deleted file mode 100755
index d3265ae2..00000000
--- a/resources/scripts/helpers/build/config/dcreplace
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-#
-#  helper script: run "make menuconfig" on config(s) to replace them
-#
-#	Copyright (C) 2014, 2015, 2016 Leah Rowe <info@minifree.org>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# This script assumes that the working directory is the root
-# of libreboot_src or git
-
-[ "x${DEBUG+set}" = 'xset' ] && set -v
-set -u -e
-
-payload="depthcharge"
-configpath="resources/libreboot/config/${payload}"
-
-hackconfig () {
-	board="${1}"
-    cbrevision="$(cat ${configpath}/${board}/cbrevision)"
-    vbootrevision="$(cat ${configpath}/${board}/vbootrevision)"
-(
-	cd "coreboot/${cbrevision}/${cbrevision}/"
-    git checkout ${payload}_${board}
-    (
-        cd "3rdparty/vboot/"
-        git checkout ${payload}_${board}
-    )
-
-	printf "Replacing or creating new config for %s (%s payload)\n" "${board}" "${payload}"
-	sleep 2
-	
-	make menuconfig
-
-	[ ! -d "../../../${configpath}/${board}/" ] && mkdir -p "../../../${configpath}/${board}/"
-	mv ".config" "../../../${configpath}/${board}/config"
-
-    git checkout master
-    (
-        cd "3rdparty/vboot/"
-        git checkout master
-    )
-)
-}
-
-if [ $# -lt 1 ]; then
-	for config in ${configpath}/*; do hackconfig "${config##*/}"; done
-else
-	for config in "${@}"; do hackconfig "${config}"; done
-fi
diff --git a/resources/scripts/helpers/build/config/dcupdate b/resources/scripts/helpers/build/config/dcupdate
deleted file mode 100755
index 8d45c9de..00000000
--- a/resources/scripts/helpers/build/config/dcupdate
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-
-#
-#  helper script: run "make oldconfig" on all coreboot config files
-#
-#	Copyright (C) 2014, 2015, 2016 Leah Rowe <info@minifree.org>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# This script assumes that the working directory is the root
-# of libreboot_src or git
-
-[ "x${DEBUG+set}" = 'xset' ] && set -v
-set -u -e
-
-payload="depthcharge"
-configpath="resources/libreboot/config/${payload}"
-
-hackconfig () {
-	board="${1}"
-    cbrevision="$(cat ${configpath}/${board}/cbrevision)"
-    vbootrevision="$(cat ${configpath}/${board}/vbootrevision)"
-(
-    cd "coreboot/${cbrevision}/${cbrevision}/"
-    git checkout ${payload}_${board}
-    (
-        cd "3rdparty/vboot/"
-        git checkout ${payload}_${board}
-    )
-
-	printf "Updating config for %s (%s payload)\n" "${board}" "${payload}"
-	sleep 2
-
-	if [ ! -d "../../../${configpath}/${board}/" ]; then
-		printf "build/config/dcupdate WARNING: config '%s' does not exist. Skipping.\n" "${board}"
-        git checkout master
-        (
-            cd "3rdparty/vboot/"
-            git checkout master
-        )
-		return
-	fi
-	
-	mv "../../../${configpath}/${board}/config" ".config"
-	make oldconfig
-	mv ".config" "../../../${configpath}/${board}/config"
-
-    git checkout master
-    (
-        cd "3rdparty/vboot/"
-        git checkout master
-    )
-)
-}
-
-if [ $# -lt 1 ]; then
-	for config in ${configpath}/*; do hackconfig "${config##*/}"; done
-else
-	for config in "${@}"; do hackconfig "${config}"; done
-fi
diff --git a/resources/scripts/helpers/build/release/src b/resources/scripts/helpers/build/release/src
index 0fde6899..c33f9b4b 100755
--- a/resources/scripts/helpers/build/release/src
+++ b/resources/scripts/helpers/build/release/src
@@ -88,7 +88,6 @@ printf '\n'
 rm -Rf "${distdir}/bucts/".git*
 rm -Rf "${distdir}/flashrom/".git*
 rm -Rf "${distdir}/grub/".git*
-rm -Rf "${distdir}/depthcharge/".git*
 rm -Rf "${distdir}/seabios/".git*
 
 rm -f "${distdir}"/*.vim
@@ -107,8 +106,6 @@ rm -Rf "${distdir}/resources/utilities/coreboot-libre/"
 rm -f "${distdir}/download"
 rm -Rf "${distdir}/resources/scripts/helpers/download/"
 
-# Other patches aren't needed in the release, either
-rm -Rf "${distdir}/resources/depthcharge/patch/"
 rm -Rf "${distdir}/resources/grub/patch/"
 rm -Rf "${distdir}/resources/memtest86plus/patch/"
 
diff --git a/resources/scripts/helpers/build/roms/withdepthcharge b/resources/scripts/helpers/build/roms/withdepthcharge
deleted file mode 100755
index 1df97a23..00000000
--- a/resources/scripts/helpers/build/roms/withdepthcharge
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/bin/bash
-
-#  helper script: build ROM images with depthcharge and put them in ./bin/
-#
-#	Copyright (C) 2014, 2015, 2016 Leah Rowe <info@minifree.org>
-#	Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# This script assumes that the working directory is the
-# root of libreboot_src or libreboot git.
-
-[ "x${DEBUG+set}" = 'xset' ] && set -v
-set -u -e
-if [ -z ${NPROC+x} ]; then
-	cores="$(nproc)"
-else
-	case ${NPROC} in
-		''|*[!0-9]*)
-			printf "value '%s' for NPROC is invalid. non-numeric. Exiting.\n" "${NPROC}"
-			exit 1
-			;;
-	esac
-	cores="${NPROC}"
-fi
-
-printf "Building ROM images with the depthcharge payload\n"
-
-if [ ! -d "bin/" ]
-then
-	mkdir "bin/"
-fi
-
-if [ -f "version" ]; then
-	# _src release archive is being used
-	version="$(cat "version")"
-else
-	# git repo is being used
-	version="$(git describe --tags HEAD)" # note: in libreboot, coreboot/.git doesn't exist, this uses libreboot .git
-fi
-
-# Build libpayload
-# ------------------------------------------------------------------------------
-
-buildlibpayload() {
-	family="${1}"
-	board="${2}"
-	cbrevision="${3}"
-	vbootrevision="${4}"
-
-	( 
-		cd "coreboot/${cbrevision}/${cbrevision}/"
-		git checkout depthcharge_${board}
-
-		(
-			cd "3rdparty/vboot/"
-			git checkout depthcharge_${board}
-		)
-
-		cd "payloads/libpayload/"
-
-		make distclean
-		rm -Rf "install/"
-
-		make KBUILD_DEFCONFIG="configs/config.$family" defconfig
-		make -j${cores}
-		make DESTDIR="install" install
-
-		cd "../../"
-		git checkout master
-		cd "3rdparty/vboot/"
-		git checkout master
-	)
-}
-
-# Build depthcharge
-# ------------------------------------------------------------------------------
-
-builddepthcharge() {
-	board="${1}"
-	cbrevision="${2}"
-	vbootrevision="${3}"
-
-	(
-		(
-			cd "coreboot/${cbrevision}/${cbrevision}/"
-			git checkout depthcharge_${board}
-
-			cd "3rdparty/vboot/"
-			git checkout depthcharge_${board}
-		)
-
-		cd "depthcharge/"
-
-		make distclean
-		rm -f "../coreboot/${cbrevision:?}/${cbrevision:?}/payload.elf"
-
-		make BOARD="${board}" defconfig
-		make BOARD="${board}" LIBPAYLOAD_DIR="$(pwd)/../coreboot/${cbrevision}/${cbrevision}/payloads/libpayload/install/libpayload" VB_SOURCE="$(pwd)/../coreboot/${cbrevision}/${cbrevision}/3rdparty/vboot" -j${cores} depthcharge_unified
-
-		cp "build/depthcharge.elf" "../coreboot/${cbrevision}/${cbrevision}/payload.elf"
-
-		cd "../coreboot/${cbrevision}/${cbrevision}/"
-		git checkout master
-
-		cd "3rdparty/vboot/"
-		git checkout master
-	)
-}
-
-# Build coreboot
-# ------------------------------------------------------------------------------
-
-buildcoreboot() {
-	board="${1}"
-	cbrevision="${2}"
-	vbootrevision="${3}"
-
-	(
-		cd "coreboot/${cbrevision}/${cbrevision}"
-		git checkout depthcharge_${board}
-
-		(
-			cd "3rdparty/vboot/"
-			git checkout depthcharge_${board}
-		)
-
-		make distclean
-		rm -f ".coreboot-version"
-		rm -f *.img
-
-		printf 'libreboot-%s' "${version}" > "ro-frid"
-		printf 'libreboot-%s\n' "${version}" > ".coreboot-version" # needed for reproducible builds in coreboot
-
-		make KBUILD_DEFCONFIG="$(pwd)/../../../resources/libreboot/config/depthcharge/${board}/config" defconfig
-		make -j${cores}
-
-		cbfs_size=$( grep CONFIG_CBFS_SIZE ".config" | sed "s/.*[[:space:]]*=[[:space:]]*//g" )
-		cbfs_size=$( printf "%d\n" "${cbfs_size}" )
-		cbfs_size=$(( $cbfs_size / 1024 ))
-
-		dd if="build/coreboot.rom" of="coreboot.img" bs=1024 count="${cbfs_size}"
-
-		objcopy -I binary -O binary --pad-to=0x100 --gap-fill=0x00 "ro-frid" "ro-frid.img"
-
-		# prepare directory for new images
-		rm -Rf "${board:?}/"
-		mkdir "${board}/"
-		# move the images into the newly created directory
-		mv "coreboot.img" "${board}/"
-		mv "ro-frid.img" "${board}/"
-		# copy the scripts too
-		cp "../../../resources/libreboot/install/depthcharge/cros-flash-replace" "${board}/"
-		cp "../../../resources/libreboot/install/depthcharge/${board}/layout.txt" "${board}/"
-		# delete the old images from ../bin
-		rm -Rf "../../../bin/depthcharge/${board}/"
-		# now put the new images in ./bin/depthcharge/
-		[ ! -d "../../../bin/depthcharge/" ] && mkdir -p "../../../bin/depthcharge/"
-		mv "${board}/" "../../../bin/depthcharge/"
-
-		# clean this up
-		rm -f "payload.elf"
-		rm -f *.img
-
-		git checkout master
-
-		cd "3rdparty/vboot/"
-		git checkout master
-	)
-}
-
-# Build ROM images for supported boards
-buildrom() {
-	board="${1}"
-	cbrevision="$(cat resources/libreboot/config/depthcharge/${board}/cbrevision)"
-	vbootrevision="$(cat resources/libreboot/config/depthcharge/${board}/vbootrevision)"
-
-	if [ -f "resources/libreboot/config/depthcharge/${board}/config" ]; then
-		family=$( echo ${board} |sed "s/_.*//g" )
-
-		buildlibpayload "${family}" "${board}" "${cbrevision}" "${vbootrevision}"
-		builddepthcharge "${board}" "${cbrevision}" "${vbootrevision}" 
-		buildcoreboot "${board}" "${cbrevision}" "${vbootrevision}"
-	fi
-}
-
-if [ $# -gt 0 ]; then
-	for board in "${@}"; do
-		buildrom "${board}"
-	done
-else
-	for board in resources/libreboot/config/depthcharge/*; do
-		buildrom "${board##*/}"
-	done
-fi
diff --git a/resources/scripts/helpers/download/depthcharge b/resources/scripts/helpers/download/depthcharge
deleted file mode 100755
index 9827a346..00000000
--- a/resources/scripts/helpers/download/depthcharge
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-
-#  helper script: downloads depthcharge and patches it
-#
-#	Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# This script assumes that the working directory is the
-# root of libreboot_src or libreboot git.
-
-[ "x${DEBUG+set}" = 'xset' ] && set -v
-set -u -e
-
-# Get depthcharge and patch it
-
-printf "Downloading depthcharge\n"
-
-rm -Rf "depthcharge/"
-
-# Get depthcharge
-# ------------------------------------------------------------------------------
-
-# download depthcharge from git
-git clone https://chromium.googlesource.com/chromiumos/platform/depthcharge
-
-# enter the tree to patch it
-cd "depthcharge/"
-
-# reset to the latest previously tested revision
-git reset --hard 065ba14bc56c9044247fef6337d8f9e9a3055820
-
-# Patch depthcharge
-# ------------------------------------------------------------------------------
-
-printf "arm: armv7-a march abi flag for ARMv7 hardware\n"
-git am "../resources/depthcharge/patch/0001-arm-armv7-a-march-abi-flag-for-ARMv7-hardware.patch"
-
-printf "Coreboot image integration removal\n"
-git am "../resources/depthcharge/patch/0002-Coreboot-image-integration-removal.patch"
-
-printf "DOTCONFIG location correction\n"
-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/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/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/0008-vboot-Display-callbacks-for-developer-and-recovery-m.patch"
-
-# leave the tree
-cd "../"
-
-printf "\n\n"
author	4 of 7 (Leah Rowe) info@minifree.org <info@minifree.org>	2017-01-22 03:18:10 +0000
committer	4 of 7 (Leah Rowe) info@minifree.org <info@minifree.org>	2017-01-22 03:25:50 +0000
commit	cab47f3178db195d797db89486dc56383c28aace (patch)
tree	e515305d51c8220dda5c74e3c91de876fa4931f5 /resources
parent	bae4652b291d4310c9ff105a874c009b3cdbaedc (diff)
download	librebootfr-cab47f3178db195d797db89486dc56383c28aace.tar.gz librebootfr-cab47f3178db195d797db89486dc56383c28aace.zip