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

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

1 files changed, 0 insertions, 219 deletions

diff --git a/resources/depthcharge/patch/0007-vboot-Display-callbacks-for-developer-and-recovery-m.patch b/resources/depthcharge/patch/0007-vboot-Display-callbacks-for-developer-and-recovery-m.patch
deleted file mode 100644
index ea06121..0000000
--- a/resources/depthcharge/patch/0007-vboot-Display-callbacks-for-developer-and-recovery-m.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From 541a3f09ecb062e3f0778eb9846732cfabcbfbba Mon Sep 17 00:00:00 2001
-From: Paul Kocialkowski <contact@paulk.fr>
-Date: Tue, 11 Aug 2015 11:22:54 +0200
-Subject: [PATCH 7/7] vboot: Display callbacks for developer and recovery mode
- 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 | 168 +++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 156 insertions(+), 12 deletions(-)
-
-diff --git a/src/vboot/callbacks/display.c b/src/vboot/callbacks/display.c
-index efa0691..b659f7b 100644
---- a/src/vboot/callbacks/display.c
-+++ b/src/vboot/callbacks/display.c
-@@ -84,9 +84,17 @@ void print_on_center(const char *msg)
- 	print_string(msg);
- }
- 
--VbError_t VbExDisplayScreen(uint32_t screen_type)
-+VbError_t VbExDisplayScreen(uint32_t screen_type, VbNvContext *vnc)
- {
--	const char *msg = NULL;
-+	unsigned int rows, cols;
-+	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
-@@ -98,31 +106,167 @@ VbError_t VbExDisplayScreen(uint32_t screen_type)
- 		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);
-+		}
-+
-+		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");
-+		}
-+
-+		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;
- 	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;
- }
- 
--- 
-1.9.1
-