initscripts-opendreambox: update

3 files changed, 22 insertions, 9 deletions

diff --git a/packages/initscripts/initscripts-1.0/dm800/bootup b/packages/initscripts/initscripts-1.0/dm800/bootup
index 194eb58490..b9aa927b4f 100644
--- a/packages/initscripts/initscripts-1.0/dm800/bootup
+++ b/packages/initscripts/initscripts-1.0/dm800/bootup
@@ -1,5 +1,6 @@
 modprobe lcd
 echo 10 > /proc/progress
+[ -e /dev/dbox/oled0 ] && ln -s /dev/dbox/oled0 /dev/dbox/lcd0
 
 mount -t proc proc /proc
 echo 11 > /proc/progress
@@ -13,7 +14,7 @@ echo 13 > /proc/progress
 swapon -a
 echo 14 > /proc/progress
 
-for mod in cifs nfsd usb-storage sd autofs4 vfat; do
+for mod in isofs cifs nfsd usb-storage sd autofs4 vfat ide-cd; do
 	modprobe $mod 2> /dev/null ;
 done
 
@@ -24,16 +25,21 @@ tar xzf /etc/var.tar.gz -C /
 echo 16 > /proc/progress
 
 # sleep after 10min
-hdparm -S 120 /dev/ide/host0/bus0/target0/lun0/disc
+hdparm -S 120 /dev/ide/host0/bus0/target0/lun0/disc || /bin/true;
+
 echo 17 > /proc/progress
-# set UDMA66
-hdparm -X66 /dev/ide/host0/bus0/target0/lun0/disc
+
+# set UDMA66, enable dma
+hdparm -d 1 /dev/ide/host0/bus0/target0/lun0/disc || /bin/true;
+hdparm -X66 /dev/ide/host0/bus0/target0/lun0/disc || /bin/true;
 
 # accustic management
-hdparm -M 128 /dev/ide/host0/bus0/target0/lun0/disc
+hdparm -M 128 /dev/ide/host0/bus0/target0/lun0/disc || /bin/true;
 
 echo 18 > /proc/progress
-modprobe bcm7401
+for i in dreambox_rc2 fp info; do
+	modprobe $i;
+done
 
 echo 19 > /proc/progress
 
@@ -41,7 +47,7 @@ cat /etc/videomode > /proc/stb/video/videomode
 
 echo 20 > /proc/progress
 
-for mod in dreambox_rc2 fp rt73 zd1211b; do
+for mod in rt73 zd1211b; do
 	modprobe $mod 2> /dev/null ;
 done
 
diff --git a/packages/initscripts/initscripts-1.0/dm8000/bootup b/packages/initscripts/initscripts-1.0/dm8000/bootup
index 00b847cf73..99ec68145a 100644
--- a/packages/initscripts/initscripts-1.0/dm8000/bootup
+++ b/packages/initscripts/initscripts-1.0/dm8000/bootup
@@ -31,8 +31,9 @@ done
 
 echo 17 > /proc/progress
 
-# set UDMA66
+# set UDMA66, enable dma
 for i in 0 1; do
+	hdparm -d 1 /dev/ide/host0/bus$i/target0/lun0/disc || /bin/true;
 	hdparm -X66 /dev/ide/host0/bus$i/target0/lun0/disc || /bin/true;
 done
 
@@ -41,6 +42,12 @@ for i in 0 1; do
 	hdparm -M 128 /dev/ide/host0/bus$i/target0/lun0/disc || /bin/true;
 done
 
+# disable dma for cd drive ... 
+# we remove this when the dma timeout problem is fixed!
+for i in 0 1; do
+	hdparm -d 0 /dev/ide/host0/bus$i/target0/lun0/cd || /bin/true;
+done
+
 echo 18 > /proc/progress
 for i in dreambox_rc2 fp info; do
 	modprobe $i;
diff --git a/packages/initscripts/initscripts-opendreambox_1.0.bb b/packages/initscripts/initscripts-opendreambox_1.0.bb
index 05452c1779..31b320418d 100644
--- a/packages/initscripts/initscripts-opendreambox_1.0.bb
+++ b/packages/initscripts/initscripts-opendreambox_1.0.bb
@@ -5,7 +5,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r10"
+PR = "r11"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"