Changeset 46c20c8 in mainline for contrib/conf


Ignore:
Timestamp:
2010-11-26T20:08:10Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
45df59a
Parents:
fb150d78 (diff), ffdd2b9 (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.

Location:
contrib/conf
Files:
3 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • contrib/conf/ia32-qe.sh

    rfb150d78 r46c20c8  
    55# Create a disk image if it does not exist
    66if [ ! -f "$DISK_IMG" ]; then
    7         tools/mkfat.py uspace/dist/data "$DISK_IMG"
     7        tools/mkfat.py 1048576 uspace/dist/data "$DISK_IMG"
    88fi
    99
  • contrib/conf/mips32-gx.sh

    rfb150d78 r46c20c8  
    55# Create a disk image if it does not exist
    66if [ ! -f "$DISK_IMG" ]; then
    7         tools/mkfat.py uspace/dist/data "$DISK_IMG"
     7        tools/mkfat.py 1048576 uspace/dist/data "$DISK_IMG"
    88fi
    99
  • contrib/conf/msim.conf

    rfb150d78 r46c20c8  
    77
    88add rwm mainmem 0x00000000
    9 mainmem generic 16M
     9mainmem generic 32M
    1010mainmem fill 0
    1111
Note: See TracChangeset for help on using the changeset viewer.