2001-10-04 Frank Ch. Eigler <fche@redhat.com>

	* configrun-sid.in: Throughout, set boolean attributes only to
	non-default values.

diff --git a/sid/bsp/ChangeLog b/sid/bsp/ChangeLog
index 2844e1d..30cadef 100644 (file)
--- a/sid/bsp/ChangeLog
+++ b/sid/bsp/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-04  Frank Ch. Eigler  <fche@redhat.com>
+
+       * configrun-sid.in: Throughout, set boolean attributes only to
+       non-default values.
+
 2001-10-03  Frank Ch. Eigler  <fche@redhat.com>
 
         * configrun-sid.in (gdb): Add cfgroot relationship.

diff --git a/sid/bsp/configrun-sid.in b/sid/bsp/configrun-sid.in
index d59dd2f..75bdabb 100644 (file)
--- a/sid/bsp/configrun-sid.in
+++ b/sid/bsp/configrun-sid.in
@@ -390,13 +390,13 @@ if ($opt_gprof)
 $enable_z_packet = "false";
 $second_section = "# second section
 # settings
-set cpu step-insn-count $cpu_insn_count
-set cpu trace-semantics? $opt_trace_semantics
-set cpu trace-disassemble? $opt_trace_disassemble
-set cpu trace-counter? $opt_trace_counter
-set cpu trace-extract? $opt_trace_extract
-set cpu enable-warnings? $opt_enable_warnings
-set host-sched num-clients 10 # large enough?
+set cpu step-insn-count $cpu_insn_count\n" .
+($opt_trace_semantics ? "set cpu trace-semantics? $opt_trace_semantics\n" : "") .
+($opt_trace_disassemble ? "set cpu trace-disassemble? $opt_trace_disassemble\n" : "") .
+($opt_trace_counter ? "set cpu trace-counter? $opt_trace_counter\n" : "") .
+($opt_trace_extract ? "set cpu trace-extract? $opt_trace_extract\n" : "") .
+($opt_enable_warnings ? "set cpu enable-warnings? $opt_enable_warnings\n" : "") .
+"set host-sched num-clients 10 # large enough?
 set target-sched num-clients 10 # large enough?
 # pin connections
 connect-pin main perform-activity -> host-sched advance
@@ -870,19 +870,18 @@ connect-pin deinit-sequence output-5 -> ${processor}-gdb deinit
 connect-pin ${processor}-gdb yield -> yield-net input
 connect-pin ${processor}-gdb flush-icache -> $processor flush-icache
 connect-pin ${processor}-gdb restart -> hw-reset-net input
-set ${processor}-gdb exit-on-detach? 1
-set ${processor}-gdb trace-gdbsid? $opt_verbose
-set ${processor}-gdb trace-gdbserv? $opt_verbose
-# ${processor}-gdb-socket
+set ${processor}-gdb exit-on-detach? 1\n" .
+($opt_verbose ? "set ${processor}-gdb trace-gdbsid? $opt_verbose\n" : "") .
+($opt_verbose ? "set ${processor}-gdb trace-gdbserv? $opt_verbose\n" : "") .
+"# ${processor}-gdb-socket
 connect-pin init-sequence output-2 -> ${processor}-gdb-socket init
 connect-pin deinit-sequence output-6 -> ${processor}-gdb-socket fini
 connect-pin ${processor}-gdb-socket rx -> ${processor}-gdb remote-rx
 connect-pin ${processor}-gdb-socket tx <- ${processor}-gdb remote-tx
 connect-pin host-sched 6-event -> ${processor}-gdb-socket poll-event
 connect-pin host-sched 6-control <- ${processor}-gdb-socket poll-control
-set ${processor}-gdb-socket sockaddr-local 0.0.0.0:$opt_gdbport{$processor}
-set ${processor}-gdb-socket verbose? $opt_verbose
-";
+set ${processor}-gdb-socket sockaddr-local 0.0.0.0:$opt_gdbport{$processor}\n" .
+($opt_verbose ? "set ${processor}-gdb-socket verbose? $opt_verbose\n" : "");
   }
 
 # Additional settings for main cpu gdb.
