Changeset 1affcdf3 in mainline for HelenOS.config

Timestamp:

2011-06-10T19:33:41Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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:

• HelenOS.config (modified) (2 diffs)

HelenOS.config

@@ -522 +522 @@
 ! [PLATFORM=sparc64&CONFIG_SMP=y] CONFIG_AP (y/n)
 
-% Use Block Address Translation by the loader
-! [PLATFORM=ppc32] CONFIG_BAT (y/n)
-
 % Preserve A.OUT header in isofs.b
 ! [PLATFORM=sparc64&MACHINE=generic] CONFIG_AOUT_ISOFS_B (y)
 
-% Run devman on startup
-! CONFIG_START_DEVMAN (y/n)
+% Dynamic linking support
+! [PLATFORM=ia32] CONFIG_RTLD (n/y)
+! [PLATFORM=abs32le|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_RTLD (n)
+
+% Build shared libraries
+! [CONFIG_RTLD=y] CONFIG_BUILD_SHARED_LIBS (n/y)
+! [CONFIG_RTLD=n] CONFIG_BUILD_SHARED_LIBS (n)
+
+% Link against shared libraries
+! [CONFIG_BUILD_SHARED_LIBS=y] CONFIG_USE_SHARED_LIBS (n/y)
+! [CONFIG_BUILD_SHARED_LIBS=n] CONFIG_USE_SHARED_LIBS (n)
 
 % Launch (devman) test drivers
@@ -554 +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)
+