Changeset 75732da in mainline for boot

Timestamp:

2010-12-13T07:20:20Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

309dea52

Parents:

84439d7 (diff), 37f7cfe (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 development/ changes

Location:

boot

Files:

• Makefile.common (modified) (2 diffs)
• arch/amd64/Makefile.inc (modified) (2 diffs)

boot/Makefile.common

@@ -111 +111 @@
 RD_DRVS = \
         root \
-        vhc
+        rootvirt \
+        test1 \
+        test2
 
 RD_DRV_CFG = 
@@ -142 +144 @@
         $(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
+        $(USPACE_PATH)/app/top/top \
+        $(USPACE_PATH)/app/usbinfo/usbinfo \
+        $(USPACE_PATH)/app/virtusbkbd/vuk
 
 ifneq ($(CONFIG_BAREBONE),y)

boot/arch/amd64/Makefile.inc

@@ -37 +37 @@
 
 RD_DRVS += \
-        rootia32 \
+        rootpc \
         pciintel \
         isa \
@@ -43 +43 @@
         uhci \
         usbhub \
-        usbkbd
+        usbkbd \
+        vhc
         
 RD_DRV_CFG += \