X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2FMakefile;h=c83a5af2e97b85d6189cadb09d848af2b042e984;hb=a2495c6ea4f4cab16b5d339ae511428e92e89e73;hp=aa5d8e2fce664ef024be95950896e94072cf844f;hpb=9c61cf12758c0977ee1dc5791cba638fd3437ba6;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/Makefile b/Kernel/arch/x86/Makefile
index aa5d8e2f..c83a5af2 100644
--- a/Kernel/arch/x86/Makefile
+++ b/Kernel/arch/x86/Makefile
@@ -10,23 +10,17 @@ CFLAGS		=
 ASFLAGS		= -f elf
 
 USE_MP=0
-USE_PAE=0
 
-ifeq ($(ARCH),i386)
+ifeq ($(PLATFORM),default)
 	USE_MP=0
-	USE_PAE=0
-else ifeq ($(ARCH),i486)
+else ifeq ($(PLATFORM),smp)
 	USE_MP=1
-else ifeq ($(ARCH),i586)
-	USE_MP=1
-	USE_PAE=1
 endif
 
-#ASFLAGS		+= -D ARCH=\"$(ARCH)\" -D ARCHDIR=\"$(ARCHDIR)\"
-ASFLAGS += -D USE_MP=$(USE_MP) -D USE_PAE=$(USE_PAE)
-CPPFLAGS += -DUSE_MP=$(USE_MP) -DUSE_PAE=$(USE_PAE)
+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