X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=d36dca54a595bfed59a9e84c6da2d8dcf899e4e4;hb=3ab2857efdcb81ce34dabf4d07b39ad6f5ab0b4a;hp=cdf351bf29183c7ea0df50aac94de27d3f802545;hpb=1b89e2cc55cd8d26923d45c7cccf5a0a651ed4c4;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index cdf351bf..d36dca54 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -10,6 +10,8 @@ xMKDIR := mmd -D s
 ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
 ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
 
+-include $(ACESSDIR)/Makefile.Version.cfg
+
 # Default build programs
 #CC := gcc
 #LD := ld
@@ -25,7 +27,7 @@ ASSUFFIX = asm
 
 # Load Architecture settings
 ifeq ($(ARCH),)
-	ARCH := i386
+	ARCH := x86
 endif
 include $(ACESSDIR)/Makefile.$(ARCH).cfg
 ifeq ($(ARCHDIR),)
@@ -47,29 +49,32 @@ 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 += Input/PS2KbMouse
 MODULES += x86/ISADMA x86/VGAText
-MODULES += USB/Core
+MODULES += USB/Core USB/UHCI
+#MODULES += Interfaces/UDI
 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