Changeset 1fe9bf6 in mainline for boot

Timestamp:

2010-11-21T17:13:32Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

31860b7

Parents:

8b3bff5 (diff), 4087a33 (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:

Merged updates from HelenOS mainline + changes from branch

/vojtechhorky/ddf_proposal/

Location:

boot

Files:

• Makefile.common (modified) (3 diffs)
• arch/amd64/Makefile.inc (modified) (1 diff)

boot/Makefile.common

@@ -99 +99 @@
         $(USPACE_PATH)/srv/taskmon/taskmon \
         $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \
+        $(USPACE_PATH)/srv/hw/bus/usb/hcd/virtual/vhcd \
         $(USPACE_PATH)/srv/net/netif/lo/lo \
         $(USPACE_PATH)/srv/net/il/arp/arp \
@@ -109 +110 @@
         
 RD_DRVS = \
-        root
+        root \
+        vhc
 
 RD_DRV_CFG = 
@@ -140 +142 @@
         $(USPACE_PATH)/app/ping/ping \
         $(USPACE_PATH)/app/stats/stats \
+        $(USPACE_PATH)/app/virtusbkbd/vuk \
         $(USPACE_PATH)/app/tasks/tasks \
         $(USPACE_PATH)/app/top/top

boot/arch/amd64/Makefile.inc

@@ -40 +40 @@
         pciintel \
         isa \
-        ns8250
+        ns8250 \
+        uhci \
+        usbkbd
         
 RD_DRV_CFG += \