Changeset dffabf0 in mainline for boot


Ignore:
Timestamp:
2011-01-05T19:08:03Z (15 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f03d3786
Parents:
e84d65a (diff), 196ef08 (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

Conflicts: no problem solving.
Added new apps to ignore list.

Location:
boot
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    re84d65a rdffabf0  
    101101        $(USPACE_PATH)/srv/hw/bus/usb/hcd/virtual/vhcd \
    102102        $(USPACE_PATH)/srv/net/netif/lo/lo \
     103        $(USPACE_PATH)/srv/net/nil/eth/eth \
     104        $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
    103105        $(USPACE_PATH)/srv/net/il/arp/arp \
    104106        $(USPACE_PATH)/srv/net/il/ip/ip \
    … …  
    117119RD_DRV_CFG =
    118120
    119 ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
    120         RD_SRVS_NON_ESSENTIAL += \
    121                 $(USPACE_PATH)/srv/net/nil/eth/eth \
    122                 $(USPACE_PATH)/srv/net/nil/nildummy/nildummy
    123 endif
    124 
    125121RD_APPS_ESSENTIAL = \
    126122        $(USPACE_PATH)/app/bdsh/bdsh \
    … …  
    130126RD_APPS_NON_ESSENTIAL = \
    131127        $(USPACE_PATH)/app/edit/edit \
     128        $(USPACE_PATH)/app/kill/kill \
     129        $(USPACE_PATH)/app/killall/killall \
    132130        $(USPACE_PATH)/app/mkfat/mkfat \
    133131        $(USPACE_PATH)/app/sbi/sbi \
    … …  
    148146        $(USPACE_PATH)/app/top/top \
    149147        $(USPACE_PATH)/app/usbinfo/usbinfo \
    150         $(USPACE_PATH)/app/virtusbkbd/vuk
     148        $(USPACE_PATH)/app/virtusbkbd/vuk \
     149        $(USPACE_PATH)/app/websrv/websrv
    151150
    152151ifneq ($(CONFIG_BAREBONE),y)

  • boot/arch/ia64/Makefile.inc

    re84d65a rdffabf0  
    3434ENDIANESS = LE
    3535PAGE_SIZE = 16384
    36 EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic
     36EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata
    3737
    3838RD_SRVS_NON_ESSENTIAL +=
Note: See TracChangeset for help on using the changeset viewer.