X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=70570c86d843f7a6f9ba79aba1e3ba22bf9b4a93;hb=d1b2ff57c789c5d4bb1d9429582d5cbe6569e82b;hp=c980f42ef2d33d880c9c85ae79c67dcce7687bfc;hpb=47b68865886bc60aaa3389121040ba1af1089130;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index c980f42e..70570c86 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -20,17 +20,19 @@ 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
+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,
@@ -45,24 +47,35 @@ 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
-MODULES += Interfaces/UDI
+#MODULES += Interfaces/UDI
 MODULES += Input/PS2KbMouse
 MODULES += x86/ISADMA x86/VGAText
+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
 MODULES += Input/PS2KbMouse
 MODULES += x86/ISADMA x86/VGAText
+MODULES += USB/Core
+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
-DYNMODS := USB/Core
+#DYNMODS := USB/Core
 #DYNMODS += Filesystems/InitRD