X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=d36dca54a595bfed59a9e84c6da2d8dcf899e4e4;hb=dfe55553735a8cfa2b7207e5096caddded32c992;hp=96c783e0e13c9bff8c0816db847633c867eed863;hpb=ae7df5a800a774fdf1fbe1c04a94e1c078c95976;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index 96c783e0..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
@@ -20,17 +22,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,
@@ -43,16 +47,36 @@ MODULES :=
 MODULES += Filesystems/Ext2
 MODULES += Filesystems/FAT
 MODULES += Filesystems/NTFS
-MODULES += IPStack
 
 ifeq ($(ARCHDIR),x86)
-MODULES += Storage/ATA Storage/FDD
-MODULES += Network/NE2000
+MODULES += Storage/ATA
+MODULES += Storage/FDDv2
+MODULES += Network/NE2000 Network/RTL8139
 MODULES += Display/VESA
 MODULES += Display/BochsGA
+MODULES += Input/PS2KbMouse
+MODULES += x86/ISADMA x86/VGAText
+MODULES += USB/Core USB/UHCI
+#MODULES += Interfaces/UDI
+endif
+
+ifeq ($(ARCHDIR),x86_64)
+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
 endif
 
-DYNMODS := USB/Core
+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 += Filesystems/InitRD