Merge "snowball: Merge all changes from vendor branch" into linaro_android_4.0.3

4 files changed, 55 insertions, 14 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2e5ab23..c81b765 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -12,7 +12,6 @@ UBOOT_CONFIG := u8500_snowball_config
 TARGET_USE_XLOADER := false
 TARGET_NO_RECOVERY := true
 TARGET_NO_RADIOIMAGE := true
-TARGET_PROVIDES_INIT_RC := true
 BOARD_USES_GENERIC_AUDIO := true
 BOARD_USES_ALSA_AUDIO := false
 HARDWARE_OMX := false
@@ -21,6 +20,12 @@ USE_CAMERA_STUB := true
 BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_BCM := true
 
+WPA_SUPPLICANT_VERSION := VER_0_8_X
+BOARD_WPA_SUPPLICANT_DRIVER := WEXT
+BOARD_WPA_SUPPLICANT_PRIVATE_LIB := private_lib_driver_cmd
+WIFI_DRIVER_MODULE_PATH := /system/modules/cw1200_wlan.ko
+WIFI_DRIVER_MODULE_NAME := cw1200_wlan
+
 TARGET_CPU_ABI := armeabi-v7a
 TARGET_CPU_ABI2 := armeabi
 TARGET_CPU_SMP := true
@@ -37,10 +42,11 @@ BOARD_SYSTEMIMAGE_PARTITION_SIZE := 268435456
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 536870912
 BOARD_FLASH_BLOCK_SIZE := 4096
 
-#TARGET_PROVIDES_INIT_RC := true
 #TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 
 TARGET_USE_GATOR:= true
+TARGET_GATOR_WITH_MALI_SUPPORT := MALI_400
+TARGET_MALI_DRIVER_DIR := drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali
 
 # Snowball uses a Nova A9500 -- Dual-Core Cortex A9
 TARGET_EXTRA_CFLAGS += $(call cc-option,-mtune=cortex-a9,$(call cc-option,-mtune=cortex-a8)) $(call cc-option,-mcpu=cortex-a9,$(call cc-option,-mcpu=cortex-a8))
diff --git a/device.mk b/device.mk
index 8b263d9..45dd99e 100644
--- a/device.mk
+++ b/device.mk
@@ -13,14 +13,18 @@
 # limitations under the License.
 
 PRODUCT_COPY_FILES := \
-    device/linaro/snowball/vold.fstab:system/etc/vold.fstab \
-    device/linaro/snowball/egl.cfg:system/lib/egl/egl.cfg
+        device/linaro/snowball/vold.fstab:system/etc/vold.fstab \
+        device/linaro/snowball/egl.cfg:system/lib/egl/egl.cfg \
+        device/linaro/common/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf
 
 PRODUCT_COPY_FILES += \
-        device/linaro/snowball/init.rc:root/init.rc \
         device/linaro/snowball/init.st-ericssonsnowballplatform.rc:root/init.st-ericssonsnowballplatform.rc \
         device/linaro/snowball/ueventd.st-ericssonsnowballplatform.rc:root/ueventd.st-ericssonsnowballplatform.rc
 
+PRODUCT_COPY_FILES += \
+        frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
+        device/linaro/common/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml
+
 PRODUCT_PACKAGES := \
         make_ext4fs \
         com.android.future.usb.accessory \
@@ -44,6 +48,4 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
         make_ext4fs
 
-PRODUCT_PROPERTY_OVERRIDES += \
-        ro.nohardwaregfx=true
-
+$(call inherit-product, frameworks/base/build/tablet-dalvik-heap.mk)
diff --git a/init.st-ericssonsnowballplatform.rc b/init.st-ericssonsnowballplatform.rc
index 0bf5674..f2158bb 100644
--- a/init.st-ericssonsnowballplatform.rc
+++ b/init.st-ericssonsnowballplatform.rc
@@ -15,7 +15,6 @@ on boot
     # create dhcpcd dir
     mkdir /data/misc/dhcp 0770 dhcp dhcp
     chmod 0770 /data/misc/dhcp
-    chmod 0666 /dev/pvrsrvkm
 
     # switch CPUfreq from performance to hotplug
     #write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor hotplug
@@ -96,14 +95,36 @@ on boot
     chown system system /sys/class/graphics/fb0/overlays
     chown system system /sys/class/graphics/fb0/fit_to_screen
     chown system system /sys/class/graphics/fb1/overlays
-    chmod 0666 /dev/pvrsrvkm
 
-# Initialize the SGX driver
-#service pvrsrvinit /system/bin/pvrsrvinit
-#    user root
-#    oneshot
+    insmod /system/modules/gator.ko
+    insmod /system/modules/mac80211.ko
+    insmod /system/modules/cw1200_core.ko
+    setprop wifi.interface wlan0
+
+service hciattach /system/bin/hciattach -a 23 -n -s 115200 /dev/ttyAMA0 cg2900 115200 flow
+    class main
+    user root
+
+service wpa_supplicant /system/bin/wpa_supplicant -iwlan0 -dd -Dwext
+    socket wpa_wlan0 dgram 660 wifi wifi
+    disabled
+    oneshot
+
+service dhcpcd_wlan0 /system/bin/dhcpcd -dABKL
+    disabled
+    oneshot
+
+service iprenew_wlan0 /system/bin/dhcpcd -n
+    disabled
+    oneshot
 
 service faketsd /system/bin/faketsd
     user bluetooth
     group bluetooth
     oneshot
+
+#userspace daemon needed for gator
+service gatord /system/bin/gatord
+    class main
+    user root
+
diff --git a/ueventd.st-ericssonsnowballplatform.rc b/ueventd.st-ericssonsnowballplatform.rc
index 5f1ccc5..bd6239f 100644
--- a/ueventd.st-ericssonsnowballplatform.rc
+++ b/ueventd.st-ericssonsnowballplatform.rc
@@ -1,3 +1,15 @@
 
 /dev/pvrsrvkm             0666   system     system
 
+# hwmem driver
+/dev/hwmem                0666   media      system
+
+# Mali 3D IP
+/dev/mali                 0666   system     graphics
+
+# B2R2 device
+/dev/b2r2_blt             0666   system     graphics
+
+# overlay device
+/dev/disp0                0666   system     graphics
+