Changeset e2a6b72 in mainline for boot


Ignore:
Timestamp:
2012-10-15T16:28:58Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b3ab8f7
Parents:
7eb49f4 (diff), c4c2406 (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 and io improvements.

Location:
boot
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    r7eb49f4 re2a6b72  
    7474        $(USPACE_PATH)/srv/locsrv/locsrv \
    7575        $(USPACE_PATH)/srv/bd/rd/rd \
    76         $(USPACE_PATH)/srv/vfs/vfs
     76        $(USPACE_PATH)/srv/vfs/vfs \
     77        $(USPACE_PATH)/srv/logger/logger
    7778
    7879ifeq ($(RDFMT),tmpfs)
    … …  
    158159
    159160RD_APPS_NON_ESSENTIAL = \
     161        $(USPACE_PATH)/app/bithenge/bithenge \
    160162        $(USPACE_PATH)/app/blkdump/blkdump \
    161163        $(USPACE_PATH)/app/bnchmark/bnchmark \
    … …  
    170172        $(USPACE_PATH)/app/killall/killall \
    171173        $(USPACE_PATH)/app/loc/loc \
     174        $(USPACE_PATH)/app/logset/logset \
    172175        $(USPACE_PATH)/app/mkfat/mkfat \
    173176        $(USPACE_PATH)/app/mkexfat/mkexfat \
    … …  
    195198        $(USPACE_PATH)/app/mkbd/mkbd \
    196199        $(USPACE_PATH)/app/websrv/websrv \
     200        $(USPACE_PATH)/app/date/date \
    197201        $(USPACE_PATH)/app/vdemo/vdemo
    198202

  • boot/arch/amd64/Makefile.inc

    r7eb49f4 re2a6b72  
    4242        char/ps2mouse \
    4343        char/xtkbd \
     44        time/cmos-rtc \
    4445        bus/usb/ehci\
    4546        bus/usb/ohci \
Note: See TracChangeset for help on using the changeset viewer.