android-x86 5.1-rc1 release (20151007)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 81867e3..7faf53b 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -6,13 +6,10 @@ TARGET_BOARD_PLATFORM := android-x86
 
 # Some framework code requires this to enable BT
 BOARD_HAVE_BLUETOOTH := true
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/generic/common/bluetooth
-BLUETOOTH_HCI_USE_USB := true
-BOARD_HAVE_BLUETOOTH_BCM := true
 
 BOARD_USE_LEGACY_UI := true
 
-BOARD_SYSTEMIMAGE_PARTITION_SIZE = $(if $(MKSQUASHFS),0,1073741824)
+BOARD_SYSTEMIMAGE_PARTITION_SIZE = $(if $(MKSQUASHFS),0,1610612736)
 
 # customize the malloced address to be 16-byte aligned
 BOARD_MALLOC_ALIGNMENT := 16
@@ -73,8 +70,7 @@ BOARD_WPA_SUPPLICANT_PRIVATE_LIB ?= private_lib_driver_cmd
 WPA_SUPPLICANT_VERSION ?= VER_2_1_DEVEL
 WIFI_DRIVER_MODULE_PATH ?= auto
 
-#BOARD_GPU_DRIVERS ?= i915 i965 ilo r300g r600g nouveau vmwgfx
-BOARD_GPU_DRIVERS ?= i915 i965 swrast r300g r600g
+BOARD_GPU_DRIVERS ?= i915 i965 nouveau r300g r600g radeonsi swrast
 ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
 TARGET_HARDWARE_3D := true
 BOARD_EGL_CFG ?= device/generic/common/gpu/egl_mesa.cfg

diff --git a/fstab.x86 b/fstab.x86
index 1e85b29..569ea31 100644 (file)
--- a/fstab.x86
+++ b/fstab.x86
@@ -1,6 +1,6 @@
-none   /cache                  tmpfs   nosuid,nodev,noatime    defaults
+none   /cache          tmpfs   nosuid,nodev,noatime    defaults
 
-auto   /storage/usb0   vfat    none    wait,noemulatedsd,voldmanaged=usb0:auto
-auto   /storage/usb1   vfat    none    wait,noemulatedsd,voldmanaged=usb1:auto
-auto   /storage/usb2   vfat    none    wait,noemulatedsd,voldmanaged=usb2:auto
-auto   /storage/usb3   vfat    none    wait,noemulatedsd,voldmanaged=usb3:auto
+auto   /storage/usb0   vfat    defaults        wait,noemulatedsd,voldmanaged=usb0:auto
+auto   /storage/usb1   vfat    defaults        wait,noemulatedsd,voldmanaged=usb1:auto
+auto   /storage/usb2   vfat    defaults        wait,noemulatedsd,voldmanaged=usb2:auto
+auto   /storage/usb3   vfat    defaults        wait,noemulatedsd,voldmanaged=usb3:auto

diff --git a/init.sh b/init.sh
index 8758717..0eb9b72 100644 (file)
--- a/init.sh
+++ b/init.sh
@@ -17,14 +17,6 @@ function init_misc()
 
        # in case no cpu governor driver autoloads
        [ -d /sys/devices/system/cpu/cpu0/cpufreq ] || modprobe acpi-cpufreq
-
-       case "$PRODUCT" in
-               T10*TA)
-                       modprobe ak8975
-                       ;;
-               *)
-                       ;;
-       esac
 }
 
 function init_hal_audio()
@@ -45,11 +37,31 @@ function init_hal_bluetooth()
                [ "$type" = "wlan" -o "$type" = "bluetooth" ] && echo 1 > $r/state
        done
 
-       # these modules are incompatible with bluedroid
-       rmmod ath3k
-       rmmod btusb
-       rmmod bluetooth
-       set_property ro.rfkilldisabled 1
+       case "$PRODUCT" in
+               T10*TA)
+                       modprobe ak8975
+                       modprobe hci-uart
+                       BTUART_PORT=/dev/ttyS1
+                       brcm_patchram_plus -d --no2bytes --enable_hci --patchram /system/lib/firmware/brcm/bcm43241b4.hcd $BTUART_PORT
+                       ;;
+               MacBookPro8*)
+                       rmmod b43
+                       modprobe b43 btcoex=0
+                       modprobe btusb
+                       ;;
+               *)
+                       for bt in $(lsusb -v | awk ' /Class:.E0/ { print $9 } '); do
+                               chown 1002.1002 $bt && chmod 660 $bt
+                       done
+                       modprobe btusb
+                       ;;
+       esac
+
+       if [ -n "$BTUART_PORT" ]; then
+               set_property hal.bluetooth.uart $BTUART_PORT
+               chown bluetooth.bluetooth $BTUART_PORT
+               log -t hciconfig -p i "`hciconfig`"
+       fi
 }
 
 function init_hal_camera()
@@ -101,12 +113,10 @@ function init_uvesafb()
 function init_hal_gralloc()
 {
        case "$(cat /proc/fb | head -1)" in
-               0*inteldrmfb|0*radeondrmfb)
+               0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb)
                        set_property ro.hardware.gralloc drm
                        set_drm_mode
                        ;;
