From: David Woodhouse <David.Woodhouse@intel.com>
Date: Thu, 14 Feb 2013 09:17:17 +0000 (+0000)
Subject: Implement !CONFIG_BOOT for CSM
X-Git-Tag: rel-1.7.3~90
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=84b7dcbd579ba72d693edab7cd60063ca41b4372;p=seabios.git

Implement !CONFIG_BOOT for CSM

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/src/csm.c b/src/csm.c
index 6e48bc6..b5d8b54 100644
--- 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();