X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=70570c86d843f7a6f9ba79aba1e3ba22bf9b4a93;hb=9a70d1ed74070f56c34b856f88931b134d429c3a;hp=174f896aab2849c9bc63102ba58157df5a1e9ebc;hpb=6a89c2b28e62cc0979e5e7b31ed30295164773f5;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index 174f896a..70570c86 100644
--- 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,18 +47,20 @@ 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
@@ -68,6 +71,9 @@ 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