Changeset 04803bf in mainline for contrib/conf/msim.conf


Ignore:
Timestamp:
2011-03-21T22:00:17Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
143932e3
Parents:
b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:
1 edited

Legend:

Unmodified
Added
Removed

  • contrib/conf/msim.conf

    rb50b5af2 r04803bf  
    77
    88add rwm mainmem 0x00000000
    9 mainmem generic 16M
    10 mainmem load "/dev/zero"
     9mainmem generic 32M
     10mainmem fill 0
    1111
    1212add rom bootmem 0x1fc00000
    … …  
    1616add dprinter printer 0x10000000
    1717add dkeyboard keyboard 0x10000000 2
    18 add dorder order 0x10000004 5
     18add dorder order 0x10000100 5
Note: See TracChangeset for help on using the changeset viewer.