summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2009-12-07 12:19:08 +0000
committerBjörn Stenberg <bjorn@haxx.se>2009-12-07 12:19:08 +0000
commitc0740440ac9c830f59e8b5c9b3a8aecc49766506 (patch)
tree5ad47d05a66c0a1048d8bd6b304a66a8489248cd /rbutil
parentee15637749e293139f31a32548850cb549d3533e (diff)
downloadrockbox-c0740440ac9c830f59e8b5c9b3a8aecc49766506.tar.gz
rockbox-c0740440ac9c830f59e8b5c9b3a8aecc49766506.tar.bz2
rockbox-c0740440ac9c830f59e8b5c9b3a8aecc49766506.zip
Rename targets to be consistent in all places. (FS #10819). Take 2.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23883 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/ipodpatcher/Makefile8
-rw-r--r--rbutil/ipodpatcher/ipodpatcher.c6
-rw-r--r--rbutil/rbutilqt/rbutil.ini58
3 files changed, 36 insertions, 36 deletions
diff --git a/rbutil/ipodpatcher/Makefile b/rbutil/ipodpatcher/Makefile
index 713c21b546..908cc110f2 100644
--- a/rbutil/ipodpatcher/Makefile
+++ b/rbutil/ipodpatcher/Makefile
@@ -82,14 +82,14 @@ ipod4g.c: bootloader-ipod4g.ipod ipod2c
ipodcolor.c: bootloader-ipodcolor.ipod ipod2c
./ipod2c bootloader-ipodcolor.ipod ipodcolor
-ipodmini.c: bootloader-ipodmini.ipod ipod2c
- ./ipod2c bootloader-ipodmini.ipod ipodmini
+ipodmini1g.c: bootloader-ipodmini1g.ipod ipod2c
+ ./ipod2c bootloader-ipodmini1g.ipod ipodmini1g
ipodmini2g.c: bootloader-ipodmini2g.ipod ipod2c
./ipod2c bootloader-ipodmini2g.ipod ipodmini2g
-ipodnano.c: bootloader-ipodnano.ipod ipod2c
- ./ipod2c bootloader-ipodnano.ipod ipodnano
+ipodnano1g.c: bootloader-ipodnano1g.ipod ipod2c
+ ./ipod2c bootloader-ipodnano1g.ipod ipodnano1g
ipodvideo.c: bootloader-ipodvideo.ipod ipod2c
./ipod2c bootloader-ipodvideo.ipod ipodvideo
diff --git a/rbutil/ipodpatcher/ipodpatcher.c b/rbutil/ipodpatcher/ipodpatcher.c
index e7872c0978..26202fb253 100644
--- a/rbutil/ipodpatcher/ipodpatcher.c
+++ b/rbutil/ipodpatcher/ipodpatcher.c
@@ -37,10 +37,10 @@
#include "ipod1g2g.h"
#include "ipod3g.h"
#include "ipod4g.h"
-#include "ipodmini.h"
+#include "ipodmini1g.h"
#include "ipodmini2g.h"
#include "ipodcolor.h"
-#include "ipodnano.h"
+#include "ipodnano1g.h"
#include "ipodvideo.h"
#include "ipodnano2g.h"
#endif
@@ -1686,7 +1686,7 @@ int getmodel(struct ipod_t* ipod, int ipod_version)
ipod->modelstr="1st Generation Nano";
ipod->modelnum = 4;
ipod->modelname = "nano";
- ipod->targetname = "ipodnano";
+ ipod->targetname = "ipodnano1g";
#ifdef WITH_BOOTOBJS
ipod->bootloader = ipodnano;
ipod->bootloader_len = LEN_ipodnano;
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 0c5dd40e39..c8f02b2cf8 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -16,20 +16,20 @@ genlang_url=http://www.rockbox.org/genlang/
rbutil_url=http://download.rockbox.org/rbutil/
[platforms]
-platform01=player
-platform02=recorder
-platform03=recorder8mb
-platform04=recorderv2
-platform05=fmrecorder
-platform06=fmrecorder8mb
-platform07=ondiosp
-platform08=ondiofm
-platform10=h100
-platform11=h120
-platform12=h300
-platform13=h10_5gbums
-platform14=h10_5gbmtp
-platform15=h10
+platform01=archosplayer
+platform02=archosrecorder
+platform03=archosrecorder8mb
+platform04=archosrecorderv2
+platform05=archosfmrecorder
+platform06=archosfmrecorder8mb
+platform07=archosondiosp
+platform08=archosondiofm
+platform10=iriverh100
+platform11=iriverh120
+platform12=iriverh300
+platform13=iriverh10_5gbums
+platform14=iriverh10_5gbmtp
+platform15=iriverh10
platform20=ipod1g2g
platform21=ipod3g
platform22=ipod4gray
@@ -210,7 +210,7 @@ manualname=
brand=Iriver
usbid=0x0b7000ba
usberror=0x41022101
-configure_modelname=h10
+configure_modelname=iriverh10
encoder=rbspeex
[ipod1g2g]
@@ -233,14 +233,14 @@ brand=Apple
configure_modelname=ipodcolor
encoder=rbspeex
-[ipodnano]
+[ipodnano1g]
name="Ipod Nano (1st gen)"
-buildserver_modelname=ipodnano
+buildserver_modelname=ipodnano1g
bootloadermethod=ipod
-bootloadername=/ipod/bootloader-ipodnano.ipod
+bootloadername=/ipod/bootloader-ipodnano1g.ipod
manualname=
brand=Apple
-configure_modelname=ipodnano
+configure_modelname=ipodnano1g
encoder=rbspeex
[ipodnano2g]
@@ -298,7 +298,7 @@ encoder=rbspeex
name="Ipod Mini (1st gen)"
buildserver_modelname=ipodmini1g
bootloadermethod=ipod
-bootloadername=/ipod/bootloader-ipodmini.ipod
+bootloadername=/ipod/bootloader-ipodmini1g.ipod
manualname=rockbox-ipodmini2g
brand=Apple
configure_modelname=ipodmini
@@ -323,7 +323,7 @@ bootloaderfile=/FIRMWARE/x5_fw.bin
manualname=
brand=Cowon
usbid=0x0e210510, 0x0e210513
-configure_modelname=x5
+configure_modelname=iaudiox5
encoder=rbspeex
[iaudiox5v]
@@ -334,7 +334,7 @@ bootloadername=/iaudio/x5v_fw.bin
bootloaderfile=/FIRMWARE/x5v_fw.bin
manualname=
brand=Cowon
-configure_modelname=x5
+configure_modelname=iaudiox5
encoder=rbspeex
[iaudiom5]
@@ -346,7 +346,7 @@ bootloaderfile=/FIRMWARE/m5_fw.bin
manualname=
brand=Cowon
usbid=0x0e210520
-configure_modelname=m5
+configure_modelname=iaudiom5
encoder=rbspeex
[iaudiom3]
@@ -382,7 +382,7 @@ manualname=
brand=Sandisk
usbid=0x07817421
usberror=0x07810720
-configure_modelname=e200
+configure_modelname=sansae200
encoder=rbspeex
[sansac200]
@@ -393,7 +393,7 @@ bootloadername=/sandisk-sansa/c200/firmware.mi4
manualname=
brand=Sandisk
usbid=0x07817450, 0x07817451
-configure_modelname=c200
+configure_modelname=sansac200
encoder=rbspeex
[sansae200v2]
@@ -406,7 +406,7 @@ manualname=
brand=Sandisk
usbid=0x07817423
usberror=0x07817422
-configure_modelname=e200v2
+configure_modelname=sansae200v2
encoder=rbspeex
[sansafuze]
@@ -419,7 +419,7 @@ manualname=
brand=Sandisk
usbid=0x078174c1
usberror=0x078174c0
-configure_modelname=fuze
+configure_modelname=sansafuze
encoder=rbspeex
[sansam200v4]
@@ -432,7 +432,7 @@ manualname=
brand=Sandisk
usbid=
usberror=
-configure_modelname=m200v4
+configure_modelname=sansam200v4
encoder=rbspeex
status=disabled
@@ -446,7 +446,7 @@ manualname=
brand=Sandisk
usbid=0x07817433
usberror=0x07817432
-configure_modelname=clip
+configure_modelname=sansaclip
encoder=rbspeex
[mrobe100]