Changeset 41811af in mainline for HelenOS.config

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

File:

• HelenOS.config (modified) (2 diffs)

HelenOS.config

@@ -537 +537 @@
 ! [CONFIG_BUILD_SHARED_LIBS=n] CONFIG_USE_SHARED_LIBS (n)
 
-% Run devman on startup
-! CONFIG_START_DEVMAN (y/n)
-
 % Launch (devman) test drivers
 ! [CONFIG_START_DEVMAN=y&CONFIG_DEBUG=y] CONFIG_TEST_DRIVERS (y/n)
@@ -563 +560 @@
 % Line debugging information
 ! [CONFIG_STRIP_BINARIES!=y] CONFIG_LINE_DEBUG (n/y)
+
+# USB settings 
+
+% USB release build (less logging)
+! CONFIG_USB_RELEASE_BUILD (y/n)
+
+% Start virtual USB host controller
+! CONFIG_RUN_VIRTUAL_USB_HC (n/y)
+
+% Polling UHCI & OHCI (no interrupts)
+! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_USBHC_NO_INTERRUPTS (n/y)
+