Changeset ddb844e in mainline for HelenOS.config


Ignore:
Timestamp:
2020-07-03T23:00:34Z (4 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e79a025
Parents:
edb57bc6 (diff), 1a1c75e (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:

Resolve merge conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    redb57bc6 rddb844e  
    608608! [(PLATFORM=ia32|PLATFORM=amd64|MACHINE=beagleboardxm)&CONFIG_HID_OUT!=none&CONFIG_FB=y] CONFIG_BFB_BPP (choice)
    609609
     610% Display double buffering
     611! [CONFIG_FB=y] CONFIG_DISP_DOUBLE_BUF (y/n)
     612
     613% Window double buffering
     614! [CONFIG_FB=y] CONFIG_WIN_DOUBLE_BUF (n/y)
     615
    610616% Start AP processors by the loader
    611617! [PLATFORM=sparc64&CONFIG_SMP=y] CONFIG_AP (y/n)
Note: See TracChangeset for help on using the changeset viewer.