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/PL110 - added static cursor support
[tpg/acess2.git]
/
Makefile.cfg
diff --git
a/Makefile.cfg
b/Makefile.cfg
index
4dc0385
..
3b1bfd5
100644
(file)
--- a/
Makefile.cfg
+++ b/
Makefile.cfg
@@
-10,6
+10,8
@@
xMKDIR := mmd -D s
ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
+-include $(ACESSDIR)/Makefile.Version.cfg
+
# Default build programs
#CC := gcc
#LD := ld
# Default build programs
#CC := gcc
#LD := ld
@@
-20,11
+22,12
@@
STRIP := strip
MKDIR := mkdir -p
RMDIR := rm -rf
lCP := cp
MKDIR := mkdir -p
RMDIR := rm -rf
lCP := cp
+ASSUFFIX = asm
# Load Architecture settings
ifeq ($(ARCH),)
# Load Architecture settings
ifeq ($(ARCH),)
- ARCH :=
i3
86
+ ARCH :=
x
86
endif
include $(ACESSDIR)/Makefile.$(ARCH).cfg
ifeq ($(ARCHDIR),)
endif
include $(ACESSDIR)/Makefile.$(ARCH).cfg
ifeq ($(ARCHDIR),)
@@
-46,7
+49,8
@@
MODULES += Filesystems/FAT
MODULES += Filesystems/NTFS
ifeq ($(ARCHDIR),x86)
MODULES += Filesystems/NTFS
ifeq ($(ARCHDIR),x86)
-MODULES += Storage/ATA Storage/FDD
+MODULES += Storage/ATA
+MODULES += Storage/FDDv2
MODULES += Network/NE2000 Network/RTL8139
MODULES += Display/VESA
MODULES += Display/BochsGA
MODULES += Network/NE2000 Network/RTL8139
MODULES += Display/VESA
MODULES += Display/BochsGA
@@
-57,7
+61,8
@@
MODULES += USB/Core
endif
ifeq ($(ARCHDIR),x86_64)
endif
ifeq ($(ARCHDIR),x86_64)
-MODULES += Storage/ATA Storage/FDD
+MODULES += Storage/ATA
+MODULES += Storage/FDDv2
MODULES += Network/NE2000 Network/RTL8139
MODULES += Display/BochsGA
MODULES += Interfaces/UDI
MODULES += Network/NE2000 Network/RTL8139
MODULES += Display/BochsGA
MODULES += Interfaces/UDI
@@
-69,6
+74,8
@@
endif
ifeq ($(ARCHDIR),armv7)
MODULES += Input/PS2KbMouse
MODULES += armv7/GIC
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
endif
MODULES += IPStack # So the other modules are loaded before it
UCC
git Repository :: git.ucc.asn.au