Kernel/x86 - Fixed bug in user start, hidden by not updating usermode

[tpg/acess2.git] / Makefile.cfg

diff --git a/Makefile.cfg b/Makefile.cfg
index 4dc0385..70570c8 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -20,11 +20,12 @@ STRIP := strip
 MKDIR := mkdir -p
 RMDIR := rm -rf
 lCP := cp
+ASSUFFIX = asm
 
 
 # Load Architecture settings
 ifeq ($(ARCH),)
-       ARCH := i386
+       ARCH := x86
 endif
 include $(ACESSDIR)/Makefile.$(ARCH).cfg
 ifeq ($(ARCHDIR),)
@@ -46,7 +47,8 @@ MODULES += Filesystems/FAT
 MODULES += Filesystems/NTFS
 
 ifeq ($(ARCHDIR),x86)
-MODULES += Storage/ATA Storage/FDD
+MODULES += Storage/ATA
+MODULES += Storage/FDDv2
 MODULES += Network/NE2000 Network/RTL8139
 MODULES += Display/VESA
 MODULES += Display/BochsGA
@@ -57,7 +59,8 @@ MODULES += USB/Core
 endif
 
 ifeq ($(ARCHDIR),x86_64)
-MODULES += Storage/ATA Storage/FDD
+MODULES += Storage/ATA
+MODULES += Storage/FDDv2
 MODULES += Network/NE2000 Network/RTL8139
 MODULES += Display/BochsGA
 MODULES += Interfaces/UDI
@@ -69,6 +72,8 @@ endif
 ifeq ($(ARCHDIR),armv7)
 MODULES += Input/PS2KbMouse
 MODULES += armv7/GIC
+MODULES += Filesystems/InitRD
+MODULES += Display/PL110
 endif
 
 MODULES += IPStack     # So the other modules are loaded before it