mirror of
https://codeberg.org/canoeboot/cbmk.git
synced 2025-01-10 17:19:57 +00:00
eb4ac3c334
The xHCI patches were removed because they caused issues on Sandybridge-based Dell Latitude laptops. See: https://codeberg.org/libreboot/lbmk/issues/216 The issue was not reported elsewhere, but we still don't need xHCI support in Canoeboot's GRUB because none of the available coreboot targets have xHCI support. However, we may want it in the future and it helps to keep Canoeboot in sync with Libreboot (this patch is adapted from lbmk). Each given coreboot target can say which GRUB tree to use by setting this in target.cfg: grubtree="xhci" In the above example, the "xhci" tree would be used. Some generic GRUB config has been moved to config/data/grub/ and config/grub/ now looks like config/coreboot/ - also, the grub.cfg file (named "payload" in each tree) is copied to the GRUB source tree as ".config", then added to GRUB's memdisk in the same way, as grub.cfg. Several other design changes had to be made because of this: * grub.cfg in memdisk no longer automatically jumps to one in CBFS, but now shows a menuentry for it if available * Certain commands in script/trees are disabled for GRUB, such as *config make commands. * gnulib is now defined in config/submodule/grub/, instead of config/git/grub - and this mitigates an existing bug where downloading gnulib first would make grub no longer possible to download in lbmk. There is another reason for merging this design change from lbmk, and that reasoning also applies to lbmk. Specifically: This change will enable per-board GRUB optimisation in the future. For example, we hardcode what partitions and LVMs GRUB scans because * is slow on ICH7-based machines, due to GRUB's design. On other machines, * is reasonably fast, for automatically enumerating the list of devices for boot. Use of * (and other wildcards) could enable our GRUB payload to automatically boot more distros, with minimal fuss. This can be done at a later date, in subsequent revisions. Signed-off-by: Leah Rowe <leah@libreboot.org>
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From 0a6abeb40ac4284fbff6ef5958989d561b6290a7 Mon Sep 17 00:00:00 2001
|
|
From: Leah Rowe <leah@libreboot.org>
|
|
Date: Tue, 31 Oct 2023 10:33:28 +0000
|
|
Subject: [PATCH 1/1] keylayouts: don't print "Unknown key" message
|
|
|
|
on keyboards with stuck keys, this results in GRUB just
|
|
spewing it repeatedly, preventing use of GRUB.
|
|
|
|
in such cases, it's still possible to use the keyboard,
|
|
and we should let the user at least boot.
|
|
|
|
it often appears when people plug in faulty usb keyboards,
|
|
but can appear for laptop keyboards too; one of my e6400
|
|
has stuck keys.
|
|
|
|
with this patch, grub should be a bit more reliable in
|
|
terms of user experience, when the keyboard is faulty.
|
|
|
|
Signed-off-by: Leah Rowe <leah@libreboot.org>
|
|
---
|
|
grub-core/commands/keylayouts.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/grub-core/commands/keylayouts.c b/grub-core/commands/keylayouts.c
|
|
index aa3ba34f2..445fa0601 100644
|
|
--- a/grub-core/commands/keylayouts.c
|
|
+++ b/grub-core/commands/keylayouts.c
|
|
@@ -174,7 +174,6 @@ grub_term_map_key (grub_keyboard_key_t code, int status)
|
|
key = map_key_core (code, status, &alt_gr_consumed);
|
|
|
|
if (key == 0 || key == GRUB_TERM_SHIFT) {
|
|
- grub_printf ("Unknown key 0x%x detected\n", code);
|
|
return GRUB_TERM_NO_KEY;
|
|
}
|
|
|
|
--
|
|
2.39.2
|
|
|