@@ -915,9 +914,8 @@ foreach $processor (keys %opt_load)
     $first_section .= "# ${processor} loader\n" .
        &sidconf_new("sw-load-elf", "${processor}-loader") . "\n";
     $second_section .= "# ${processor} loader
-set ${processor}-loader file \"$opt_load{$processor}\"
-set ${processor}-loader verbose? $opt_verbose
-";
+set ${processor}-loader file \"$opt_load{$processor}\" \n" .
+($opt_verbose ? "set ${processor}-loader verbose? $opt_verbose\n" : "");
 
     # Have the loader write data via $load_mapper_data for the "cpu" processor
     if ($processor eq "cpu")

diff --git a/sid/bsp/pregen/ChangeLog b/sid/bsp/pregen/ChangeLog
index f57baef..04988c4 100644 (file)
--- a/sid/bsp/pregen/ChangeLog
+++ b/sid/bsp/pregen/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-04  Frank Ch. Eigler  <fche@redhat.com>
+
+       * (*.conf): Regenerated without superfluous bool attr settings.
+
 2001-10-03  Frank Ch. Eigler  <fche@redhat.com>
 
        * (*.conf): Regenerated with gdb cfgroot relationship.

diff --git a/sid/bsp/pregen/arm-cma-tksm.conf b/sid/bsp/pregen/arm-cma-tksm.conf
index 815858b..a64d3a4 100644 (file)
--- a/sid/bsp/pregen/arm-cma-tksm.conf
+++ b/sid/bsp/pregen/arm-cma-tksm.conf
@@ -1,6 +1,6 @@
 # sid configuration file
 # created by Id: configrun-sid.in,v 1.22 2001/10/03 17:24:17 fche Exp 
-# run by fche @ tooth (Linux) at Wed Oct  3 13:24:32 EDT 2001
+# run by fche @ tooth (Linux) at Thu Oct  4 13:32:11 EDT 2001
 # args: --cpu=arm --no-run --gdb=5000 --board=cma110:cma222-uart1:gdb -EL --tksm
 set main persistent? true
 load libaudio.la audio_component_library
@@ -53,11 +53,6 @@ new bridge-tcl tcl-event-consumer
 # second section
 # settings
 set cpu step-insn-count 10000
-set cpu trace-semantics? 0
-set cpu trace-disassemble? 0
-set cpu trace-counter? 0
-set cpu trace-extract? 0
-set cpu enable-warnings? 0
 set host-sched num-clients 10 # large enough?
 set target-sched num-clients 10 # large enough?
 # pin connections
@@ -134,8 +129,6 @@ connect-pin cpu-gdb yield -> yield-net input
 connect-pin cpu-gdb flush-icache -> cpu flush-icache
 connect-pin cpu-gdb restart -> hw-reset-net input
 set cpu-gdb exit-on-detach? 1
-set cpu-gdb trace-gdbsid? 0
-set cpu-gdb trace-gdbserv? 0
 # cpu-gdb-socket
 connect-pin init-sequence output-2 -> cpu-gdb-socket init
 connect-pin deinit-sequence output-6 -> cpu-gdb-socket fini
@@ -144,7 +137,6 @@ connect-pin cpu-gdb-socket tx <- cpu-gdb remote-tx
 connect-pin host-sched 6-event -> cpu-gdb-socket poll-event
 connect-pin host-sched 6-control <- cpu-gdb-socket poll-control
 set cpu-gdb-socket sockaddr-local 0.0.0.0:5000
-set cpu-gdb-socket verbose? 0
 # tk system monitor
 relate main component-catalog-informees tksm
 # refresh

diff --git a/sid/bsp/pregen/arm-cma.conf b/sid/bsp/pregen/arm-cma.conf
index 42f0452..cc02b62 100644 (file)
--- a/sid/bsp/pregen/arm-cma.conf
+++ b/sid/bsp/pregen/arm-cma.conf
@@ -1,6 +1,6 @@
 # sid configuration file
 # created by Id: configrun-sid.in,v 1.22 2001/10/03 17:24:17 fche Exp 
