Changeset ff0fa22 in rtems-testing


Ignore:
Timestamp:
Sep 13, 2012, 5:26:20 PM (7 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, 8895273c193787f84c4585a10f6d6aceb3b25dc4
Children:
9768e79
Parents:
01a0d0e (diff), eca1a16 (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 branch 'master' of ssh://git.rtems.org/data/git/rtems-testing

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sim-scripts/pc386.in

    r01a0d0e rff0fa22  
    2222bspNeedsDos2Unix="yes"
    2323bspRunsFailRandomly="yes"
     24bspSupportsDisplayAdapter="yes"
    2425
    2526# Set the defaults based upon arguments given and do some error checking
     
    7071  # can also redirect to file with file:log/"`basename ${1} .exe`
    7172  SERIAL_ARG="stdio"
     73  if [ ${enable_display_adapter} = "no" ] ; then
     74     GRAPHIC_ARG="-nographic"
     75  else
     76     GRAPHIC_ARG="-vga cirrus"
     77  fi
    7278# core2duo with newer qemu for smp support
    7379# 486 or pentium for older qemu
     
    7581       -fda ${fd0Image} -hda fat:${hd0Dir} ${COVERAGE_ARG} \
    7682       -monitor null -nographic -serial ${SERIAL_ARG} --no-reboot"
     83       -monitor null ${GRAPHIC_ARG} -serial ${SERIAL_ARG} --no-reboot"
    7784}
    7885
Note: See TracChangeset for help on using the changeset viewer.