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

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

7 files changed, 0 insertions, 389 deletions

diff --git a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0001-firmware-Developer-mode-timeout-delay-shortening-dow.patch b/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0001-firmware-Developer-mode-timeout-delay-shortening-dow.patch
deleted file mode 100644
index f843e506..00000000
--- a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0001-firmware-Developer-mode-timeout-delay-shortening-dow.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From eaf081085930dd7614e2f77bbc1f80d6b1e003eb 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 e24a039..f96d5f4 100644
---- a/firmware/lib/vboot_audio.c
-+++ b/firmware/lib/vboot_audio.c
-@@ -30,11 +30,7 @@
- #define MAX_CUSTOM_DELAY      60000
- 
- /* 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 */
--- 
-1.9.1
-
diff --git a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0002-firmware-Text-based-screen-display-in-priority.patch b/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0002-firmware-Text-based-screen-display-in-priority.patch
deleted file mode 100644
index 3e2a997d..00000000
--- a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0002-firmware-Text-based-screen-display-in-priority.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ceb9ba56a8ef48e18712c38d97b8541a324c7edd 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 c3cc636..542aaed 100644
---- a/firmware/lib/vboot_display.c
-+++ b/firmware/lib/vboot_display.c
-@@ -324,13 +324,12 @@ VbError_t VbDisplayScreen(VbCommonParams *cparams, uint32_t screen,
- 	/* Request the screen */
- 	disp_current_screen = screen;
- 
--	/* Look in the GBB first */
--	if (VBERROR_SUCCESS == VbDisplayScreenFromGBB(cparams, screen,
--						      vncptr))
-+	/* Display default first */
-+	if (VBERROR_SUCCESS == VbExDisplayScreen(screen))
- 		return VBERROR_SUCCESS;
- 
--	/* If screen wasn't in the GBB bitmaps, fall back to a default */
--	return VbExDisplayScreen(screen);
-+	/* If default doesn't have anything to show, fall back to GBB bitmaps */
-+	return VbDisplayScreenFromGBB(cparams, screen,  vncptr);
- }
- 
- static void Uint8ToString(char *buf, uint8_t val)
--- 
-1.9.1
-
diff --git a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0003-firmware-NV-context-pointer-handoff-to-VbExDisplaySc.patch b/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0003-firmware-NV-context-pointer-handoff-to-VbExDisplaySc.patch
deleted file mode 100644
index a9d85a07..00000000
--- a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0003-firmware-NV-context-pointer-handoff-to-VbExDisplaySc.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 5bd1373a9313bc31bacb2d765ede2c19242a7e9b 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    | 3 ++-
- firmware/lib/vboot_display.c    | 2 +-
- firmware/stub/vboot_api_stub.c  | 2 +-
- tests/vboot_api_devmode_tests.c | 2 +-
- 4 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h
-index 7e94773..66d1ee4 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"
- 
- /*****************************************************************************/
-@@ -765,7 +766,7 @@ VbError_t VbExDisplaySetDimension(uint32_t width, uint32_t height);
-  * to be simple ASCII text such as "NO GOOD" or "INSERT"; these screens should
-  * only be seen during development.
-  */
--VbError_t VbExDisplayScreen(uint32_t screen_type);
-+VbError_t VbExDisplayScreen(uint32_t screen_type, VbNvContext *vnc);
- 
- /**
-  * Write an image to the display, with the upper left corner at the specified
-diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
-index 542aaed..0158cc2 100644
---- a/firmware/lib/vboot_display.c
-+++ b/firmware/lib/vboot_display.c
-@@ -325,7 +325,7 @@ VbError_t VbDisplayScreen(VbCommonParams *cparams, uint32_t screen,
- 	disp_current_screen = screen;
- 
- 	/* Display default first */
--	if (VBERROR_SUCCESS == VbExDisplayScreen(screen))
-+	if (VBERROR_SUCCESS == VbExDisplayScreen(screen, vncptr))
- 		return VBERROR_SUCCESS;
- 
- 	/* If default doesn't have anything to show, fall back to GBB bitmaps */
-diff --git a/firmware/stub/vboot_api_stub.c b/firmware/stub/vboot_api_stub.c
-index 7320b6c..f773b6e 100644
---- a/firmware/stub/vboot_api_stub.c
-+++ b/firmware/stub/vboot_api_stub.c
-@@ -43,7 +43,7 @@ VbError_t VbExDisplaySetDimension(uint32_t width, uint32_t height)
- 	return VBERROR_SUCCESS;
- }
- 
--VbError_t VbExDisplayScreen(uint32_t screen_type)
-+VbError_t VbExDisplayScreen(uint32_t screen_type, VbNvContext *vnc)
- {
- 	return VBERROR_SUCCESS;
- }
-diff --git a/tests/vboot_api_devmode_tests.c b/tests/vboot_api_devmode_tests.c
-index 925a146..af90f7f 100644
---- a/tests/vboot_api_devmode_tests.c
-+++ b/tests/vboot_api_devmode_tests.c
-@@ -265,7 +265,7 @@ VbError_t VbExBeep(uint32_t msec, uint32_t frequency) {
-   return beep_return;
- }
- 
--VbError_t VbExDisplayScreen(uint32_t screen_type) {
-+VbError_t VbExDisplayScreen(uint32_t screen_type, VbNvContext *vnc) {
-   switch(screen_type) {
-   case VB_SCREEN_BLANK:
-     VBDEBUG(("VbExDisplayScreen(BLANK)\n"));
--- 
-1.9.1
-
diff --git a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0004-firmware-Hold-key-combination-in-developer-mode.patch b/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0004-firmware-Hold-key-combination-in-developer-mode.patch
deleted file mode 100644
index 1980d773..00000000
--- a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0004-firmware-Hold-key-combination-in-developer-mode.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 741adbf4fdb4ef72245f9373a2980ecade41f3f5 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 | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
-index 312014b..e191137 100644
---- a/firmware/lib/vboot_api_kernel.c
-+++ b/firmware/lib/vboot_api_kernel.c
-@@ -251,7 +251,7 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
- 	GoogleBinaryBlockHeader *gbb = cparams->gbb;
- 	VbSharedDataHeader *shared =
- 		(VbSharedDataHeader *)cparams->shared_data_blob;
--	uint32_t allow_usb = 0, allow_legacy = 0, ctrl_d_pressed = 0;
-+	uint32_t allow_usb = 0, allow_legacy = 0, ctrl_d_pressed = 0, hold = 0;
- 	VbAudioContext *audio = 0;
- 
- 	VBDEBUG(("Entering %s()\n", __func__));
-@@ -364,6 +364,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"));
-@@ -430,7 +436,7 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
- 			VbCheckDisplayKey(cparams, key, &vnc);
- 			break;
- 		}
--	} while(VbAudioLooping(audio));
-+	} while(hold || VbAudioLooping(audio));
- 
-  fallout:
- 
--- 
-1.9.1
-
diff --git a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0005-firmware-Screen-blank-and-wait-at-disabled-USB-boot-.patch b/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0005-firmware-Screen-blank-and-wait-at-disabled-USB-boot-.patch
deleted file mode 100644
index 82d0d951..00000000
--- a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0005-firmware-Screen-blank-and-wait-at-disabled-USB-boot-.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 05a34ae55a702d0e415811fedb959f71bbd782d5 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 e191137..6463571 100644
---- a/firmware/lib/vboot_api_kernel.c
-+++ b/firmware/lib/vboot_api_kernel.c
-@@ -266,6 +266,7 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
- 	if (gbb->flags & GBB_FLAG_FORCE_DEV_BOOT_LEGACY)
- 		allow_legacy = 1;
- 
-+developer_mode_screen:
- 	/* Show the dev mode warning screen */
- 	VbDisplayScreen(cparams, VB_SCREEN_DEVELOPER_WARNING, 0, &vnc);
- 
-@@ -388,14 +389,23 @@ VbError_t VbBootDeveloper(VbCommonParams *cparams, LoadKernelParams *p)
- 			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
--- 
-1.9.1
-
diff --git a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0006-firmware-Separate-screen-and-wait-at-device-informat.patch b/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0006-firmware-Separate-screen-and-wait-at-device-informat.patch
deleted file mode 100644
index e2d4ef7e..00000000
--- a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0006-firmware-Separate-screen-and-wait-at-device-informat.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From b724719ae34c3fd7c25502339f9029ee9e0bbb1e 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 6463571..2f33258 100644
---- a/firmware/lib/vboot_api_kernel.c
-+++ b/firmware/lib/vboot_api_kernel.c
-@@ -371,6 +371,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 0158cc2..c3d504d 100644
---- a/firmware/lib/vboot_display.c
-+++ b/firmware/lib/vboot_display.c
-@@ -503,7 +503,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)
- {
-@@ -518,8 +518,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));
-@@ -622,8 +622,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 */
--- 
-1.9.1
-
diff --git a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0007-firmware-Localization-keys-removal.patch b/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0007-firmware-Localization-keys-removal.patch
deleted file mode 100644
index ca0e6840..00000000
--- a/resources/libreboot/patch/vboot/fbf631c845c08299f0bcbae3f311c5807d34c0d6/depthcharge/veyron_speedy/0007-firmware-Localization-keys-removal.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 982044d150604b74e2bb619ca00042430dd0b73d 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 | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
-index 2f33258..a5d2f03 100644
---- a/firmware/lib/vboot_api_kernel.c
-+++ b/firmware/lib/vboot_api_kernel.c
-@@ -229,7 +229,6 @@ int VbUserConfirms(VbCommonParams *cparams, uint32_t confirm_flags)
- 					return 1;
- 				}
- 			}
--			VbCheckDisplayKey(cparams, key, &vnc);
- 		}
- 		VbExSleepMs(CONFIRM_KEY_DELAY);
- 	}
-@@ -455,7 +454,6 @@ developer_mode_screen:
- 			break;
- 		default:
- 			VBDEBUG(("VbBootDeveloper() - pressed key %d\n", key));
--			VbCheckDisplayKey(cparams, key, &vnc);
- 			break;
- 		}
- 	} while(hold || VbAudioLooping(audio));
-@@ -539,8 +537,6 @@ VbError_t VbBootRecovery(VbCommonParams *cparams, LoadKernelParams *p)
- 			 * platforms don't like to scan USB too rapidly.
- 			 */
- 			for (i = 0; i < REC_DISK_DELAY; i += REC_KEY_DELAY) {
--				VbCheckDisplayKey(cparams, VbExKeyboardRead(),
--						  &vnc);
- 				if (VbWantShutdown(cparams->gbb->flags))
- 					return VBERROR_SHUTDOWN_REQUESTED;
- 				VbExSleepMs(REC_KEY_DELAY);
-@@ -638,8 +634,6 @@ VbError_t VbBootRecovery(VbCommonParams *cparams, LoadKernelParams *p)
- 					i = 4;
- 					break;
- 				}
--			} else {
--				VbCheckDisplayKey(cparams, key, &vnc);
- 			}
- 			if (VbWantShutdown(cparams->gbb->flags))
- 				return VBERROR_SHUTDOWN_REQUESTED;
--- 
-1.9.1
-