Disable building video_bochs and video_cirrus for EFI x86 platforms (i386_efi
and x86_64_efi). For x86 EFI platforms efi_gop or efi_uga should provide the
video support. Currently, in EFI platforms there is a risk that both the
legacy device is present and the EFI video interface - which can cause
unexpected video corruption when a mix of the two interfaces are used. This
can happen when all_video is loaded for simplicity in a GRUB config.

Fixes: https://savannah.gnu.org/bugs/index.php?66200

Signed-off-by: Andrew Hamilton <[email protected]>
---
 grub-core/Makefile.core.def | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 0fcf67f9d..fad15ca4e 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -2163,13 +2163,21 @@ module = {
 module = {
   name = video_cirrus;
   x86 = video/cirrus.c;
-  enable = x86;
+  enable = i386_pc;
+  enable = i386_qemu;
+  enable = i386_coreboot;
+  enable = i386_multiboot;
+  enable = i386_ieee1275;
 };
 
 module = {
   name = video_bochs;
   x86 = video/bochs.c;
-  enable = x86;
+  enable = i386_pc;
+  enable = i386_qemu;
+  enable = i386_coreboot;
+  enable = i386_multiboot;
+  enable = i386_ieee1275;
 };
 
 module = {
-- 
2.47.3


_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

Reply via email to