summaryrefslogtreecommitdiff
path: root/resources/grub
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-08-06 00:19:18 +0100
committerLeah Rowe <leah@libreboot.org>2023-08-06 01:02:53 +0100
commit27ee975e8676fa14d536219fb827cd64dfb5dc74 (patch)
treedc6df9acdf59e4aebc1b337adfb35f8402447070 /resources/grub
parent705149a3e089fb99e671a47b0acd3a30378dd659 (diff)
bump grub revision to 2.12-rc1
This is specifically the following Git revision: 7a994c87f571ac99745645be0bdde9827297321a from 10 July 2023 The keyboard fix for HP EliteBooks was merged upstream, so lbmk no longer needs this patch; it comes with GRUB. Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'resources/grub')
-rw-r--r--resources/grub/patches/0005-at-keyboard-timeout.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/resources/grub/patches/0005-at-keyboard-timeout.patch b/resources/grub/patches/0005-at-keyboard-timeout.patch
deleted file mode 100644
index bdc2955c..00000000
--- a/resources/grub/patches/0005-at-keyboard-timeout.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 674002256247a01f4969a3795a5aceca68792a55 Mon Sep 17 00:00:00 2001
-From: Riku Viitanen <riku.viitanen@protonmail.com>
-Date: Fri, 21 Apr 2023 21:41:07 +0300
-Subject: [PATCH] at_keyboard.c: add timeout to fix hang on hp elitebooks
-
-This fixes GRUB on Coreboot on HP EliteBooks by implementing
-a 200ms timeout. GRUB used to hang. see: https://ticket.coreboot.org/issues/141
----
- grub-core/term/at_keyboard.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
-index 597111077..28d1d0a77 100644
---- a/grub-core/term/at_keyboard.c
-+++ b/grub-core/term/at_keyboard.c
-@@ -42,7 +42,16 @@ keyboard_controller_wait_until_ready (void)
- {
- /* 50 us would be enough but our current time resolution is 1ms. */
- grub_millisleep (1);
-- while (! KEYBOARD_COMMAND_ISREADY (grub_inb (KEYBOARD_REG_STATUS)));
-+
-+ unsigned i = 200;
-+ while (! KEYBOARD_COMMAND_ISREADY (grub_inb (KEYBOARD_REG_STATUS))) {
-+ grub_millisleep (1);
-+
-+ /* Timeout */
-+ if (! i--) {
-+ break;
-+ }
-+ }
- }
-
- static grub_uint8_t
---
-2.40.0
-