summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2006-08-01 22:22:01 +0000
committerDaniel Stenberg <daniel@haxx.se>2006-08-01 22:22:01 +0000
commit95ea7586863ed9335edc28396072a6ac66dd1150 (patch)
treee04e7541b522abdc028aef3ab15387e6ece0f18c
parent30c618cd96f3fb1de03254c891c4c9ca7f8a7355 (diff)
downloadrockbox-95ea7586863ed9335edc28396072a6ac66dd1150.tar.gz
rockbox-95ea7586863ed9335edc28396072a6ac66dd1150.zip
First configure support for setting up iriver H10 and SanDisk Sansa e200
builds. TARGET_TREE is now defined by the config-*.h file and not set by configure git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10397 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/config-iaudiox5.h1
-rwxr-xr-xtools/configure62
2 files changed, 57 insertions, 6 deletions
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h
index ae48eb6dbe..a828ca1ec9 100644
--- a/firmware/export/config-iaudiox5.h
+++ b/firmware/export/config-iaudiox5.h
@@ -1,6 +1,7 @@
/*
* This config file is for iAudio X5
*/
+#define TARGET_TREE /* this target is using the target tree system */
/* For Rolo and boot loader */
#define MODEL_NUMBER 10
diff --git a/tools/configure b/tools/configure
index f155afd8db..aa9c421194 100755
--- a/tools/configure
+++ b/tools/configure
@@ -469,6 +469,8 @@ toolsdir='\$(ROOTDIR)/tools'
echo "19 - iriver iFP-790"
echo "20 - Toshiba Gigabeat F"
echo "21 - iPod Mini 2G"
+ echo "22 - iriver H10"
+ echo "23 - SanDisk Sansa e200"
target_id=`input`;
@@ -479,9 +481,9 @@ toolsdir='\$(ROOTDIR)/tools'
archosbitmaptools="$toolset scramble descramble sh2d uclpack bmp2rb codepages"
iriverbitmaptools="$toolset scramble descramble mkboot bmp2rb codepages"
iaudiobitmaptools="$toolset scramble descramble mkboot bmp2rb codepages"
- gigabeatbitmaptools="$toolset bmp2rb codepages"
ipodbitmaptools="$toolset scramble ipod_fw bmp2rb codepages"
- ifpbitmaptools="$toolset bmp2rb codepages"
+ # generic is used by Gigabeat, IFP, H10, Sansa-e200
+ genericbitmaptools="$toolset bmp2rb codepages"
case $target_id in
@@ -851,7 +853,7 @@ toolsdir='\$(ROOTDIR)/tools'
codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
# toolset is the tools within the tools directory that we build for
# this particular target.
- toolset=$ifpbitmaptools
+ toolset=$genericbitmaptools
;;
20)
@@ -868,7 +870,7 @@ toolsdir='\$(ROOTDIR)/tools'
flash=""
plugins="yes"
codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
- toolset=$gigabeatbitmaptools
+ toolset=$genericbitmaptools
;;
21)
@@ -890,6 +892,54 @@ toolsdir='\$(ROOTDIR)/tools'
toolset=$ipodbitmaptools
;;
+ 22)
+ archos="h10"
+ target="-DIRIVER_H10"
+ memory=32 # always
+ arm7tdmicc
+ #tool="$rootdir/tools/ -add=iax5"
+ tool="$rootdir/tools/mi4code build"
+ bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+ bmp2rb_native="$rootdir/tools/bmp2rb -f 5"
+ output="rockbox.iriver"
+ appextra="recorder:gui"
+ archosrom=""
+ flash=""
+ plugins="yes"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ # toolset is the tools within the tools directory that we build for
+ # this particular target.
+ toolset=$genericbitmaptools
+ # architecture, manufacturer and model for the target-tree build
+ t_cpu="arm"
+ t_manufacturer="iriver"
+ t_model="h10"
+ ;;
+
+ 23)
+ archos="e200"
+ target="-DSANSA_E200"
+ memory=32 # supposedly
+ arm7tdmicc
+ #tool="$rootdir/tools/ -add=iax5"
+ tool="$rootdir/tools/mi4code build"
+ bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+ bmp2rb_native="$rootdir/tools/bmp2rb -f 5"
+ output="rockbox.sansa"
+ appextra="recorder:gui"
+ archosrom=""
+ flash=""
+ plugins="yes"
+ codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+ # toolset is the tools within the tools directory that we build for
+ # this particular target.
+ toolset=$genericbitmaptools
+ # architecture, manufacturer and model for the target-tree build
+ t_cpu="arm"
+ t_manufacturer="sandisk"
+ t_model="sansa-e200"
+ ;;
+
*)
echo "Please select an actual target platform!"
exit
@@ -945,7 +995,7 @@ fi
case $option in
[Bb])
case $archos in
- h100|h120|h300|x5|ipodcolor|ipodnano|ipodvideo|ipod3g|ipod4g|ipodmini|ipodmini2g)
+ h100|h120|h300|x5|ipodcolor|ipodnano|ipodvideo|ipod3g|ipod4g|ipodmini|ipodmini2g|h10|e200)
extradefines="-DBOOTLOADER" # for target makefile symbol EXTRA_DEFINES
appsdir='\$(ROOTDIR)/bootloader'
apps="bootloader"
@@ -1124,7 +1174,7 @@ if test -n "$t_cpu"; then
TARGET_INC="-I\$(FIRMDIR)/target/$t_cpu/$t_manufacturer/$t_model"
TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/$t_cpu/$t_manufacturer"
TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/$t_cpu"
- GCCOPTS="$GCCOPTS -DTARGET_TREE"
+ GCCOPTS="$GCCOPTS"
fi
if test "$simulator" = "yes"; then