Add option to disable mptable generation.

diff --git a/src/config.h b/src/config.h
index 649aa610b85f128ba589dcca61053d107453d7f8..596df24e28b776fd09fada25a6ac1ffed958a6c3 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -26,17 +26,22 @@
 #define CONFIG_PS2_MOUSE 1
 #define CONFIG_ATA 1
 #define CONFIG_KBD_CALL_INT15_4F 1
+// Support for booting from a CD
 #define CONFIG_CDROM_BOOT 1
+// Support for emulating a boot CD as a floppy/harddrive
 #define CONFIG_CDROM_EMU 1
-// Support generation of a PIR table in 0xf000 segment (for emulators)
-#define CONFIG_PIRTABLE 1
-// Support generation of ACPI PIR tables (for emulators)
-#define CONFIG_ACPI 1
 // Support int 1a/b1 PCI BIOS calls
 #define CONFIG_PCIBIOS 1
 // Support int 15/53 APM BIOS calls
 #define CONFIG_APMBIOS 1
 
+// Support generation of a PIR table in 0xf000 segment (for emulators)
+#define CONFIG_PIRTABLE 1
+// Support generation of MPTable (for emulators)
+#define CONFIG_MPTABLE 1
+// Support generation of ACPI tables (for emulators)
+#define CONFIG_ACPI 1
+
 /* define it if the (emulated) hardware supports SMM mode */
 #define CONFIG_USE_SMM 1
 

diff --git a/src/mptable.c b/src/mptable.c
index 90b8d2f0f961068092d15a348c4477d4a3c7ecec..5550fd247281dc19f9ce0db123efb45cefb43950 100644 (file)
--- a/src/mptable.c
+++ b/src/mptable.c
@@ -49,6 +49,9 @@ static void putle32(u8 **pp, int val)
 void
 mptable_init(void)
 {
+    if (! CONFIG_MPTABLE)
+        return;
+
     u8 *mp_config_table, *q, *float_pointer_struct;
     int ioapic_id, i, len;
     int mp_config_table_size;