vgabios: Make VBE code depend on a config setting.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/vgasrc/Kconfig b/vgasrc/Kconfig
index f6dfa660160ccb10c0ba660eccef15f60d47cb85..881e9ec158cdbe1f21a59f7fd050d2c41be9220b 100644 (file)
--- a/vgasrc/Kconfig
+++ b/vgasrc/Kconfig
@@ -40,6 +40,13 @@ menu "VGA ROM"
         bool
         default !NO_VGABIOS
 
+    config VGA_VBE
+        depends on BUILD_VGABIOS
+        bool "Video BIOS Extensions (VBE)"
+        default y
+        help
+            Support VBE.
+
     config VGA_PCI
         depends on BUILD_VGABIOS
         bool "PCI ROM Headers"

diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c
index 0930b461484e6f298f173a2035763251ceb46590..82629b9f23cb3cfbf99336cc0578044c50268a10 100644 (file)
--- a/vgasrc/bochsvga.c
+++ b/vgasrc/bochsvga.c
@@ -121,7 +121,6 @@ bochsvga_init(void)
         return -1;
     }
 
-    SET_VGA(VBE_enabled, 1);
     dispi_write(VBE_DISPI_INDEX_ID, VBE_DISPI_ID5);
 
     u32 lfb_addr;

diff --git a/vgasrc/clext.c b/vgasrc/clext.c
index eaef60af50a109296cba3353605b7cf56dc042a1..f08294acaddda18792fe12abd3e017aeafc2c90c 100644 (file)
--- a/vgasrc/clext.c
+++ b/vgasrc/clext.c
@@ -736,7 +736,6 @@ clext_init(void)
         return -1;
     dprintf(1, "cirrus init 2\n");
 
-    SET_VGA(VBE_enabled, 1);
     u32 lfb_addr = 0;
     if (CONFIG_VGA_PCI)
         lfb_addr = (pci_config_readl(GET_GLOBAL(VgaBDF), PCI_BASE_ADDRESS_0)

diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c
index 14efece6087f6675720318c11d9f61059a500db8..d7dd8b4086e2d1adee29b83d305e2b5f49958308 100644 (file)
--- a/vgasrc/vbe.c
+++ b/vgasrc/vbe.c
@@ -13,7 +13,6 @@
 #include "biosvar.h" // get_global_set
 #include "vgahw.h" // vgahw_set_mode
 
-int VBE_enabled VAR16;
 u32 VBE_total_memory VAR16 = 256 * 1024;
 u32 VBE_capabilities VAR16;
 u32 VBE_framebuffer VAR16;
@@ -257,7 +256,7 @@ vbe_104fXX(struct bregs *regs)
 void
 handle_104f(struct bregs *regs)
 {
-    if (!GET_GLOBAL(VBE_enabled)) {
+    if (!CONFIG_VGA_VBE) {
         vbe_104fXX(regs);
         return;
     }

diff --git a/vgasrc/vgabios.h b/vgasrc/vgabios.h
index a10198d3d58cee0189adb0b6eaf203237db4b1f7..403e7ce905f9910eeaf5bcdccc76d564440798bb 100644 (file)
--- a/vgasrc/vgabios.h
+++ b/vgasrc/vgabios.h
@@ -93,7 +93,6 @@ void vgafb_write_pixel(u8 color, u16 x, u16 y);
 u8 vgafb_read_pixel(u16 x, u16 y);
 
 // vbe.c
-int VBE_enabled;
 u32 VBE_total_memory;
 u32 VBE_capabilities;
 u32 VBE_framebuffer;