Changeset 1735f3e in mainline for boot

Timestamp:

2010-01-31T18:22:37Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fc2e71e

Parents:

430de97 (diff), 2e07f62c (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 from mainline.

Location:

boot

Files:

• Makefile.common (modified) (2 diffs)
• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/ia64/loader/Makefile.common (modified) (1 diff)
• arch/ppc32/loader/Makefile.common (modified) (1 diff)

boot/Makefile.common

@@ -56 +56 @@
         $(USPACEDIR)/srv/fs/devfs/devfs \
         $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
-        $(USPACEDIR)/srv/fs/fat/fat
+        $(USPACEDIR)/srv/fs/fat/fat \
+        $(USPACEDIR)/srv/taskmon/taskmon
 
 RD_APPS = \
@@ -65 +66 @@
         $(USPACEDIR)/app/mkfat/mkfat \
         $(USPACEDIR)/app/redir/redir \
+        $(USPACEDIR)/app/taskdump/taskdump \
         $(USPACEDIR)/app/tester/tester \
         $(USPACEDIR)/app/tetris/tetris \

boot/arch/amd64/Makefile.inc

@@ -33 +33 @@
         $(USPACEDIR)/srv/hw/char/i8042/i8042 \
         $(USPACEDIR)/srv/hw/bus/pci/pci \
-        $(USPACEDIR)/srv/hid/c_mouse/c_mouse
+        $(USPACEDIR)/srv/hid/char_mouse/char_ms
 
 MODULES := $(notdir $(COMPONENTS))

boot/arch/ia64/loader/Makefile.common

@@ -49 +49 @@
         RD_SRVS += \
                 $(USPACEDIR)/srv/hw/char/i8042/i8042 \
-                $(USPACEDIR)/srv/hid/c_mouse/c_mouse
+                $(USPACEDIR)/srv/hid/char_mouse/char_ms
 endif

boot/arch/ppc32/loader/Makefile.common

@@ -43 +43 @@
 KERNELDIR = ../../../../kernel
 USPACEDIR = ../../../../uspace
+
+RD_SRVS += \
+        $(USPACEDIR)/srv/hid/adb_mouse/adb_ms \
+        $(USPACEDIR)/srv/hw/bus/cuda_adb/cuda_adb