Changeset 3aae4e8 in mainline for HelenOS.config


Ignore:
Timestamp:
2010-04-04T22:07:05Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
23de644
Parents:
9f10660f (diff), 73060801 (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:
1 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    r9f10660f r3aae4e8  
    345345
    346346% Simics SMP Hack
    347 ! [PROCESSOR=sun4v] CONFIG_SIMICS_SMP_HACK (y/n)
     347! [PROCESSOR=sun4v&CONFIG_SMP=y] CONFIG_SIMICS_SMP_HACK (n/y)
    348348
    349349% Support for userspace debuggers
    … …  
    523523
    524524% Networking architecture
    525 @ "none" No networking
    526525@ "modular" Modular
    527526@ "module" One module
    528527! CONFIG_NETWORKING (choice)
    529528
    530 % DP8390 (NE2k) network interface
    531 ! [CONFIG_NETWORKING=modular|CONFIG_NETWORKING=module] CONFIG_NETIF_DP8390 (y/n)
    532 
Note: See TracChangeset for help on using the changeset viewer.