1 files changed, 7 insertions, 57 deletions

diff --git a/rbutil/rbutil.ini b/rbutil/rbutil.ini
index 838edfb6d3..01e86c1506 100644
--- a/rbutil/rbutil.ini
+++ b/rbutil/rbutil.ini
@@ -43,8 +43,6 @@ released=yes
 needsbootloader=no
 bootloadermethod=
 bootloadername=
-autodetect=no
-combinedname=
 resolution=11x2x1
 
 [recorder]
@@ -54,8 +52,6 @@ released=yes
 needsbootloader=no
 bootloadermethod=
 bootloadername=
-autodetect=no
-combinedname=
 resolution=112x64x1
 
 [recorder8mb]
@@ -65,8 +61,6 @@ released=no
 needsbootloader=no
 bootloadermethod=
 bootloadername=
-autodetect=no
-combinedname=
 resolution=112x64x1
 
 [recorderv2]
@@ -76,8 +70,6 @@ released=yes
 needsbootloader=no
 bootloadermethod=
 bootloadername=
-autodetect=no
-combinedname=
 resolution=112x64x1
 
 [fmrecorder]
@@ -87,8 +79,6 @@ released=yes
 needsbootloader=no
 bootloadermethod=
 bootloadername=
-autodetect=no
-combinedname=
 resolution=112x64x1
 
 [fmrecorder8mb]
@@ -98,8 +88,6 @@ released=no
 needsbootloader=no
 bootloadermethod=
 bootloadername=
-autodetect=no
-combinedname=
 resolution=112x64x1
 
 [ondiosp]
@@ -109,8 +97,6 @@ released=yes
 needsbootloader=no
 bootloadermethod=
 bootloadername=
-autodetect=no
-combinedname=
 resolution=112x64x1
 
 [ondiofm]
@@ -120,8 +106,6 @@ released=yes
 needsbootloader=no
 bootloadermethod=
 bootloadername=
-autodetect=no
-combinedname=
 resolution=112x64x1
 
 [h100]
@@ -131,8 +115,6 @@ released=no
 needsbootloader=yes
 bootloadermethod=fwpatcher
 bootloadername=bootloader-h100.bin
-autodetect=no
-combinedname=
 resolution=160x128x2
 
 [h120]
@@ -142,8 +124,6 @@ released=no
 needsbootloader=yes
 bootloadermethod=fwpatcher
 bootloadername=bootloader-h120.bin
-autodetect=no
-combinedname=
 resolution=160x128x2
 
 [h300]
@@ -153,8 +133,6 @@ released=no
 needsbootloader=yes
 bootloadermethod=fwpatcher
 bootloadername=bootloader-h300.bin
-autodetect=no
-combinedname=
 resolution=220x176x16
 
 [h10_5gbums]
@@ -164,8 +142,6 @@ released=no
 needsbootloader=yes
 bootloadermethod=h10
 bootloadername=H10.mi4
-autodetect=no
-combinedname=
 resolution=128x128x16
 
 [h10_5gbmtp]
@@ -175,8 +151,6 @@ released=no
 needsbootloader=yes
 bootloadermethod=h10
 bootloadername=H10_5GB-MTP/H10.mi4
-autodetect=no
-combinedname=
 resolution=128x128x16
 
 [h10]
@@ -186,8 +160,6 @@ released=no
 needsbootloader=yes
 bootloadermethod=h10
 bootloadername=H10_20GC.mi4
-autodetect=no
-combinedname=
 resolution=160x128x16
 
 [ipodcolor]
@@ -196,9 +168,7 @@ platform=ipodcolor
 released=no
 needsbootloader=yes
 bootloadermethod=ipodpatcher
-bootloadername=none
-autodetect=yes
-combinedname=Ipod mini 1g, mini 2g, 3g, 4g, color, video, nano 1g
+bootloadername=ipodcolor
 resolution=220x176x16
 
 [ipodnano]
@@ -207,9 +177,7 @@ platform=ipodnano
 released=no
 needsbootloader=yes
 bootloadermethod=ipodpatcher
-bootloadername=none
-autodetect=yes
-combinedname=Ipod mini 1g, mini 2g, 3g, 4g, color, video, nano 1g
+bootloadername=ipodnano
 resolution=176x132x16
 
 [ipod4gray]
@@ -218,9 +186,7 @@ platform=ipod4gray
 released=no
 needsbootloader=yes
 bootloadermethod=ipodpatcher
-bootloadername=none
-autodetect=yes
-combinedname=Ipod mini 1g, mini 2g, 3g, 4g, color, video, nano 1g
+bootloadername=ipod4g
 resolution=160x128x2
 
 [ipodvideo]
@@ -229,9 +195,7 @@ platform=ipodvideo
 released=no
 needsbootloader=yes
 bootloadermethod=ipodpatcher
-bootloadername=none
-autodetect=yes
-combinedname=Ipod mini 1g, mini 2g, 3g, 4g, color, video, nano 1g
+bootloadername=ipodvideo
 resolution=320x240x16
 
 [ipod3g]
@@ -240,9 +204,7 @@ platform=ipod3g
 released=no
 needsbootloader=yes
 bootloadermethod=ipodpatcher
-bootloadername=none
-autodetect=yes
-combinedname=Ipod mini 1g, mini 2g, 3g, 4g, color, video, nano 1g
+bootloadername=ipod3g
 resolution=160x128x2
 
 [ipodmini1g]
@@ -251,9 +213,7 @@ platform=ipodmini1g
 released=no
 needsbootloader=yes
 bootloadermethod=ipodpatcher
-bootloadername=none
-autodetect=yes
-combinedname=Ipod mini 1g, mini 2g, 3g, 4g, color, video, nano 1g
+bootloadername=ipodmini
 resolution=138x110x2
 
 [ipodmini2g]
@@ -262,9 +222,7 @@ platform=ipodmini2g
 released=no
 needsbootloader=yes
 bootloadermethod=ipodpatcher
-bootloadername=none
-autodetect=yes
-combinedname=Ipod mini 1g, mini 2g, 3g, 4g, color, video, nano 1g
+bootloadername=ipodmini2g
 resolution=138x110x2
 
 [iaudiox5]
@@ -274,8 +232,6 @@ released=no
 needsbootloader=yes
 bootloadermethod=iaudio
 bootloadername=x5_fw.bin
-autodetect=no
-combinedname=
 resolution=160x128x16
 
 [iaudiox5v]
@@ -285,8 +241,6 @@ released=no
 needsbootloader=yes
 bootloadermethod=iaudio
 bootloadername=x5v_fw.bin
-autodetect=no
-combinedname=
 resolution=160x128x2
 
 [iaudiom5]
@@ -296,8 +250,6 @@ released=no
 needsbootloader=yes
 bootloadermethod=iaudio
 bootloadername=m5_fw.bin
-autodetect=no
-combinedname=
 resolution=160x128x16
 
 [gigabeatf]
@@ -306,6 +258,4 @@ platform=gigabeatf
 needsbootloader=yes
 bootloadermethod=gigabeatf
 bootloadername=FWIMG01.DAT
-autodetect=no
-combinedname=
 resolution=240x320x16