2 files changed, 15 insertions, 26 deletions

diff --git a/tools/release/sims.pl b/tools/release/sims.pl
index 2cf5c4f45a..10cf950c53 100755
--- a/tools/release/sims.pl
+++ b/tools/release/sims.pl
@@ -188,26 +188,14 @@ sub buildit {
     `make install 2>/dev/null`;
 }
 
-for my $b (sort byname keys %builds) {
-    if ($builds{$b}{status} > 0 && $builds{$b}{status} >= 2)
+for my $b (sort &simbuilds) {
+    if ($builds{$b}{ram} ne '')
     {
-        if ($builds{$b}{ram} ne '')
-        {
-            # These builds need the ram size sent to configure
-            runone($b, $builds{$b}{ram} . '\n');
-        }
-        else
-        {
-            runone($b);
-        }
+        # These builds need the ram size sent to configure
+        runone($b, $builds{$b}{ram} . '\n');
+    }
+    else
+    {
+        runone($b);
     }
 }
-
-#The following ports are in the unusable category, but the simulator does build
-runone("ondavx747");
-runone("ondavx747p");
-runone("ondavx777");
-runone("sansam200v4");
-runone("zenvision");
-runone("zenvisionm30gb");
-runone("zenvisionm60gb");
diff --git a/tools/release/voices.pl b/tools/release/voices.pl
index 42bf533118..1b08123673 100755
--- a/tools/release/voices.pl
+++ b/tools/release/voices.pl
@@ -68,12 +68,13 @@ sub buildit {
 # run make in tools first to make sure they're up-to-date
 `(cd tools && make ) >/dev/null 2>&1`;
 
-my $home=$ENV{'HOME'};
-
-my $pool="$home/tmp/rockbox-voices-$version/voice-pool";
-`mkdir -p $pool`;
-`rm -f $pool/*`;
-$ENV{'POOL'}="$pool";
+if (!defined($ENV{'POOL'}) {
+    my $home=$ENV{'HOME'};
+    my $pool="$home/tmp/rockbox-voices-$version/voice-pool";
+    `mkdir -p $pool`;
+    $ENV{'POOL'}="$pool";
+}
+# `rm -f $pool/*`;
 
 `mkdir -p $outdir`;