Changeset 81235588 in mainline for boot/arch/arm32

Timestamp:

2009-12-09T14:51:14Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fb623e2

Parents:

63c4e28

Message:

move the definition of common init tasks, RAM disk files and components to a common makefile
(this should make it easier to maintain the list when tasks need to be added, etc.)

Location:

boot/arch/arm32/loader

Files:

• Makefile.build (modified) (1 diff)
• Makefile.common (modified) (2 diffs)

boot/arch/arm32/loader/Makefile.build

@@ -51 +51 @@
         ../../../genarch/division.c
 
-COMPONENTS = \
-        $(KERNELDIR)/kernel.bin \
-        $(USPACEDIR)/srv/ns/ns \
-        $(USPACEDIR)/srv/loader/loader \
-        $(USPACEDIR)/app/init/init \
-        $(USPACEDIR)/srv/devmap/devmap \
-        $(USPACEDIR)/srv/bd/rd/rd \
-        $(USPACEDIR)/srv/vfs/vfs
-ifeq ($(RDFMT),tmpfs)
-        COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
-endif
-ifeq ($(RDFMT),fat)
-        COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
-endif
-
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 COMPONENT_OBJECTS := $(addsuffix .co,$(basename $(notdir $(COMPONENTS)))) $(INITRD).co

boot/arch/arm32/loader/Makefile.common

@@ -31 +31 @@
 #
 
+include ../../../Makefile.common
+
 DEPEND = Makefile.depend
 DEPEND_PREV = $(DEPEND).prev
@@ -37 +39 @@
 LINK = _link.ld
 COMPS = _components
-INITRD = initrd
 
 KERNELDIR = ../../../../kernel
 USPACEDIR = ../../../../uspace
 
-RD_SRVS = \
-        $(USPACEDIR)/srv/fb/fb \
-        $(USPACEDIR)/srv/kbd/kbd \
-        $(USPACEDIR)/srv/console/console \
-        $(USPACEDIR)/srv/fs/devfs/devfs \
-        $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
-        $(USPACEDIR)/srv/fs/fat/fat \
-        $(USPACEDIR)/srv/bd/file_bd/file_bd \
-        $(USPACEDIR)/srv/part/mbr_part/mbr_part \
-        $(USPACEDIR)/srv/bd/gxe_bd/gxe_bd
-
-RD_APPS = \
-        $(USPACEDIR)/app/edit/edit \
-        $(USPACEDIR)/app/getvc/getvc \
-        $(USPACEDIR)/app/redir/redir \
-        $(USPACEDIR)/app/tetris/tetris \
-        $(USPACEDIR)/app/tester/tester \
-        $(USPACEDIR)/app/trace/trace \
-        $(USPACEDIR)/app/klog/klog \
-        $(USPACEDIR)/app/bdsh/bdsh
+RD_SRVS += $(USPACEDIR)/srv/bd/gxe_bd/gxe_bd