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

diff --git a/Kernel/arch/x86/Makefile b/Kernel/arch/x86/Makefile
index 87dd2b23..c83a5af2 100644
--- a/Kernel/arch/x86/Makefile
+++ b/Kernel/arch/x86/Makefile
@@ -3,33 +3,24 @@
 # i386 Architecture Makefile
 # arch/i386/Makefile
 
-# Assuming build machine is 32-bit ELF
-#CC = gcc
-#AS = nasm
-#LD = ld
-#OBJDUMP = objdump
+AS_SUFFIX = asm
 
 CPPFLAGS	=
 CFLAGS		=
 ASFLAGS		= -f elf
 
-ifeq ($(ARCH),i386)
-	ASFLAGS += -D USE_MP=0 -D USE_PAE=0
-	CPPFLAGS += -DUSE_MP=0 -DUSE_PAE=0
-else
-	ifeq ($(ARCH),i486)
-		ASFLAGS += -D USE_MP=1 -D USE_PAE=0
-		CPPFLAGS += -DUSE_MP=1 -DUSE_PAE=0
-	else
-		ifeq ($(ARCH),i586)
-			ASFLAGS += -D USE_MP=1 -D USE_PAE=1
-			CPPFLAGS += -DUSE_MP=1 -DUSE_PAE=1
-		endif
-	endif
+USE_MP=0
+
+ifeq ($(PLATFORM),default)
+	USE_MP=0
+else ifeq ($(PLATFORM),smp)
+	USE_MP=1
 endif
-	
+
+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 time.o
-#A_OBJ += gdb_stub.o
+A_OBJ += proc.o proc.ao time.o vm8086.o
+A_OBJ += kpanic.o pci.o