2001-08-06 Frank Ch. Eigler <fche@redhat.com>

        * configrun-sid.in (opt_load): Don't load if empty $exec.
        Always create mappers, separately from opt_load logic.

diff --git a/sid/bsp/ChangeLog b/sid/bsp/ChangeLog
index 3d10faa..49ce43f 100644 (file)
--- a/sid/bsp/ChangeLog
+++ b/sid/bsp/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-06  Frank Ch. Eigler  <fche@redhat.com>
+
+       * configrun-sid.in (opt_load): Don't load if empty $exec.
+       Always create mappers, separately from opt_load logic.
+
 2001-08-06  Ben Elliston  <bje@redhat.com>
        
        * configrun-sid.in (%component_libs): Add "cache" key/value.

diff --git a/sid/bsp/configrun-sid.in b/sid/bsp/configrun-sid.in
index 7d249e9..baa84eb 100644 (file)
--- a/sid/bsp/configrun-sid.in
+++ b/sid/bsp/configrun-sid.in
@@ -253,7 +253,7 @@ if ($opt_load{"cpu"})
     }
     $exec = $opt_load{"cpu"};
 }
-else
+elsif ($exec)
   {
       $opt_load{"cpu"} = "$exec";
   }
@@ -344,6 +344,7 @@ if ($opt_persistent) { $zeroth_section .= "set main persistent? true\n"; }
 $cpu_component_type = $cpu_comptype{$opt_cpu} || die "Unknown cpu $opt_cpu for cpu component type\n";
 $first_section = "# first section\n" .
   &sidconf_new("$cpu_component_type", "cpu") . "\n" .
+  &sidconf_new("hw-mapper-basic", "cpu-mapper") . "\n" .
   &sidconf_new("hw-glue-sequence-8", "init-sequence") . "\n" .
   &sidconf_new("hw-glue-sequence-1", "hw-reset-net") . "\n" .
   &sidconf_new("hw-glue-sequence-8", "deinit-sequence") . "\n" .
@@ -878,11 +879,10 @@ connect-pin cpu trap-code -> cpu-gdb trap-code
       }
   }
 
-# Generate a loader and mapper for each processor
+# Generate a loader for each processor
 foreach $processor (keys %opt_load)
   {
     $first_section .= "# ${processor} loader\n" .
-       &sidconf_new("hw-mapper-basic", "${processor}-mapper") . "\n" .
        &sidconf_new("sw-load-elf", "${processor}-loader") . "\n";
     $second_section .= "# ${processor} loader
 set ${processor}-loader file \"$opt_load{$processor}\"