-# run by fche @ tooth (Linux) at Wed Oct  3 13:24:31 EDT 2001
+# run by fche @ tooth (Linux) at Thu Oct  4 13:32:11 EDT 2001
 # args: --cpu=arm --no-run --gdb=5000 --board=cma110:cma222-uart1:gdb -EL
 set main persistent? true
 load libaudio.la audio_component_library
@@ -48,11 +48,6 @@ new sid-io-socket-server cpu-gdb-socket
 # second section
 # settings
 set cpu step-insn-count 10000
-set cpu trace-semantics? 0
-set cpu trace-disassemble? 0
-set cpu trace-counter? 0
-set cpu trace-extract? 0
-set cpu enable-warnings? 0
 set host-sched num-clients 10 # large enough?
 set target-sched num-clients 10 # large enough?
 # pin connections
@@ -129,8 +124,6 @@ connect-pin cpu-gdb yield -> yield-net input
 connect-pin cpu-gdb flush-icache -> cpu flush-icache
 connect-pin cpu-gdb restart -> hw-reset-net input
 set cpu-gdb exit-on-detach? 1
-set cpu-gdb trace-gdbsid? 0
-set cpu-gdb trace-gdbserv? 0
 # cpu-gdb-socket
 connect-pin init-sequence output-2 -> cpu-gdb-socket init
 connect-pin deinit-sequence output-6 -> cpu-gdb-socket fini
@@ -139,7 +132,6 @@ connect-pin cpu-gdb-socket tx <- cpu-gdb remote-tx
 connect-pin host-sched 6-event -> cpu-gdb-socket poll-event
 connect-pin host-sched 6-control <- cpu-gdb-socket poll-control
 set cpu-gdb-socket sockaddr-local 0.0.0.0:5000
-set cpu-gdb-socket verbose? 0
 set cpu endian little
 # uart1 <-> cpu-gdb also
 connect-pin uart1 Sout -> cpu-gdb target-tx

diff --git a/sid/bsp/pregen/arm-gloss-tksm.conf b/sid/bsp/pregen/arm-gloss-tksm.conf
index 692d287..99a9730 100644 (file)
--- a/sid/bsp/pregen/arm-gloss-tksm.conf
+++ b/sid/bsp/pregen/arm-gloss-tksm.conf
@@ -1,6 +1,6 @@
 # sid configuration file
 # created by Id: configrun-sid.in,v 1.22 2001/10/03 17:24:17 fche Exp 
-# run by fche @ tooth (Linux) at Wed Oct  3 13:24:29 EDT 2001
+# run by fche @ tooth (Linux) at Thu Oct  4 13:32:09 EDT 2001
 # args: --cpu=arm --no-run --gdb=5000 -EL --tksm
 set main persistent? true
 load libaudio.la audio_component_library
@@ -45,11 +45,6 @@ new bridge-tcl tcl-event-consumer
 # second section
 # settings
 set cpu step-insn-count 10000
-set cpu trace-semantics? 0
-set cpu trace-disassemble? 0
-set cpu trace-counter? 0
-set cpu trace-extract? 0
-set cpu enable-warnings? 0
 set host-sched num-clients 10 # large enough?
 set target-sched num-clients 10 # large enough?
 # pin connections
@@ -85,8 +80,6 @@ connect-pin cpu-gdb yield -> yield-net input
 connect-pin cpu-gdb flush-icache -> cpu flush-icache
 connect-pin cpu-gdb restart -> hw-reset-net input
 set cpu-gdb exit-on-detach? 1
-set cpu-gdb trace-gdbsid? 0
-set cpu-gdb trace-gdbserv? 0
 # cpu-gdb-socket
 connect-pin init-sequence output-2 -> cpu-gdb-socket init
 connect-pin deinit-sequence output-6 -> cpu-gdb-socket fini
@@ -95,7 +88,6 @@ connect-pin cpu-gdb-socket tx <- cpu-gdb remote-tx
 connect-pin host-sched 6-event -> cpu-gdb-socket poll-event
 connect-pin host-sched 6-control <- cpu-gdb-socket poll-control
 set cpu-gdb-socket sockaddr-local 0.0.0.0:5000
