X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=inline;f=Kernel%2FMakefile;h=619d3ea00f2d476d78d7c61eaa7cdde353a47aa7;hb=156885e938b60fee9d061d989ae7711c9aeea493;hp=8593d6fb643afc0cd1482ea9fa3a18d8fc7d11af;hpb=a0f4dde15a97a206bf88109fecde52576b373109;p=tpg%2Facess2.git diff --git a/Kernel/Makefile b/Kernel/Makefile index 8593d6fb..619d3ea0 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -27,11 +27,14 @@ endif OBJ = $(addprefix arch/$(ARCHDIR)/,$(A_OBJ)) OBJ += heap.o messages.o debug.o modules.o lib.o syscalls.o system.o threads.o drvutil.o +OBJ += $(addprefix vfs/fs/, $(addsuffix .o,$(FILESYSTEMS))) +# These are first to make vterm be the first driver initialised (apart +# its dependencies), allowing logging to exist throughout the loading +# process. +OBJ += drv/vterm.o drv/proc.o drv/fifo.o drv/dma.o drv/iocache.o drv/pci.o drv/kb.o drv/vga.o OBJ += binary.o bin/elf.o bin/pe.o OBJ += vfs/main.o vfs/open.o vfs/acls.o vfs/dir.o vfs/io.o vfs/mount.o vfs/memfile.o vfs/nodecache.o OBJ += vfs/fs/root.o vfs/fs/devfs.o -OBJ += $(addprefix vfs/fs/, $(addsuffix .o,$(FILESYSTEMS))) -OBJ += drv/proc.o drv/fifo.o drv/dma.o drv/iocache.o drv/pci.o drv/kb.o drv/vga.o drv/vterm.o OBJ += $(addprefix drv/, $(addsuffix .o,$(DRIVERS))) OBJ := $(addsuffix .$(ARCH), $(OBJ)) MODS += $(addprefix ../Modules/, $(addsuffix .xo.$(ARCH),$(MODULES)))