Kernel - Slight reworks to timer code

[tpg/acess2.git] / Kernel / arch / x86 / Makefile

diff --git a/Kernel/arch/x86/Makefile b/Kernel/arch/x86/Makefile
index 708c8dc..c83a5af 100644 (file)
--- 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 vm8086.o
-#A_OBJ += gdb_stub.o
+A_OBJ += proc.o proc.ao time.o vm8086.o
+A_OBJ += kpanic.o pci.o