2 files changed, 12 insertions, 1 deletions

diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index a30eb28e67..3eb974c10d 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -216,6 +216,16 @@ sub buildzip {
         if( filesize("rombox.ucl") > 1000) {
             `cp rombox.ucl .rockbox/`;  # UCL for flashing
         }
+        
+        # Check for rombox.target
+        if ($image=~/(.*)\.(\w+)$/)
+        {
+            my $romfile = "rombox.$2";
+            if (filesize($romfile) > 1000)
+            {
+                `cp $romfile .rockbox/`;
+            }
+        }
     }
 
     mkdir ".rockbox/docs", 0777;
diff --git a/tools/configure b/tools/configure
index 53be8eee91..1cfc4cc104 100755
--- a/tools/configure
+++ b/tools/configure
@@ -767,7 +767,7 @@ EOF
     output="rockbox.iriver"
     appextra="recorder:gui"
     archosrom=""
-    flash=""
+    flash="$pwd/rombox.iriver"
     plugins="yes"
     codecs="libmad liba52 libffmpegFLAC libTremor libwavpack libmusepack libalac libfaad libm4a"
     # toolset is the tools within the tools directory that we build for
@@ -1244,6 +1244,7 @@ fi
           extradefines="-DBOOTLOADER" # for target makefile symbol EXTRA_DEFINES
           appsdir='\$(ROOTDIR)/bootloader'
           apps="bootloader"
+          flash=""
           if test -n "$boottool"; then
               tool="$boottool"
           fi