summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/ipodpatcher/ipodpatcher.c7
-rw-r--r--rbutil/rbutilqt/base/autodetection.cpp8
-rw-r--r--rbutil/rbutilqt/rbutil.ini13
3 files changed, 3 insertions, 25 deletions
diff --git a/rbutil/ipodpatcher/ipodpatcher.c b/rbutil/ipodpatcher/ipodpatcher.c
index b2f01b8223..9f446d4ea4 100644
--- a/rbutil/ipodpatcher/ipodpatcher.c
+++ b/rbutil/ipodpatcher/ipodpatcher.c
@@ -1696,12 +1696,7 @@ int getmodel(struct ipod_t* ipod, int ipod_version)
ipod->modelstr="Video (aka 5th Generation)";
ipod->modelnum = 5;
ipod->modelname = "ipvd";
- if(ipod->ramsize == 64) {
- ipod->targetname = "ipodvideo64mb";
- }
- else {
- ipod->targetname = "ipodvideo";
- }
+ ipod->targetname = "ipodvideo";
#ifdef WITH_BOOTOBJS
ipod->bootloader = ipodvideo;
ipod->bootloader_len = LEN_ipodvideo;
diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp
index 695cb6a204..2bd61ff5ba 100644
--- a/rbutil/rbutilqt/base/autodetection.cpp
+++ b/rbutil/rbutilqt/base/autodetection.cpp
@@ -98,12 +98,6 @@ bool Autodetection::detect()
if(m_device.isEmpty())
{
m_device = info.target();
- // special case for video64mb. This is a workaround, and
- // should get replaced when autodetection is reworked.
- if(m_device == "ipodvideo" && info.ram() == 64)
- {
- m_device = "ipodvideo64mb";
- }
}
m_mountpoint = mounts.at(i);
qDebug() << "[Autodetect] rockbox-info.txt detected:"
@@ -267,7 +261,7 @@ QStringList Autodetection::mountpoints()
endmntent(mn);
#else
-#error Unknown Plattform
+#error Unknown Platform
#endif
return tempList;
}
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 924007a7bf..5ad9f2f30a 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -50,7 +50,6 @@ platform21=ipod3g
platform22=ipod4g
platform23=ipodcolor
platform24=ipodvideo
-platform25=ipodvideo.64mb
platform26=ipodmini1g
platform27=ipodmini2g
platform28=ipodnano1g
@@ -285,7 +284,7 @@ configure_modelname=ipod4g
encoder=rbspeex
[ipodvideo]
-name="Ipod Video (5th gen) 30GB"
+name="Ipod Video (5th gen)"
buildserver_modelname=ipodvideo
bootloadermethod=ipod
bootloadername=/ipod/bootloader-ipodvideo.ipod
@@ -294,16 +293,6 @@ brand=Apple
configure_modelname=ipodvideo
encoder=rbspeex
-[ipodvideo.64mb]
-name="Ipod Video (5th gen) 60/80GB"
-buildserver_modelname=ipodvideo64mb
-bootloadermethod=ipod
-bootloadername=/ipod/bootloader-ipodvideo.ipod
-manualname=
-brand=Apple
-configure_modelname=ipodvideo
-encoder=rbspeex
-
[ipod3g]
name="Ipod (3rd gen)"
buildserver_modelname=ipod3g