X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=3b1bfd5e7072abaee60dd302eb5559ff55737504;hb=20642de0b2de2c76149bdde6224234762c8ed564;hp=6986150af708f1b5624ded67f2bf4140d1b92e1b;hpb=52e7e4766c122deefd7bd3ee69415be55556fdab;p=tpg%2Facess2.git diff --git a/Makefile.cfg b/Makefile.cfg index 6986150a..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),) @@ -72,6 +74,8 @@ 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