-set cpu-gdb-socket verbose? 0
 # gdb w/ gloss
 connect-pin gloss trap-chain <-> cpu-gdb trap
 connect-pin gloss trap-code-chain -> cpu-gdb trap-code

diff --git a/sid/bsp/pregen/arm-gloss.conf b/sid/bsp/pregen/arm-gloss.conf
index ca8c728..1a99161 100644 (file)
--- a/sid/bsp/pregen/arm-gloss.conf
+++ b/sid/bsp/pregen/arm-gloss.conf
@@ -1,6 +1,6 @@
 # sid configuration file
 # created by Id: configrun-sid.in,v 1.22 2001/10/03 17:24:17 fche Exp 
-# run by fche @ tooth (Linux) at Wed Oct  3 13:24:29 EDT 2001
+# run by fche @ tooth (Linux) at Thu Oct  4 13:32:09 EDT 2001
 # args: --cpu=arm --no-run --gdb=5000 -EL
 set main persistent? true
 load libaudio.la audio_component_library
@@ -40,11 +40,6 @@ new sid-io-socket-server cpu-gdb-socket
 # second section
 # settings
 set cpu step-insn-count 10000
-set cpu trace-semantics? 0
-set cpu trace-disassemble? 0
-set cpu trace-counter? 0
-set cpu trace-extract? 0
-set cpu enable-warnings? 0
 set host-sched num-clients 10 # large enough?
 set target-sched num-clients 10 # large enough?
 # pin connections
@@ -80,8 +75,6 @@ connect-pin cpu-gdb yield -> yield-net input
 connect-pin cpu-gdb flush-icache -> cpu flush-icache
 connect-pin cpu-gdb restart -> hw-reset-net input
 set cpu-gdb exit-on-detach? 1
-set cpu-gdb trace-gdbsid? 0
-set cpu-gdb trace-gdbserv? 0
 # cpu-gdb-socket
 connect-pin init-sequence output-2 -> cpu-gdb-socket init
 connect-pin deinit-sequence output-6 -> cpu-gdb-socket fini
@@ -90,7 +83,6 @@ connect-pin cpu-gdb-socket tx <- cpu-gdb remote-tx
 connect-pin host-sched 6-event -> cpu-gdb-socket poll-event
 connect-pin host-sched 6-control <- cpu-gdb-socket poll-control
 set cpu-gdb-socket sockaddr-local 0.0.0.0:5000
-set cpu-gdb-socket verbose? 0
 # gdb w/ gloss
 connect-pin gloss trap-chain <-> cpu-gdb trap
 connect-pin gloss trap-code-chain -> cpu-gdb trap-code

diff --git a/sid/bsp/pregen/arm-glossBE.conf b/sid/bsp/pregen/arm-glossBE.conf
index 092b1ea..c59ff3b 100644 (file)
--- a/sid/bsp/pregen/arm-glossBE.conf
+++ b/sid/bsp/pregen/arm-glossBE.conf
@@ -1,6 +1,6 @@
 # sid configuration file
 # created by Id: configrun-sid.in,v 1.22 2001/10/03 17:24:17 fche Exp 
-# run by fche @ tooth (Linux) at Wed Oct  3 13:24:30 EDT 2001
+# run by fche @ tooth (Linux) at Thu Oct  4 13:32:09 EDT 2001
 # args: --cpu=arm --no-run --gdb=5000 -EB
 set main persistent? true
 load libaudio.la audio_component_library
@@ -40,11 +40,6 @@ new sid-io-socket-server cpu-gdb-socket
 # second section
 # settings
 set cpu step-insn-count 10000
-set cpu trace-semantics? 0
-set cpu trace-disassemble? 0
-set cpu trace-counter? 0
-set cpu trace-extract? 0
-set cpu enable-warnings? 0
 set host-sched num-clients 10 # large enough?
 set target-sched num-clients 10 # large enough?
 # pin connections
@@ -80,8 +75,6 @@ connect-pin cpu-gdb yield -> yield-net input
 connect-pin cpu-gdb flush-icache -> cpu flush-icache
 connect-pin cpu-gdb restart -> hw-reset-net input
 set cpu-gdb exit-on-detach? 1
