Changeset 6843a9c in mainline for defaults/amd64/Makefile.config


Ignore:
Timestamp:
2012-06-29T13:02:14Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
722912e
Parents:
ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • defaults/amd64/Makefile.config

    rba72f2b r6843a9c  
    5454
    5555# Default framebuffer mode
    56 CONFIG_VESA_MODE = 800x600
     56CONFIG_BFB_MODE = 800x600
    5757
    5858# Default framebuffer depth
    59 CONFIG_VESA_BPP = 16
     59CONFIG_BFB_BPP = 16
    6060
    6161# Load disk drivers on startup
    … …  
    6767# OHCI root hub power switch, ganged is enough
    6868OHCI_POWER_SWITCH = ganged
     69
     70# GRUB boot loader architecture
     71GRUB_ARCH = pc
Note: See TracChangeset for help on using the changeset viewer.