X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=3b1bfd5e7072abaee60dd302eb5559ff55737504;hb=e20b7220513e6010d883ae76ca1cf2c8f0ec26af;hp=b919d86982e500492cbe128e3d3112b42f6246f8;hpb=dc8801cc0b5ed911a775cfc2ea853048f7a00db1;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index b919d869..3b1bfd5e 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),)
@@ -73,6 +75,7 @@ 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