-set cpu-gdb trace-gdbsid? 0
-set cpu-gdb trace-gdbserv? 0
 # cpu-gdb-socket
 connect-pin init-sequence output-2 -> cpu-gdb-socket init
 connect-pin deinit-sequence output-6 -> cpu-gdb-socket fini
@@ -90,7 +83,6 @@ connect-pin cpu-gdb-socket tx <- cpu-gdb remote-tx
 connect-pin host-sched 6-event -> cpu-gdb-socket poll-event
 connect-pin host-sched 6-control <- cpu-gdb-socket poll-control
 set cpu-gdb-socket sockaddr-local 0.0.0.0:5000
-set cpu-gdb-socket verbose? 0
 # gdb w/ gloss
 connect-pin gloss trap-chain <-> cpu-gdb trap
 connect-pin gloss trap-code-chain -> cpu-gdb trap-code

diff --git a/sid/bsp/pregen/arm-pid-tksm.conf b/sid/bsp/pregen/arm-pid-tksm.conf
index 6013093..fc04111 100644 (file)
--- a/sid/bsp/pregen/arm-pid-tksm.conf
+++ b/sid/bsp/pregen/arm-pid-tksm.conf
@@ -1,6 +1,6 @@
 # sid configuration file
 # created by Id: configrun-sid.in,v 1.22 2001/10/03 17:24:17 fche Exp 
-# run by fche @ tooth (Linux) at Wed Oct  3 13:24:30 EDT 2001
+# run by fche @ tooth (Linux) at Thu Oct  4 13:32:10 EDT 2001
 # args: --cpu=arm --no-run --gdb=5000 --board=pid7t-uart1:gdb -EL --tksm
 set main persistent? true
 load libaudio.la audio_component_library
@@ -51,11 +51,6 @@ new bridge-tcl tcl-event-consumer
 # second section
 # settings
 set cpu step-insn-count 10000
-set cpu trace-semantics? 0
-set cpu trace-disassemble? 0
-set cpu trace-counter? 0
-set cpu trace-extract? 0
-set cpu enable-warnings? 0
 set host-sched num-clients 10 # large enough?
 set target-sched num-clients 10 # large enough?
 # pin connections
@@ -121,8 +116,6 @@ connect-pin cpu-gdb yield -> yield-net input
 connect-pin cpu-gdb flush-icache -> cpu flush-icache
 connect-pin cpu-gdb restart -> hw-reset-net input
 set cpu-gdb exit-on-detach? 1
-set cpu-gdb trace-gdbsid? 0
-set cpu-gdb trace-gdbserv? 0
 # cpu-gdb-socket
 connect-pin init-sequence output-2 -> cpu-gdb-socket init
 connect-pin deinit-sequence output-6 -> cpu-gdb-socket fini
@@ -131,7 +124,6 @@ connect-pin cpu-gdb-socket tx <- cpu-gdb remote-tx
 connect-pin host-sched 6-event -> cpu-gdb-socket poll-event
 connect-pin host-sched 6-control <- cpu-gdb-socket poll-control
 set cpu-gdb-socket sockaddr-local 0.0.0.0:5000
-set cpu-gdb-socket verbose? 0
 # cpu-gdb w/ pid7t
 connect-pin cpu trap <-> cpu-gdb trap
 connect-pin cpu trap-code -> cpu-gdb trap-code

diff --git a/sid/bsp/pregen/arm-pid.conf b/sid/bsp/pregen/arm-pid.conf
index b07b486..64568a4 100644 (file)
--- a/sid/bsp/pregen/arm-pid.conf
+++ b/sid/bsp/pregen/arm-pid.conf
@@ -1,6 +1,6 @@
 # sid configuration file
 # created by Id: configrun-sid.in,v 1.22 2001/10/03 17:24:17 fche Exp 
-# run by fche @ tooth (Linux) at Wed Oct  3 13:24:30 EDT 2001
+# run by fche @ tooth (Linux) at Thu Oct  4 13:32:10 EDT 2001
 # args: --cpu=arm --no-run --gdb=5000 --board=pid7t-uart1:gdb -EL
 set main persistent? true
 load libaudio.la audio_component_library
