Changeset 3f03199 in mainline for HelenOS.config


Ignore:
Timestamp:
2013-09-15T06:33:53Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9348862
Parents:
dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    rdd7078c r3f03199  
    584584! CONFIG_OPTIMIZE_FOR_SIZE (n/y)
    585585
    586 % Number of consoles
    587 @ "1"
    588 @ "2"
    589 @ "3"
    590 @ "4"
    591 @ "5"
    592 @ "6"
    593 ! [CONFIG_FB=n] CONFIG_VC_COUNT(choice)
    594 
    595 %Kernel log on console 6
    596 ! [CONFIG_FB=n] CONFIG_KERNEL_LOG_VC_6 (y/n)
    597 
    598586% Barebone build with essential binaries only
    599587! CONFIG_BAREBONE (n/y)
Note: See TracChangeset for help on using the changeset viewer.