2009-08-21 Joel Sherrill <joel.sherrill@OARcorp.com>

	* gdb-sim-run.in, gdb-sim.in, gumstix.in: Make graphics and network
	interfaces potentially available on all simulator scripts. Add
	configuration for network to gumstix.

4 files changed, 41 insertions, 2 deletions

diff --git a/sim-scripts/ChangeLog b/sim-scripts/ChangeLog
index 17ac036..e8cd29d 100644
--- a/sim-scripts/ChangeLog
+++ b/sim-scripts/ChangeLog
@@ -1,5 +1,11 @@
 2009-08-21	Joel Sherrill <joel.sherrill@OARcorp.com>
 
+	* gdb-sim-run.in, gdb-sim.in, gumstix.in: Make graphics and network
+	interfaces potentially available on all simulator scripts. Add
+	configuration for network to gumstix.
+
+2009-08-21	Joel Sherrill <joel.sherrill@OARcorp.com>
+
 	* ant5206.in, avrtest.in, bf537Stamp.in, csb337.in, csb350.in,
 	csb360.in, ezkit533.in, gdb-sim-run.in, gumstix.in, h8sim.in,
 	jmr3904.in, m32csim.in, m32rsim.in, psim.in, qemu-rtems.in,
diff --git a/sim-scripts/gdb-sim-run.in b/sim-scripts/gdb-sim-run.in
index f08a246..f1df9ec 100755
--- a/sim-scripts/gdb-sim-run.in
+++ b/sim-scripts/gdb-sim-run.in
@@ -28,6 +28,8 @@ USAGE=\
 	-c	   -- enabled coverage (default=no)
 	-C	   -- cat test output if not interactive (default=no)
 	-g	   -- generate device tree and exit (default=no)
+	-D	   -- enable use of display adapter (default=no)
+	-N	   -- enable use of network adapter (default=no)
 	-G	   -- put simulator in GDB server mode (default=no)
 	-i	   -- interactive (default=no time limit)
 	-s	   -- force System V IPC support (default=no)
@@ -82,15 +84,19 @@ gdb_server_mode="no"
 use_sysv_ipc="no"
 generate_tree_and_exit="no"
 logdir="log"
+enable_display_adapter="no"
+enable_network="no"
 
-while getopts "vcCgGil:L:s" OPT
+while getopts "vcCgGil:L:DsN" OPT
 do
  case "$OPT" in
    v) verbose="yes";;
    c) coverage="yes";;
    C) doCatOutput="yes";;
+   D) enable_display_adapter="yes";;
    g) generate_tree_and_exit="yes" ;;
    G) gdb_server_mode="yes" ;;
+   N) enable_network="yes" ;;
    i) interactive="yes";;
    l) defaultLimit="$OPTARG";;
    L) loggir="$OPTARG";;
@@ -124,6 +130,8 @@ bspUsesGDBSimulator="yes"
 bspNeedsDos2Unix="no"
 bspSimTrustedToExit="no"
 bspSupportsGDBServerMode="no"
+bspSupportsDisplayAdapter="no"
+bspSupportsNIC="no"
 
 for v in 4.10 4.9 4.8 4.7 ""
 do
@@ -150,6 +158,16 @@ if [ ${bspSupportsSystemVIPC} = "no" -a ${use_sysv_ipc} = "yes"  ]; then
   exit 1
 fi
 
+if [ ${bspSupportsNIC} = "no" -a ${enable_network} = "yes"  ]; then
+  echo "Simulator does not support a Network Interface Controller."
+  exit 1
+fi
+if [ ${bspSupportsDisplayAdapter} = "no" -a \
+     ${enable_display_adapter} = "yes"  ]; then
+  echo "Simulator does not support Graphics Display Adapter."
+  exit 1
+fi
+
 if [ X${runBSP} = X ] ; then
   echo "Unable to find a way to run @CPU_TARGET@/@BSP@"
   exit 1
diff --git a/sim-scripts/gdb-sim.in b/sim-scripts/gdb-sim.in
index e8193b1..f574c9e 100755
--- a/sim-scripts/gdb-sim.in
+++ b/sim-scripts/gdb-sim.in
@@ -93,6 +93,8 @@ args=$*
 ### Set BSP defaults.  If BSP does not have default, it will override
 bspGeneratesGDBCommands="no"
 bspGeneratesDeviceTree="no"
+bspSupportsLCD="no"
+bspSupportsTCPIP="no"
 
 ###################################################################
 ###################################################################
diff --git a/sim-scripts/gumstix.in b/sim-scripts/gumstix.in
index f77bffd..cb98da2 100644
--- a/sim-scripts/gumstix.in
+++ b/sim-scripts/gumstix.in
@@ -6,6 +6,9 @@
 
 ##INSERT SKYEYE SUPPORT HERE
 
+bspSupportsDisplayAdapter="yes"
+bspSupportsNIC="yes"
+
 checkBSPFaults()
 {
   bspExited_ARM
@@ -43,8 +46,18 @@ mem_bank: map=I, type=RW, addr=0xB0000000, size=0x100000
 mem_bank: map=I, type=RW, addr=0x40000000, size=0x4C000000
 #shutdown_device: addr=0xb0000000, max_ins=${limit}0000000
 shutdown_device: addr=0xb0000000, max_ins=0
-lcd:state=on,type=pxa,mod=gtk
 EOF
+
+if [ ${enable_display_adapter} = "yes" ] ; then
+  echo "lcd:state=on,type=pxa,mod=gtk"
+fi
+
+if [ ${enable_network} = "yes" ] ; then
+cat <<EOF
+net: base=0x40000600, size=0xff, int=16, type=rtl8019, mac=0:4:3:2:1:f, ethmod=tuntap, hostip=10.0.0.1
+EOF
+fi
+
 if [ ${coverage} = yes ] ; then
   # Only do coverage on first megabyte of code space
   echo "code_coverage: state=on, filename=${2}.cov, start=0xA0000000, end=0xA0100000"