Layout fixed area using linker instead of assembler.

[seabios.git] / src / config.h

diff --git a/src/config.h b/src/config.h
index 7e384ad12aedafb0a30b2a105fd45cdb5e4c3f99..8c4b2f0293408f8bb181d03e8be68434259fa83d 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -12,6 +12,8 @@
 #define CONFIG_APPNAME6 "BOCHS "
 #define CONFIG_APPNAME4 "BXPC"
 
+// Configure for use with KVM.
+#define CONFIG_KVM 0
 // Configure as a coreboot payload.
 #define CONFIG_COREBOOT 0
 
@@ -37,6 +39,8 @@
 #define CONFIG_PCIBIOS 1
 // Support int 15/53 APM BIOS calls
 #define CONFIG_APMBIOS 1
+// Support PnP BIOS entry point.
+#define CONFIG_PNPBIOS 1
 // Support int 19/18 system bootup support
 #define CONFIG_BOOT 1
 // Support int 14 serial port calls
@@ -86,27 +90,25 @@
 #define CONFIG_BIOS_REVISION 0x01
 
 // Various memory addresses used by the code.
-#define BUILD_STACK_ADDR        0x7c00
-#define BUILD_AP_BOOT_ADDR      0x10000
-#define BUILD_BIOS_ADDR         0xf0000
-#define BUILD_BIOS_SIZE         0x10000
+#define BUILD_STACK_ADDR          0x7c00
+#define BUILD_S3RESUME_STACK_ADDR 0x1000
+#define BUILD_AP_BOOT_ADDR        0x10000
+#define BUILD_BIOS_ADDR           0xf0000
+#define BUILD_BIOS_SIZE           0x10000
 // 64 KB used to copy the BIOS to shadow RAM
-#define BUILD_BIOS_TMP_ADDR     0x30000
+#define BUILD_BIOS_TMP_ADDR       0x30000
 
-#define BUILD_APIC_ADDR         0xfee00000
-#define BUILD_IOAPIC_ADDR       0xfec00000
+#define BUILD_APIC_ADDR           0xfee00000
+#define BUILD_IOAPIC_ADDR         0xfec00000
 
-#define BUILD_SMM_INIT_ADDR     0x38000
-#define BUILD_SMM_ADDR          0xa8000
-#define BUILD_SMM_SIZE          0x8000
-
-// Start of fixed addresses in 0xf0000 segment.
-#define BUILD_START_FIXED       0xe050
+#define BUILD_SMM_INIT_ADDR       0x38000
+#define BUILD_SMM_ADDR            0xa8000
+#define BUILD_SMM_SIZE            0x8000
 
 // Important real-mode segments
+#define SEG_IVT      0x0000
+#define SEG_BDA      0x0040
 #define SEG_BIOS     0xf000
-#define SEG_EBDA     0x9fc0
-#define SEG_BDA      0x0000
 
 // Segment definitions in protected mode (see rombios32_gdt in romlayout.S)
 #define SEG32_MODE32_CS    (2 << 3)
@@ -141,6 +143,8 @@
 #define DEBUG_ISR_74 9
 #define DEBUG_ISR_75 1
 #define DEBUG_ISR_76 10
-#define DEBUG_ISR_hwirq 30
+#define DEBUG_ISR_hwpic1 1
+#define DEBUG_ISR_hwpic2 1
+#define DEBUG_HDL_pnp 1
 
 #endif // config.h