-               0*svgadrmfb)
-                       ;;
                "")
                        init_uvesafb
                        ;&
@@ -205,12 +215,11 @@ function init_hal_sensors()
                        ;;
        esac
 
-       # has sensor-hub?
-       for i in /sys/bus/iio/devices/iio:device?; do
-               busybox chown -R 1000.1000 /sys/bus/iio/devices/iio:device?/
+       # has iio sensor-hub?
+       if [ -n "`ls /sys/bus/iio/devices/iio:device* 2> /dev/null`" ]; then
+               busybox chown -R 1000.1000 /sys/bus/iio/devices/iio:device*/
                lsmod | grep -q hid_sensor_accel_3d && hal_sensors=hsb || hal_sensors=iio
-               break
-       done
+       fi
 
        set_property ro.hardware.sensors $hal_sensors
 }
@@ -308,10 +317,6 @@ function do_bootcomplete()
 
        lsmod | grep -e brcmfmac && setprop wlan.no-unload-driver 1
 
-       for bt in $(lsusb -v | awk ' /Class:.E0/ { print $9 } '); do
-               chown 1002.1002 $bt && chmod 660 $bt
-       done
-
        case "$PRODUCT" in
                1866???|1867???|1869???) # ThinkPad X41 Tablet
                        start tablet-mode
@@ -369,7 +374,17 @@ function do_bootcomplete()
        done
 }
 
-PATH=/system/bin:/system/xbin
+function do_hci()
+{
+       local hci=`hciconfig | grep ^hci | cut -d: -f1`
+       local btd="`getprop init.svc.bluetoothd`"
+       log -t bluetoothd -p i "$btd ($hci)"
+       if [ -n "`getprop hal.bluetooth.uart`" ]; then
+               [ "`getprop init.svc.bluetoothd`" = "running" ] && hciconfig $hci up
+       fi
+}
+
+PATH=/sbin:/system/bin:/system/xbin
 
 DMIPATH=/sys/class/dmi/id
 BOARD=$(cat $DMIPATH/board_name)
@@ -399,6 +414,9 @@ case "$1" in
        bootcomplete)
                do_bootcomplete
                ;;
+       hci)
+               do_hci
+               ;;
        init|"")
                do_init
                ;;

diff --git a/init.x86.rc b/init.x86.rc
index 93172fe..02af66f 100644 (file)
--- a/init.x86.rc
+++ b/init.x86.rc
@@ -1,3 +1,4 @@
+import /init.bluetooth.rc
 import /init.superuser.rc
 
 on early-init
@@ -8,7 +9,7 @@ on early-init
     write /sys/module/xt_qtaguid/parameters/ctrl_write_limited N
 
     export force_s3tc_enable true
-#   export EGL_LOG_LEVEL info
+    export EGL_LOG_LEVEL info
 #   export EGL_DRIVERS egl_dri2
 
 on init
@@ -86,7 +87,6 @@ on boot
     setprop sys.media.vdec.drop 0
 
 service wpa_supplicant /system/bin/wpa_supplicant -c/data/misc/wifi/wpa_supplicant.conf \
-    -ddddd \
     -iwlan0 -Dnl80211 \
     -O/data/misc/wifi/sockets \
     -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
@@ -173,6 +173,12 @@ on property:sys.boot_completed=1
     write /proc/sys/kernel/ctrl-alt-del 0
     exec /system/bin/logwrapper /system/bin/sh /system/etc/init.sh bootcomplete
 
+on property:init.svc.bluetoothd=running
+    exec /system/bin/logwrapper /system/bin/sh /system/etc/init.sh hci
+
+on property:init.svc.bluetoothd=stopped
+    exec /system/bin/logwrapper /system/bin/sh /system/etc/init.sh hci
+
 on property:net.dns1=*
     exec /system/bin/logwrapper /system/bin/sh /system/etc/init.sh netconsole
 

diff --git a/modules.blacklist b/modules.blacklist
index 6e9f9e2..a8b8885 100644 (file)
--- a/modules.blacklist
+++ b/modules.blacklist
@@ -1,3 +1 @@
 blacklist evbug
-blacklist btusb
-blacklist bluetooth

diff --git a/packages.mk b/packages.mk
index 934f235..dc06b59 100644 (file)
--- a/packages.mk
+++ b/packages.mk
@@ -22,6 +22,7 @@ PRODUCT_PACKAGES := \
     Galaxy4 \
     GlobalTime \
     HoloSpiralWallpaper \
+    Launcher3 \
     LiveWallpapers \
     LiveWallpapersPicker \
     MagicSmokeWallpapers \
@@ -41,6 +42,7 @@ PRODUCT_PACKAGES := \
     hwcomposer.x86 \
     icu.dat \
     io_switch \
+    libGLES_android \
     libhuaweigeneric-ril \
     lights.default \
     make_ext4fs \
@@ -77,4 +79,3 @@ PRODUCT_PACKAGES += \
     CMFileManager \
     Superuser \
     TSCalibration2 \
-    Trebuchet \