aboutsummaryrefslogtreecommitdiff
path: root/resources/libreboot/patch/vboot/0006-firmware-Separate-screen-and-wait-at-device-informat.patch
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2016-01-02 22:10:32 +0000
committerFrancis Rowe <info@gluglug.org.uk>2016-01-04 20:28:39 +0000
commitd1f408f3725aa02bc1d76c4c6aadb4697bd073c0 (patch)
tree7eed036543ae1f8c57b56825880a722a8efbedf1 /resources/libreboot/patch/vboot/0006-firmware-Separate-screen-and-wait-at-device-informat.patch
parent91aec7e72005dcda72d19f2d024a02d8c0f86590 (diff)
downloadlibrebootfr-d1f408f3725aa02bc1d76c4c6aadb4697bd073c0.tar.gz
librebootfr-d1f408f3725aa02bc1d76c4c6aadb4697bd073c0.zip
Use different coreboot revisions and patches per board
The release archives will be bigger, but this is a necessary change that makes libreboot development easier. At present, there are boards maintained in libreboot by different people. By doing it this way, that becomes much easier. This is in contrast to the present situation, where a change to one board potentially affects all other boards, especially when updating to a new version of coreboot. Coreboot-libre scripts, download scripts, build scripts - everything. The entire build system has been modified to reflect this change of development. For reasons of consistency, cbfstool and nvramtool are no longer included in the util archives.
Diffstat (limited to 'resources/libreboot/patch/vboot/0006-firmware-Separate-screen-and-wait-at-device-informat.patch')
-rw-r--r--resources/libreboot/patch/vboot/0006-firmware-Separate-screen-and-wait-at-device-informat.patch79
1 files changed, 0 insertions, 79 deletions
diff --git a/resources/libreboot/patch/vboot/0006-firmware-Separate-screen-and-wait-at-device-informat.patch b/resources/libreboot/patch/vboot/0006-firmware-Separate-screen-and-wait-at-device-informat.patch
deleted file mode 100644
index e2d4ef7e..00000000
--- a/resources/libreboot/patch/vboot/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
-