Kernel/armv7 - Task switching now supported

[tpg/acess2.git] / Makefile.cfg

diff --git a/Makefile.cfg b/Makefile.cfg
index b0de662..c349d5a 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -21,16 +21,17 @@ MKDIR := mkdir -p
 RMDIR := rm -rf
 lCP := cp
 
+
 # Load Architecture settings
 ifeq ($(ARCH),)
        ARCH := i386
 endif
--include $(ACESSDIR)/Makefile.$(ARCH).cfg
+include $(ACESSDIR)/Makefile.$(ARCH).cfg
 ifeq ($(ARCHDIR),)
        ARCHDIR := x86
 endif
 ifneq ($(ARCH),host)
--include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
+include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
 endif
 
 # Makefile.user.cfg is not part of the Acess git repo,
@@ -46,7 +47,7 @@ MODULES += Filesystems/NTFS
 
 ifeq ($(ARCHDIR),x86)
 MODULES += Storage/ATA Storage/FDD
-MODULES += Network/NE2000
+MODULES += Network/NE2000 Network/RTL8139
 MODULES += Display/VESA
 MODULES += Display/BochsGA
 MODULES += Interfaces/UDI
@@ -54,5 +55,15 @@ MODULES += Input/PS2KbMouse
 MODULES += x86/ISADMA x86/VGAText
 endif
 
+ifeq ($(ARCHDIR),x86_64)
+MODULES += Storage/ATA Storage/FDD
+MODULES += Network/NE2000 Network/RTL8139
+MODULES += Display/BochsGA
+MODULES += Interfaces/UDI
+MODULES += Input/PS2KbMouse
+MODULES += x86/ISADMA x86/VGAText
+endif
+
 MODULES += IPStack     # So the other modules are loaded before it
 DYNMODS := USB/Core
+#DYNMODS += Filesystems/InitRD