git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modules/armv7 - Fixing PL050 support
[tpg/acess2.git]
/
Makefile.cfg
diff --git
a/Makefile.cfg
b/Makefile.cfg
index
d8a8e0d
..
21a813d
100644
(file)
--- a/
Makefile.cfg
+++ b/
Makefile.cfg
@@
-21,16
+21,17
@@
MKDIR := mkdir -p
RMDIR := rm -rf
lCP := cp
RMDIR := rm -rf
lCP := cp
+
# Load Architecture settings
ifeq ($(ARCH),)
ARCH := i386
endif
# Load Architecture settings
ifeq ($(ARCH),)
ARCH := i386
endif
-
-
include $(ACESSDIR)/Makefile.$(ARCH).cfg
+include $(ACESSDIR)/Makefile.$(ARCH).cfg
ifeq ($(ARCHDIR),)
ARCHDIR := x86
endif
ifneq ($(ARCH),host)
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,
endif
# Makefile.user.cfg is not part of the Acess git repo,
@@
-49,9
+50,10
@@
MODULES += Storage/ATA Storage/FDD
MODULES += Network/NE2000 Network/RTL8139
MODULES += Display/VESA
MODULES += Display/BochsGA
MODULES += Network/NE2000 Network/RTL8139
MODULES += Display/VESA
MODULES += Display/BochsGA
-MODULES += Interfaces/UDI
+
#
MODULES += Interfaces/UDI
MODULES += Input/PS2KbMouse
MODULES += x86/ISADMA x86/VGAText
MODULES += Input/PS2KbMouse
MODULES += x86/ISADMA x86/VGAText
+MODULES += USB/Core
endif
ifeq ($(ARCHDIR),x86_64)
endif
ifeq ($(ARCHDIR),x86_64)
@@
-61,7
+63,13
@@
MODULES += Display/BochsGA
MODULES += Interfaces/UDI
MODULES += Input/PS2KbMouse
MODULES += x86/ISADMA x86/VGAText
MODULES += Interfaces/UDI
MODULES += Input/PS2KbMouse
MODULES += x86/ISADMA x86/VGAText
+MODULES += USB/Core
+endif
+
+ifeq ($(ARCHDIR),armv7)
+MODULES += Input/PS2KbMouse
endif
MODULES += IPStack # So the other modules are loaded before it
endif
MODULES += IPStack # So the other modules are loaded before it
-DYNMODS := USB/Core
+#DYNMODS := USB/Core
+#DYNMODS += Filesystems/InitRD
UCC
git Repository :: git.ucc.asn.au