Changeset 8b5690f in mainline for boot/Makefile.common

Timestamp:

2011-02-03T05:11:01Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba38f72c

Parents:

22027b6e (diff), 86d7bfa (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.

File:

• boot/Makefile.common (modified) (3 diffs)

boot/Makefile.common

@@ -98 +98 @@
         $(USPACE_PATH)/srv/fs/fat/fat \
         $(USPACE_PATH)/srv/taskmon/taskmon \
-        $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \
+        $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \
         $(USPACE_PATH)/srv/net/netif/lo/lo \
         $(USPACE_PATH)/srv/net/nil/eth/eth \
@@ -132 +132 @@
         $(USPACE_PATH)/app/taskdump/taskdump \
         $(USPACE_PATH)/app/tester/tester \
-        $(USPACE_PATH)/app/test_serial/test_serial \
         $(USPACE_PATH)/app/tetris/tetris \
         $(USPACE_PATH)/app/trace/trace \
-        $(USPACE_PATH)/app/netstart/netstart \
         $(USPACE_PATH)/app/nettest1/nettest1 \
         $(USPACE_PATH)/app/nettest2/nettest2 \
@@ -141 +139 @@
         $(USPACE_PATH)/app/ping/ping \
         $(USPACE_PATH)/app/stats/stats \
-        $(USPACE_PATH)/app/tasks/tasks \
         $(USPACE_PATH)/app/top/top \
         $(USPACE_PATH)/app/sysinfo/sysinfo \