git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kernel/x86 - Added input support to serial terminal
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
arch
/
x86
/
Makefile
diff --git
a/KernelLand/Kernel/arch/x86/Makefile
b/KernelLand/Kernel/arch/x86/Makefile
index
c83a5af
..
126ebfb
100644
(file)
--- a/
KernelLand/Kernel/arch/x86/Makefile
+++ b/
KernelLand/Kernel/arch/x86/Makefile
@@
-5,10
+5,11
@@
AS_SUFFIX = asm
AS_SUFFIX = asm
-CPPFLAGS =
+CPPFLAGS =
CFLAGS =
ASFLAGS = -f elf
CFLAGS =
ASFLAGS = -f elf
+USE_ACPICA ?= 1
USE_MP=0
ifeq ($(PLATFORM),default)
USE_MP=0
ifeq ($(PLATFORM),default)
@@
-18,9
+19,18
@@
else ifeq ($(PLATFORM),smp)
endif
ASFLAGS += -D USE_MP=$(USE_MP)
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 lib.o desctab.ao errors.o irq.o
+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 += mm_phys.o mm_virt.o
A_OBJ += proc.o proc.ao time.o vm8086.o
-A_OBJ += kpanic.o pci.o
+ifeq ($(USE_MP),1)
+A_OBJ += mptable.o
+endif
+A_OBJ += kpanic.o pci.o vpci.o
+
+ifeq ($(USE_ACPICA),1)
+A_OBJ += acpica.o
+EXTERNS += ACPICA
+endif
+
UCC
git Repository :: git.ucc.asn.au