@@ -46,11 +46,6 @@ new sid-io-socket-server cpu-gdb-socket
 # second section
 # settings
 set cpu step-insn-count 10000
-set cpu trace-semantics? 0
-set cpu trace-disassemble? 0
-set cpu trace-counter? 0
-set cpu trace-extract? 0
-set cpu enable-warnings? 0
 set host-sched num-clients 10 # large enough?
 set target-sched num-clients 10 # large enough?
 # pin connections
@@ -116,8 +111,6 @@ connect-pin cpu-gdb yield -> yield-net input
 connect-pin cpu-gdb flush-icache -> cpu flush-icache
 connect-pin cpu-gdb restart -> hw-reset-net input
 set cpu-gdb exit-on-detach? 1
-set cpu-gdb trace-gdbsid? 0
-set cpu-gdb trace-gdbserv? 0
 # cpu-gdb-socket
 connect-pin init-sequence output-2 -> cpu-gdb-socket init
 connect-pin deinit-sequence output-6 -> cpu-gdb-socket fini
@@ -126,7 +119,6 @@ connect-pin cpu-gdb-socket tx <- cpu-gdb remote-tx
 connect-pin host-sched 6-event -> cpu-gdb-socket poll-event
 connect-pin host-sched 6-control <- cpu-gdb-socket poll-control
 set cpu-gdb-socket sockaddr-local 0.0.0.0:5000
-set cpu-gdb-socket verbose? 0
 # cpu-gdb w/ pid7t
 connect-pin cpu trap <-> cpu-gdb trap
 connect-pin cpu trap-code -> cpu-gdb trap-code

diff --git a/sid/bsp/pregen/arm-pidBE.conf b/sid/bsp/pregen/arm-pidBE.conf
index 36e2bd3..bcedceb 100644 (file)
--- a/sid/bsp/pregen/arm-pidBE.conf
+++ b/sid/bsp/pregen/arm-pidBE.conf
@@ -1,6 +1,6 @@
 # sid configuration file
 # created by Id: configrun-sid.in,v 1.22 2001/10/03 17:24:17 fche Exp 
-# run by fche @ tooth (Linux) at Wed Oct  3 13:24:30 EDT 2001
+# run by fche @ tooth (Linux) at Thu Oct  4 13:32:10 EDT 2001
 # args: --cpu=arm --no-run --gdb=5000 --board=pid7t-uart1:gdb -EB
 set main persistent? true
 load libaudio.la audio_component_library
@@ -46,11 +46,6 @@ new sid-io-socket-server cpu-gdb-socket
 # second section
 # settings
 set cpu step-insn-count 10000
-set cpu trace-semantics? 0
-set cpu trace-disassemble? 0
-set cpu trace-counter? 0
-set cpu trace-extract? 0
-set cpu enable-warnings? 0
 set host-sched num-clients 10 # large enough?
 set target-sched num-clients 10 # large enough?
 # pin connections
@@ -116,8 +111,6 @@ connect-pin cpu-gdb yield -> yield-net input
 connect-pin cpu-gdb flush-icache -> cpu flush-icache
 connect-pin cpu-gdb restart -> hw-reset-net input
 set cpu-gdb exit-on-detach? 1
-set cpu-gdb trace-gdbsid? 0
-set cpu-gdb trace-gdbserv? 0
 # cpu-gdb-socket
 connect-pin init-sequence output-2 -> cpu-gdb-socket init
 connect-pin deinit-sequence output-6 -> cpu-gdb-socket fini
@@ -126,7 +119,6 @@ connect-pin cpu-gdb-socket tx <- cpu-gdb remote-tx
 connect-pin host-sched 6-event -> cpu-gdb-socket poll-event
 connect-pin host-sched 6-control <- cpu-gdb-socket poll-control
 set cpu-gdb-socket sockaddr-local 0.0.0.0:5000
-set cpu-gdb-socket verbose? 0
 # cpu-gdb w/ pid7t
 connect-pin cpu trap <-> cpu-gdb trap
 connect-pin cpu trap-code -> cpu-gdb trap-code