X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Farch%2Fx86%2FMakefile;h=fcf738eb8d264afd87afd2db271c12eb17b5e1e2;hb=802762ae7efd39786c0e134ed0bdfe8100d97230;hp=9e5a883cb5aafa2c620882f6452ac6697f2498a2;hpb=04a050f42807686dc119838c82372409246d55bb;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/arch/x86/Makefile b/KernelLand/Kernel/arch/x86/Makefile
index 9e5a883c..fcf738eb 100644
--- a/KernelLand/Kernel/arch/x86/Makefile
+++ b/KernelLand/Kernel/arch/x86/Makefile
@@ -9,6 +9,7 @@ CPPFLAGS	=
 CFLAGS		=
 ASFLAGS		= -f elf
 
+USE_ACPICA ?= 1
 USE_MP=0
 
 ifeq ($(PLATFORM),default)
@@ -18,13 +19,18 @@ else ifeq ($(PLATFORM),smp)
 endif
 
 ASFLAGS += -D USE_MP=$(USE_MP)
-CPPFLAGS += -DUSE_MP=$(USE_MP)
+CPPFLAGS += -DUSE_MP=$(USE_MP) -DUSE_ACPICA=$(USE_ACPICA)
 
 A_OBJ  = start.ao main.o mboot.o lib.o desctab.ao errors.o irq.o
 A_OBJ += mm_phys.o mm_virt.o
 A_OBJ += proc.o proc.ao time.o vm8086.o
-A_OBJ += kpanic.o pci.o vpci.o
-#A_OBJ += acpica.o
+ifeq ($(USE_MP),1)
+A_OBJ += mptable.o
+endif
+A_OBJ += kpanic.o pci.o vpci.o validate_vmem.o
 
-#EXTERNS += ACPICA
+ifeq ($(USE_ACPICA),1)
+A_OBJ += acpica.o
+EXTERNS += ACPICA
+endif