X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=716eb5fc98fcd87209e9c52b3b33644132e76434;hb=13cfd41138fbb925b9a9e239ecd58d1a768ac5aa;hp=d36dca54a595bfed59a9e84c6da2d8dcf899e4e4;hpb=0e361ff8d9472885f770a370c0d477c229041572;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index d36dca54..716eb5fc 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -29,53 +29,33 @@ ASSUFFIX = asm
 ifeq ($(ARCH),)
 	ARCH := x86
 endif
-include $(ACESSDIR)/Makefile.$(ARCH).cfg
+include $(ACESSDIR)/BuildConf/$(ARCH)/Makefile.cfg
 ifeq ($(ARCHDIR),)
 	ARCHDIR := x86
 endif
+
 ifneq ($(ARCH),host)
-include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
+ ifneq ($(ARCHDIR),$(ARCH))
+  include $(ACESSDIR)/BuildConf/$(ARCHDIR)/Makefile.cfg
+ endif
+endif
+
+ifeq ($(CONFIG),)
+	CONFIG := default
 endif
 
 # Makefile.user.cfg is not part of the Acess git repo,
 # It is for overriding the options in this file
 -include $(ACESSDIR)/Makefile.user.cfg
 
-FILESYSTEMS := 
 DRIVERS := 
 MODULES :=
+
 MODULES += Filesystems/Ext2
 MODULES += Filesystems/FAT
 MODULES += Filesystems/NTFS
 
-ifeq ($(ARCHDIR),x86)
-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
-
-ifeq ($(ARCHDIR),armv7)
-MODULES += Input/PS2KbMouse
-MODULES += armv7/GIC
-MODULES += Filesystems/InitRD
-MODULES += Display/PL110
-endif
+include $(ACESSDIR)/BuildConf/$(ARCH)/$(CONFIG).mk
 
 MODULES += IPStack	# So the other modules are loaded before it
 #DYNMODS := USB/Core