[oe-commits] org.oe.dreambox initscripts-opendreambox: update

[tmbinc commit]

initscripts-opendreambox: update

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 4478e85cdc6daab3a48a35afdad3434069894140
ViewMTN: http://monotone.openembedded.org/revision/info/4478e85cdc6daab3a48a35afdad3434069894140
Files:
1
packages/initscripts/initscripts-1.0/dm800/bootup
packages/initscripts/initscripts-1.0/dm8000/bootup
packages/initscripts/initscripts-opendreambox_1.0.bb
Diffs:

#
# mt diff -r4eddb355e2645b942d27b5f9c5383bb7e24cbb5f -r4478e85cdc6daab3a48a35afdad3434069894140
#
#
#
# patch "packages/initscripts/initscripts-1.0/dm800/bootup"
#  from [fddc3f02ace81c22e9e598230a5fb93c8d37a85a]
#    to [a7f7f4b3d91b9f2ae955839023108c684d629daa]
# 
# patch "packages/initscripts/initscripts-1.0/dm8000/bootup"
#  from [69fb4e0124bc77dd0e8a2a212e59054e29bb1a4b]
#    to [cc0060ecd669e30217d0695238619a6f72f641c8]
# 
# patch "packages/initscripts/initscripts-opendreambox_1.0.bb"
#  from [7c1cb130c4b75b77979a4705f8332346266c21de]
#    to [93ff3f3508cf8c0d3f365140600d62bdd3df464d]
#
============================================================
--- packages/initscripts/initscripts-1.0/dm800/bootup	fddc3f02ace81c22e9e598230a5fb93c8d37a85a
+++ packages/initscripts/initscripts-1.0/dm800/bootup	a7f7f4b3d91b9f2ae955839023108c684d629daa
@@ -1,5 +1,6 @@ echo 10 > /proc/progress
 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 14 > /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 @@ echo 16 > /proc/progress
 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 @@ echo 20 > /proc/progress
 
 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
 
============================================================
--- packages/initscripts/initscripts-1.0/dm8000/bootup	69fb4e0124bc77dd0e8a2a212e59054e29bb1a4b
+++ packages/initscripts/initscripts-1.0/dm8000/bootup	cc0060ecd669e30217d0695238619a6f72f641c8
@@ -31,8 +31,9 @@ echo 17 > /proc/progress
 
 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 @@ done
 	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;
============================================================
--- packages/initscripts/initscripts-opendreambox_1.0.bb	7c1cb130c4b75b77979a4705f8332346266c21de
+++ packages/initscripts/initscripts-opendreambox_1.0.bb	93ff3f3508cf8c0d3f365140600d62bdd3df464d
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 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)}"