Changeset f1fae414 in mainline for boot/Makefile.common

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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) (2 diffs)

boot/Makefile.common

@@ -86 +86 @@
 RD_SRVS_ESSENTIAL = \
         $(USPACE_PATH)/srv/hid/fb/fb \
-        $(USPACE_PATH)/srv/hid/kbd/kbd \
+        $(USPACE_PATH)/srv/hid/input/input \
         $(USPACE_PATH)/srv/hid/console/console \
         $(USPACE_PATH)/srv/fs/devfs/devfs
@@ -110 +110 @@
         $(USPACE_PATH)/srv/net/net/net \
         $(USPACE_PATH)/srv/devman/devman
-        
+
 RD_DRVS = \
-        root \
-        rootvirt \
-        test1 \
-        test2 \
-        test3
-
-RD_DRV_CFG = 
+        infrastructure/root \
+        infrastructure/rootvirt \
+        test/test1 \
+        test/test2 \
+        test/test3
+
+RD_DRV_CFG =
 
 RD_LIBS =