]> xenbits.xensource.com Git - seabios.git/commitdiff
Implement !CONFIG_BOOT for CSM
authorDavid Woodhouse <David.Woodhouse@intel.com>
Thu, 14 Feb 2013 09:17:17 +0000 (09:17 +0000)
committerKevin O'Connor <kevin@koconnor.net>
Sat, 16 Feb 2013 03:48:34 +0000 (22:48 -0500)
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
src/csm.c

index 6e48bc6f35adb3862ba98ad06f44ab709566bf00..b5d8b541dfa3e187bc8cde3a496532e5f9eade9e 100644 (file)
--- a/src/csm.c
+++ b/src/csm.c
@@ -91,6 +91,11 @@ handle_csm_0000(struct bregs *regs)
 static void
 handle_csm_0001(struct bregs *regs)
 {
+    if (!CONFIG_BOOT) {
+        regs->ax = 1;
+        return;
+    }
+
     dprintf(3, "Legacy16UpdateBbs table %04x:%04x\n", regs->es, regs->bx);
 
     csm_boot_table = MAKE_FLATPTR(regs->es, regs->bx);
@@ -117,6 +122,11 @@ handle_csm_0001(struct bregs *regs)
 static void
 handle_csm_0002(struct bregs *regs)
 {
+    if (!CONFIG_BOOT) {
+        regs->ax = 1;
+        return;
+    }
+
     dprintf(3, "PrepareToBoot table %04x:%04x\n", regs->es, regs->bx);
 
     struct e820entry *p = (void *)csm_compat_table.E820Pointer;
@@ -172,6 +182,11 @@ handle_csm_0002(struct bregs *regs)
 static void
 handle_csm_0003(struct bregs *regs)
 {
+    if (!CONFIG_BOOT) {
+        regs->ax = 1;
+        return;
+    }
+
     dprintf(3, "Boot\n");
 
     startBoot();