X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=init.sh;h=6b41a502188d32432cf00af7117e8eee828f82c4;hb=1c275d15c61b57c919f76bc1e68f090ead277aa3;hp=2ae69af47cb26ed81b07e73e35f7ef0060cfe90d;hpb=8361fc24f4acc5044fafa8bf7723dde4ad0da480;p=android-x86%2Fdevice-generic-common.git

diff --git a/init.sh b/init.sh
index 2ae69af..6b41a50 100644
--- a/init.sh
+++ b/init.sh
@@ -21,6 +21,10 @@ function init_misc()
 
 	# in case no cpu governor driver autoloads
 	[ -d /sys/devices/system/cpu/cpu0/cpufreq ] || modprobe acpi-cpufreq
+
+	# enable sdcardfs if /data is not mounted on tmpfs or 9p
+	mount | grep /data\ | grep -qE 'tmpfs|9p'
+	[ $? -ne 0 ] && modprobe sdcardfs
 }
 
 function init_hal_audio()
@@ -127,20 +131,23 @@ function init_uvesafb()
 			;;
 	esac
 
-	[ "$HWACCEL" = "0" ] && bpp=16 || bpp=32
-	modprobe uvesafb mode_option=${UVESA_MODE:-1024x768}-$bpp ${UVESA_OPTION:-mtrr=3 scroll=redraw}
+	modprobe uvesafb mode_option=${UVESA_MODE:-1024x768}-32 ${UVESA_OPTION:-mtrr=3 scroll=redraw}
 }
 
 function init_hal_gralloc()
 {
 	case "$(cat /proc/fb | head -1)" in
 		*virtiodrmfb)
-			set_property ro.hardware.hwcomposer drm
-			set_property ro.hardware.gralloc gbm
+			if [ "$HWACCEL" != "0" ]; then
+				set_property ro.hardware.hwcomposer drm
+				set_property ro.hardware.gralloc gbm
+			fi
 			;;
 		0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
-			set_property ro.hardware.gralloc drm
-			set_drm_mode
+			if [ "$HWACCEL" != "0" ]; then
+				set_property ro.hardware.gralloc drm
+				set_drm_mode
+			fi
 			;;
 		"")
 			init_uvesafb
@@ -251,7 +258,7 @@ function init_hal_sensors()
 			set_property hal.sensors.iio.accel.matrix 0,1,0,1,0,0,0,0,-1
 			;;
 		*)
-			#has_sensors=false
+			has_sensors=false
 			;;
 	esac
 
@@ -436,9 +443,6 @@ for c in `cat /proc/cmdline`; do
 			eval $c
 			if [ -z "$1" ]; then
 				case $c in
-					HWACCEL=*)
-						set_property debug.egl.hw $HWACCEL
-						;;
 					DEBUG=*)
 						[ -n "$DEBUG" ] && set_property debug.logcat 1
 						;;