From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 6 Sep 2014 15:15:39 +0000 (+0200)
Subject: grub2: disable vga (640x350) fallback driver.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42066c88d5396559114f7b2de5cd7648689ed92d;p=people%2Fms%2Fipfire-2.x.git

grub2: disable vga (640x350) fallback driver.

This mode is incompatible on bay-trail.
---

diff --git a/lfs/grub b/lfs/grub
index 02cad0a433..04aaa0b254 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.00_disable_vga_fallback.patch
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \
diff --git a/src/patches/grub-2.00_disable_vga_fallback.patch b/src/patches/grub-2.00_disable_vga_fallback.patch
new file mode 100644
index 0000000000..0d1dec97d3
--- /dev/null
+++ b/src/patches/grub-2.00_disable_vga_fallback.patch
@@ -0,0 +1,15 @@
+We have to remove the vga fallback because this not work on bay-trail and other
+new intel onboard graphics.
+
+diff -Naur grub-2.00.org/grub-core/video/i386/pc/vga.c grub-2.00/grub-core/video/i386/pc/vga.c
+--- grub-2.00.org/grub-core/video/i386/pc/vga.c	2012-06-06 23:21:02.000000000 +0200
++++ grub-2.00/grub-core/video/i386/pc/vga.c	2014-09-05 21:41:04.790870375 +0200
+@@ -122,7 +122,7 @@
+ {
+   grub_err_t err;
+ 
+-  if ((width && width != VGA_WIDTH) || (height && height != VGA_HEIGHT))
++//  if ((width && width != VGA_WIDTH) || (height && height != VGA_HEIGHT))
+     return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no matching mode found");
+ 
+   framebuffer.temporary_buffer = grub_malloc (VGA_HEIGHT * VGA_WIDTH);