1 files changed, 29 insertions, 1 deletions

diff --git a/tools/configure b/tools/configure
index 2c7443b59d..522b3c7fd0 100755
--- a/tools/configure
+++ b/tools/configure
@@ -753,6 +753,8 @@ EOF
     flash=""
     plugins="yes"
     codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+    boottool="$rootdir/tools/scramble -ipod4g"
+    bootoutput="bootloader.img"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset=$ipodbitmaptools
@@ -773,6 +775,8 @@ EOF
     flash=""
     plugins="yes"
     codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+    boottool="$rootdir/tools/scramble -ipod4g"
+    bootoutput="bootloader.img"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset=$ipodbitmaptools
@@ -793,6 +797,8 @@ EOF
     flash=""
     plugins="yes"
     codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+    boottool="$rootdir/tools/scramble -ipod5g"
+    bootoutput="bootloader.img"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset=$ipodbitmaptools
@@ -813,6 +819,8 @@ EOF
     flash=""
     plugins="yes"
     codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+    boottool="$rootdir/tools/scramble -ipod3g"
+    bootoutput="bootloader.img"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset=$ipodbitmaptools
@@ -833,6 +841,8 @@ EOF
     flash=""
     plugins="yes"
     codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+    boottool="$rootdir/tools/scramble -ipod4g"
+    bootoutput="bootloader.img"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset=$ipodbitmaptools
@@ -853,6 +863,8 @@ EOF
     flash=""
     plugins="yes"
     codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+    boottool="$rootdir/tools/scramble -ipod4g"
+    bootoutput="bootloader.img"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset=$ipodbitmaptools
@@ -894,6 +906,8 @@ EOF
     plugins="yes"
     codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
     toolset=$gigabeatbitmaptools
+    boottool="$rootdir/tools/scramble -gigabeat"
+    bootoutput="FWIMG01.DAT"
     # architecture, manufacturer and model for the target-tree build
     t_cpu="arm"
     t_manufacturer="gigabeat"
@@ -915,6 +929,8 @@ EOF
     flash=""
     plugins="yes"
     codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+    boottool="$rootdir/tools/scramble -ipod4g"
+    bootoutput="bootloader.img"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset=$ipodbitmaptools
@@ -935,6 +951,8 @@ EOF
     flash=""
     plugins="yes"
     codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+    boottool="$rootdir/tools/scramble -mi4v3"
+    bootoutput="h10.mi4"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset="$genericbitmaptools scramble"
@@ -959,9 +977,11 @@ EOF
     flash=""
     plugins="yes"
     codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+    boottool="$rootdir/tools/scramble -mi4v3"
+    bootoutput="PP5022.mi4"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
-    toolset=$genericbitmaptools
+    toolset="$genericbitmaptools scramble"
     # architecture, manufacturer and model for the target-tree build
     t_cpu="arm"
     t_manufacturer="sandisk"
@@ -983,6 +1003,8 @@ EOF
     flash=""
     plugins="yes"
     codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+    boottool="$rootdir/tools/scramble -mi4v2"
+    bootoutput="h10.mi4"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset="$genericbitmaptools scramble"
@@ -1056,6 +1078,12 @@ fi
           extradefines="-DBOOTLOADER" # for target makefile symbol EXTRA_DEFINES
           appsdir='\$(ROOTDIR)/bootloader'
           apps="bootloader"
+          if test -n "$boottool"; then
+              tool="$boottool"
+          fi
+          if test -n "$bootoutput"; then
+              output=$bootoutput
+          fi
       fi
       bootloader="1"
       echo "Bootloader build selected"