Index: /trunk/src/VBox/Devices/PC/BIOS/makefile
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/makefile	(revision 60579)
+++ /trunk/src/VBox/Devices/PC/BIOS/makefile	(revision 60580)
@@ -14,13 +14,27 @@
 Q="
 !endif
+
+CPU = 386
+
 CFLAGS   = -q -0 -wx -zu -s -oas -d1+ -ms
 CFLAGS32 = -q -wx -zu -s -oas -d1+ -ms -nt=BIOS32 -nd=BIOS32
 
 DEFS = -DVBOX -DVBOX_LANBOOT_SEG=0xE200 -DVBOX_VERSION_STRING=$(Q)0.9$(Q) &
- -DVBOX_WITH_SCSI -DVBOX_WITH_AHCI
+ -DVBOX_WITH_SCSI -DVBOX_BIOS_CPU=80286
 
 AFLAGS = -q -0 -wx
 
-INCLS  = -I$(Q)../../../../../include$(Q)
+INCLS  = -I$(Q)../../../../../include$(Q) -I$(Q) ../../BiosCommonCode$(Q)
+
+OBJS = 	bios.obj post.obj ata.obj floppy.obj floppyt.obj eltorito.obj &
+	boot.obj keyboard.obj disk.obj serial.obj system.obj invop.obj &
+	timepci.obj logo.obj ps2mouse.obj parallel.obj scsi.obj &
+	apm.obj apm_pm.obj pcibios.obj pciutil.obj vds.obj &
+	print.obj pcibio32.obj pci32.obj orgs.obj
+
+!if $(CPU) > 286
+OBJS += ahci.obj
+DEFS += -DVBOX_WITH_AHCI
+!endif
 
 .c.obj : .autodepend
@@ -28,11 +42,5 @@
 
 .asm.obj : .autodepend
-	wasm -fo=.obj $(AFLAGS) $(DEFS) $<
-
-OBJS = 	bios.obj post.obj ata.obj floppy.obj floppyt.obj eltorito.obj &
-	boot.obj keyboard.obj disk.obj serial.obj system.obj invop.obj &
-	timepci.obj logo.obj ps2mouse.obj parallel.obj scsi.obj &
-	ahci.obj apm.obj apm_pm.obj pcibios.obj pciutil.obj vds.obj &
-	print.obj pcibio32.obj pci32.obj orgs.obj
+	wasm -fo=.obj $(AFLAGS) $(DEFS) $(INCLS) $<
 
 vbxbios.rom : vbxbios.bin