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>btrfsvols
parent
705149a3e0
commit
27ee975e86
|
@ -14,7 +14,7 @@
|
|||
}
|
||||
|
||||
{grub}{
|
||||
rev: f7564844f82b57078d601befadc438b5bc1fa01b
|
||||
rev: 7a994c87f571ac99745645be0bdde9827297321a
|
||||
loc: grub
|
||||
url: git://git.savannah.gnu.org/grub.git
|
||||
bkup_url: http://git.savannah.gnu.org/r/grub.git
|
||||
|
|
|
@ -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
|
||||
|
Loading…
Reference in New Issue