X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2FMakefile;h=10cd645b6c7bd0c874df5961a6777501f0113ee4;hb=a2ba87996225c9056c85f6b333667a07b905af81;hp=27a2ec023c735bbb1d28b5ea24dde8be3bad501c;hpb=c53f11b9694ec833b145cfa9660eaca17a4732d7;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/Makefile b/Kernel/arch/x86/Makefile
index 27a2ec02..10cd645b 100644
--- a/Kernel/arch/x86/Makefile
+++ b/Kernel/arch/x86/Makefile
@@ -10,22 +10,18 @@ CFLAGS		=
 ASFLAGS		= -f elf
 
 USE_MP=0
-USE_PAE=0
 
-ifeq ($(ARCH),i386)
+ifeq ($(ARCH),x86)
 	USE_MP=0
-	USE_PAE=0
-else ifeq ($(ARCH),i486)
+else ifeq ($(ARCH),x86-smp)
 	USE_MP=1
-else ifeq ($(ARCH),i586)
-	USE_MP=1
-	USE_PAE=1
 endif
 
-ASFLAGS += -D USE_MP=$(USE_MP) -D USE_PAE=$(USE_PAE)
-CPPFLAGS += -DUSE_MP=$(USE_MP) -DUSE_PAE=$(USE_PAE)
+#ASFLAGS		+= -D ARCH=\"$(ARCH)\" -D ARCHDIR=\"$(ARCHDIR)\"
+ASFLAGS += -D USE_MP=$(USE_MP)
+CPPFLAGS += -DUSE_MP=$(USE_MP)
 
 A_OBJ  = start.ao main.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
+A_OBJ += kpanic.o pci.o