Changeset c47e1a8 in mainline for boot/Makefile.common


Ignore:
Timestamp:
2010-05-21T07:50:04Z (16 years ago)
Author:
Lenka Trochtova <trochtova.lenka@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d51ee2b
Parents:
cf8cc36 (diff), 15b592b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge mainline changes (rev. 451)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    rcf8cc36 rc47e1a8  
    11#
    2 # Copyright (c) 2009 Martin Decky
     2# Copyright (c) 2006 Martin Decky
    33# All rights reserved.
    44#
    … …  
    2727#
    2828
    29 -include ../Makefile.config
     29## Configuration
     30#
    3031
    31 TMP = distroot
     32ROOT_PATH = ..
     33
     34VERSION_DEF = $(ROOT_PATH)/version
     35
     36COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
     37COMMON_HEADER = $(ROOT_PATH)/common.h
     38COMMON_HEADER_ARCH = arch/$(BARCH)/include/common.h
     39
     40CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
     41CONFIG_HEADER = $(ROOT_PATH)/config.h
     42
     43-include $(VERSION_DEF)
     44-include $(COMMON_MAKEFILE)
     45-include $(CONFIG_MAKEFILE)
     46
     47KERNEL_PATH = $(ROOT_PATH)/kernel
     48USPACE_PATH = $(ROOT_PATH)/uspace
     49DIST_PATH = $(USPACE_PATH)/dist
     50TOOLS_PATH = $(ROOT_PATH)/tools
     51DRVS_PATH = srv/drivers
     52
     53SANDBOX = pack
     54PACK = $(TOOLS_PATH)/pack.py
     55MKHORD = $(TOOLS_PATH)/mkhord.py
     56MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
     57MKFAT = $(TOOLS_PATH)/mkfat.py
     58
     59JOBFILE = $(ROOT_PATH)/tools/jobfile.py
     60
     61ARCH_INCLUDE = generic/include/arch
     62GENARCH_INCLUDE = generic/include/genarch
     63
     64DEPEND = Makefile.depend
     65DEPEND_PREV = $(DEPEND).prev
     66DISTROOT = distroot
    3267INITRD = initrd
    3368
    3469INIT_TASKS = \
    35         $(USPACEDIR)/srv/ns/ns \
    36         $(USPACEDIR)/srv/loader/loader \
    37         $(USPACEDIR)/app/init/init \
    38         $(USPACEDIR)/srv/devmap/devmap \
    39         $(USPACEDIR)/srv/bd/rd/rd \
    40         $(USPACEDIR)/srv/vfs/vfs
     70        $(USPACE_PATH)/srv/ns/ns \
     71        $(USPACE_PATH)/srv/loader/loader \
     72        $(USPACE_PATH)/app/init/init \
     73        $(USPACE_PATH)/srv/devmap/devmap \
     74        $(USPACE_PATH)/srv/bd/rd/rd \
     75        $(USPACE_PATH)/srv/vfs/vfs
     76
    4177ifeq ($(RDFMT),tmpfs)
    42         INIT_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
    43 endif
    44 ifeq ($(RDFMT),fat)
    45         INIT_TASKS += $(USPACEDIR)/srv/fs/fat/fat
     78        INIT_TASKS += $(USPACE_PATH)/srv/fs/tmpfs/tmpfs
    4679endif
    4780
    48 RD_SRVS = \
    49         $(USPACEDIR)/srv/devman/devman \
    50         $(USPACEDIR)/srv/bd/file_bd/file_bd \
    51         $(USPACEDIR)/srv/bd/part/guid_part/g_part \
    52         $(USPACEDIR)/srv/bd/part/mbr_part/mbr_part \
    53         $(USPACEDIR)/srv/clip/clip \
    54         $(USPACEDIR)/srv/hid/fb/fb \
    55         $(USPACEDIR)/srv/hid/kbd/kbd \
    56         $(USPACEDIR)/srv/hid/console/console \
    57         $(USPACEDIR)/srv/fs/devfs/devfs \
    58         $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
    59         $(USPACEDIR)/srv/fs/fat/fat \
    60         $(USPACEDIR)/srv/taskmon/taskmon
     81ifeq ($(RDFMT),fat)
     82        INIT_TASKS += $(USPACE_PATH)/srv/fs/fat/fat
     83endif
    6184
    62 RD_APPS = \
    63         $(USPACEDIR)/app/bdsh/bdsh \
    64         $(USPACEDIR)/app/edit/edit \
    65         $(USPACEDIR)/app/getterm/getterm \
    66         $(USPACEDIR)/app/klog/klog \
    67         $(USPACEDIR)/app/mkfat/mkfat \
    68         $(USPACEDIR)/app/redir/redir \
    69         $(USPACEDIR)/app/taskdump/taskdump \
    70         $(USPACEDIR)/app/tester/tester \
    71         $(USPACEDIR)/app/tetris/tetris \
    72         $(USPACEDIR)/app/trace/trace \
    73         $(USPACEDIR)/app/test_serial/test_serial
     85RD_SRVS_ESSENTIAL = \
     86        $(USPACE_PATH)/srv/hid/fb/fb \
     87        $(USPACE_PATH)/srv/hid/kbd/kbd \
     88        $(USPACE_PATH)/srv/hid/console/console \
     89        $(USPACE_PATH)/srv/fs/devfs/devfs
     90
     91RD_SRVS_NON_ESSENTIAL = \
     92        $(USPACE_PATH)/srv/bd/file_bd/file_bd \
     93        $(USPACE_PATH)/srv/bd/part/guid_part/g_part \
     94        $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
     95        $(USPACE_PATH)/srv/clip/clip \
     96        $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
     97        $(USPACE_PATH)/srv/fs/fat/fat \
     98        $(USPACE_PATH)/srv/taskmon/taskmon \
     99        $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \
     100        $(USPACE_PATH)/srv/net/netif/lo/lo \
     101        $(USPACE_PATH)/srv/net/il/arp/arp \
     102        $(USPACE_PATH)/srv/net/il/ip/ip \
     103        $(USPACE_PATH)/srv/net/tl/icmp/icmp \
     104        $(USPACE_PATH)/srv/net/tl/udp/udp \
     105        $(USPACE_PATH)/srv/net/tl/tcp/tcp \
     106        $(USPACE_PATH)/srv/net/net/net \
     107        $(USPACE_PATH)/srv/net/netstart/netstart \
     108        $(USPACE_PATH)/srv/devman/devman \
     109        $(USPACE_PATH)/srv/drivers/root/root
     110       
     111RD_DRVS = \
     112        root
     113
     114RD_DRV_CFG =
     115
     116ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
     117        RD_SRVS_NON_ESSENTIAL += \
     118                $(USPACE_PATH)/srv/net/nil/eth/eth \
     119                $(USPACE_PATH)/srv/net/nil/nildummy/nildummy
     120endif
     121
     122RD_APPS_ESSENTIAL = \
     123        $(USPACE_PATH)/app/bdsh/bdsh \
     124        $(USPACE_PATH)/app/getterm/getterm \
     125        $(USPACE_PATH)/app/klog/klog
     126
     127RD_APPS_NON_ESSENTIAL = \
     128        $(USPACE_PATH)/app/edit/edit \
     129        $(USPACE_PATH)/app/mkfat/mkfat \
     130        $(USPACE_PATH)/app/sbi/sbi \
     131        $(USPACE_PATH)/app/redir/redir \
     132        $(USPACE_PATH)/app/taskdump/taskdump \
     133        $(USPACE_PATH)/app/tester/tester \
     134        $(USPACE_PATH)/app/test_serial/test_serial \
     135        $(USPACE_PATH)/app/tetris/tetris \
     136        $(USPACE_PATH)/app/trace/trace \
     137        $(USPACE_PATH)/app/nettest1/nettest1 \
     138        $(USPACE_PATH)/app/nettest2/nettest2 \
     139        $(USPACE_PATH)/app/netecho/netecho \
     140        $(USPACE_PATH)/app/ping/ping \
     141        $(USPACE_PATH)/app/stats/stats \
     142        $(USPACE_PATH)/app/tasks/tasks \
     143        $(USPACE_PATH)/app/top/top
     144
     145ifneq ($(CONFIG_BAREBONE),y)
     146NET_CFG = \
     147        $(USPACE_PATH)/srv/net/cfg/general \
     148        $(USPACE_PATH)/srv/net/cfg/lo \
     149        $(USPACE_PATH)/srv/net/cfg/ne2k
     150endif
    74151
    75152COMPONENTS = \
    76         $(KERNELDIR)/kernel.bin \
    77         $(USPACEDIR)/srv/ns/ns \
    78         $(USPACEDIR)/srv/loader/loader \
    79         $(USPACEDIR)/app/init/init \
    80         $(USPACEDIR)/srv/devmap/devmap \
    81         $(USPACEDIR)/srv/bd/rd/rd \
    82         $(USPACEDIR)/srv/vfs/vfs
    83 ifeq ($(RDFMT),tmpfs)
    84         COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
     153        $(KERNEL_PATH)/kernel.bin \
     154        $(INIT_TASKS) \
     155        $(INITRD).img
     156
     157LINK = arch/$(BARCH)/_link.ld
     158COMPS_H = arch/$(BARCH)/include/_components.h
     159COMPS_C = arch/$(BARCH)/src/_components.c
     160
     161-include arch/$(BARCH)/Makefile.inc
     162
     163ifeq ($(CONFIG_BAREBONE),y)
     164RD_SRVS = $(RD_SRVS_ESSENTIAL)
     165RD_APPS = $(RD_APPS_ESSENTIAL)
     166else
     167RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
     168RD_APPS = $(RD_APPS_ESSENTIAL) $(RD_APPS_NON_ESSENTIAL)
    85169endif
    86 ifeq ($(RDFMT),fat)
    87         COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
    88 endif
     170
     171MODULES := $(notdir $(COMPONENTS))
     172
     173BOOT_OUTPUT ?= $(ROOT_PATH)/image.boot
     174RAW ?= image.raw
     175JOB ?= image.job
     176MAP ?= image.map
     177PREBUILD ?= build_comps
     178BUILD ?= Makefile.build
Note: See TracChangeset for help on using the changeset viewer.