include libtxc_dxn to support S3TC texture compression for mesa

[android-x86/device-generic-common.git] / init.sh

diff --git a/init.sh b/init.sh
index 96b1963..eacf3bb 100644 (file)
--- a/init.sh
+++ b/init.sh
@@ -42,11 +42,8 @@ function init_hal_bluetooth()
        done
 
        case "$PRODUCT" in
-               T10*TA)
-                       modprobe ak8975
-                       modprobe hci-uart
+               T10*TA|HP*Omni*)
                        BTUART_PORT=/dev/ttyS1
-                       brcm_patchram_plus -d --no2bytes --enable_hci --patchram /system/lib/firmware/brcm/bcm43241b4.hcd $BTUART_PORT
                        ;;
                MacBookPro8*)
                        rmmod b43
@@ -64,6 +61,7 @@ function init_hal_bluetooth()
        if [ -n "$BTUART_PORT" ]; then
                set_property hal.bluetooth.uart $BTUART_PORT
                chown bluetooth.bluetooth $BTUART_PORT
+               start btattach:-B$BTUART_PORT
                log -t hciconfig -p i "`hciconfig`"
        fi
 }
@@ -111,24 +109,28 @@ function init_uvesafb()
                        ;;
        esac
 
-       modprobe uvesafb mode_option=${UVESA_MODE:-800x600}-16 ${UVESA_OPTION:-mtrr=3 scroll=redraw}
+       [ "$HWACCEL" = "0" ] && bpp=16 || bpp=32
+       modprobe uvesafb mode_option=${UVESA_MODE:-800x600}-$bpp ${UVESA_OPTION:-mtrr=3 scroll=redraw}
 }
 
 function init_hal_gralloc()
 {
        case "$(cat /proc/fb | head -1)" in
+               *virtiodrmfb)
+                       set_property ro.hardware.hwcomposer drm
+                       ;&
                0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb)
                        set_property ro.hardware.gralloc drm
                        set_drm_mode
-                       [ -n "$DEBUG" ] && set_property debug.egl.trace error
                        ;;
                "")
                        init_uvesafb
                        ;&
                0*)
-                       [ "$HWACCEL" = "1" ] || set_property debug.egl.hw 0
                        ;;
        esac
+
+       [ -n "$DEBUG" ] && set_property debug.egl.trace error
 }
 
 function init_hal_hwcomposer()
@@ -400,18 +402,20 @@ PRODUCT=$(cat $DMIPATH/product_name)
 # import cmdline variables
 for c in `cat /proc/cmdline`; do
        case $c in
-               androidboot.hardware=*)
+               *.*=*)
                        ;;
                *=*)
                        eval $c
-                       case $c in
-                               HWACCEL=*)
-                                       set_property debug.egl.hw $HWACCEL
-                                       ;;
-                               DEBUG=*)
-                                       set_property debug.logcat 1
-                                       ;;
-                       esac
+                       if [ -z "$1" ]; then
+                               case $c in
+                                       HWACCEL=*)
+                                               set_property debug.egl.hw $HWACCEL
+                                               ;;
+                                       DEBUG=*)
+                                               [ -n "$DEBUG" ] && set_property debug.logcat 1
+                                               ;;
+                               esac
+                       fi
                        ;;
        esac
 done