espresso-common: switch to omap4-next

Change-Id: I1eef0eace20f872ba171aeb9df7ddb6ec50ce04f

4 files changed, 22 insertions, 595 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 679014d..03ac056 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -14,10 +14,8 @@
 # limitations under the License.
 #
 
-# This variable is set first, so it can be overridden
-# by BoardConfigVendor.mk
-
--include device/samsung/omap4-common/BoardConfigCommon.mk
+# Inherit common omap4 board config
+-include hardware/ti/omap4/BoardConfigCommon.mk
 
 TARGET_SPECIFIC_HEADER_PATH += device/samsung/espresso-common/include
 
@@ -36,6 +34,16 @@ BOARD_KERNEL_BASE := 0x40000000
 # Use dlmalloc
 MALLOC_IMPL := dlmalloc
 
+# External SGX Module
+SGX_MODULES:
+	make clean -C $(HARDWARE_TI_OMAP4_BASE)/pvr-source/eurasiacon/build/linux2/omap4430_android
+	cp $(TARGET_KERNEL_SOURCE)/drivers/video/omap2/omapfb/omapfb.h $(KERNEL_OUT)/drivers/video/omap2/omapfb/omapfb.h
+	make -j8 -C $(HARDWARE_TI_OMAP4_BASE)/pvr-source/eurasiacon/build/linux2/omap4430_android ARCH=arm KERNEL_CROSS_COMPILE=arm-eabi- CROSS_COMPILE=arm-eabi- KERNELDIR=$(KERNEL_OUT) TARGET_PRODUCT="blaze_tablet" BUILD=release TARGET_SGX=540 PLATFORM_VERSION=4.0
+	mv $(KERNEL_OUT)/../../target/kbuild/pvrsrvkm_sgx540_120.ko $(KERNEL_MODULES_OUT)
+	$(ARM_EABI_TOOLCHAIN)/arm-eabi-strip --strip-unneeded $(KERNEL_MODULES_OUT)/pvrsrvkm_sgx540_120.ko
+
+TARGET_KERNEL_MODULES += SGX_MODULES
+
 # Init
 TARGET_PROVIDES_INIT := true
 TARGET_PROVIDES_INIT_TARGET_RC := true
diff --git a/camerawrapper/Android.mk b/camerawrapper/Android.mk
deleted file mode 100644
index 9b4e0db..0000000
--- a/camerawrapper/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    CameraWrapper.cpp
-
-LOCAL_SHARED_LIBRARIES := \
-    libhardware liblog libcamera_client libutils
-
-LOCAL_C_INCLUDES += \
-    system/core/include \
-    system/media/camera/include
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
-LOCAL_MODULE := camera.$(TARGET_BOOTLOADER_BOARD_NAME)
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
-#include $(BUILD_HEAPTRACKED_SHARED_LIBRARY)
diff --git a/camerawrapper/CameraWrapper.cpp b/camerawrapper/CameraWrapper.cpp
deleted file mode 100644
index 7a13301..0000000
--- a/camerawrapper/CameraWrapper.cpp
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
- * Copyright (C) 2012, The CyanogenMod Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
-* @file CameraWrapper.cpp
-*
-* This file wraps a vendor camera module.
-*
-*/
-
-
-#define LOG_NDEBUG 0
-//#define LOG_PARAMETERS
-
-#define LOG_TAG "CameraWrapper"
-#include <cutils/log.h>
-
-#include <utils/threads.h>
-#include <utils/String8.h>
-#include <hardware/hardware.h>
-#include <hardware/camera.h>
-#include <camera/Camera.h>
-#include <camera/CameraParameters.h>
-
-static android::Mutex gCameraWrapperLock;
-static camera_module_t *gVendorModule = 0;
-
-static int camera_device_open(const hw_module_t* module, const char* name,
-                hw_device_t** device);
-static int camera_device_close(hw_device_t* device);
-static int camera_get_number_of_cameras(void);
-static int camera_get_camera_info(int camera_id, struct camera_info *info);
-
-static struct hw_module_methods_t camera_module_methods = {
-        .open = camera_device_open,
-};
-
-camera_module_t HAL_MODULE_INFO_SYM = {
-    .common = {
-         .tag = HARDWARE_MODULE_TAG,
-         .module_api_version = CAMERA_MODULE_API_VERSION_1_0,
-         .hal_api_version = HARDWARE_HAL_API_VERSION,
-         .id = CAMERA_HARDWARE_MODULE_ID,
-         .name = "Espresso Camera Wrapper",
-         .author = "The CyanogenMod Project",
-         .methods = &camera_module_methods,
-         .dso = NULL, /* remove compilation warnings */
-         .reserved = {0}, /* remove compilation warnings */
-    },
-    .get_number_of_cameras = camera_get_number_of_cameras,
-    .get_camera_info = camera_get_camera_info,
-    .set_callbacks = NULL, /* remove compilation warnings */
-    .get_vendor_tag_ops = NULL, /* remove compilation warnings */
-    .open_legacy = NULL, /* remove compilation warnings */
-    .reserved = {0}, /* remove compilation warnings */
-};
-
-typedef struct wrapper_camera_device {
-    camera_device_t base;
-    int id;
-    camera_device_t *vendor;
-} wrapper_camera_device_t;
-
-#define VENDOR_CALL(device, func, ...) ({ \
-    wrapper_camera_device_t *__wrapper_dev = (wrapper_camera_device_t*) device; \
-    __wrapper_dev->vendor->ops->func(__wrapper_dev->vendor, ##__VA_ARGS__); \
-})
-
-#define CAMERA_ID(device) (((wrapper_camera_device_t *)(device))->id)
-
-static int check_vendor_module()
-{
-    int rv = 0;
-    ALOGV("%s", __FUNCTION__);
-
-    if(gVendorModule)
-        return 0;
-
-    rv = hw_get_module_by_class("camera", "vendor", (const hw_module_t **)&gVendorModule);
-    if (rv)
-        ALOGE("failed to open vendor camera module");
-    return rv;
-}
-
-static char * camera_fixup_getparams(int id, const char * settings)
-{
-    android::CameraParameters params;
-    params.unflatten(android::String8(settings));
-
-    // fix params here
-    //params.set(android::CameraParameters::KEY_MIN_EXPOSURE_COMPENSATION, "-3");
-    //params.set(android::CameraParameters::KEY_MAX_EXPOSURE_COMPENSATION, "3");
-
-    android::String8 strParams = params.flatten();
-    char *ret = strdup(strParams.string());
-
-    ALOGD("%s: get parameters fixed up", __FUNCTION__);
-    return ret;
-}
-
-char * camera_fixup_setparams(int id, const char * settings)
-{
-    android::CameraParameters params;
-    params.unflatten(android::String8(settings));
-
-    // fix params here
-
-    android::String8 strParams = params.flatten();
-    char *ret = strdup(strParams.string());
-
-    ALOGD("%s: set parameters fixed up", __FUNCTION__);
-    return ret;
-}
-
-/*******************************************************************
- * implementation of camera_device_ops functions
- *******************************************************************/
-
-int camera_set_preview_window(struct camera_device * device,
-        struct preview_stream_ops *window)
-{
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device || !window)
-        return -EINVAL;
-
-    return VENDOR_CALL(device, set_preview_window, window);
-}
-
-void camera_set_callbacks(struct camera_device * device,
-        camera_notify_callback notify_cb,
-        camera_data_callback data_cb,
-        camera_data_timestamp_callback data_cb_timestamp,
-        camera_request_memory get_memory,
-        void *user)
-{
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-    ALOGV("%s", __FUNCTION__);
-
-    if(!device)
-        return;
-
-    VENDOR_CALL(device, set_callbacks, notify_cb, data_cb, data_cb_timestamp, get_memory, user);
-}
-
-void camera_enable_msg_type(struct camera_device * device, int32_t msg_type)
-{
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-    ALOGV("%s", __FUNCTION__);
-
-    if(!device)
-        return;
-
-    VENDOR_CALL(device, enable_msg_type, msg_type);
-}
-
-void camera_disable_msg_type(struct camera_device * device, int32_t msg_type)
-{
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-    ALOGV("%s", __FUNCTION__);
-
-    if(!device)
-        return;
-
-    VENDOR_CALL(device, disable_msg_type, msg_type);
-}
-
-int camera_msg_type_enabled(struct camera_device * device, int32_t msg_type)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return 0;
-
-    return VENDOR_CALL(device, msg_type_enabled, msg_type);
-}
-
-int camera_start_preview(struct camera_device * device)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return -EINVAL;
-
-    return VENDOR_CALL(device, start_preview);
-}
-
-void camera_stop_preview(struct camera_device * device)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return;
-
-    VENDOR_CALL(device, stop_preview);
-}
-
-int camera_preview_enabled(struct camera_device * device)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return -EINVAL;
-
-    return VENDOR_CALL(device, preview_enabled);
-}
-
-int camera_store_meta_data_in_buffers(struct camera_device * device, int enable)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return -EINVAL;
-
-    return VENDOR_CALL(device, store_meta_data_in_buffers, enable);
-}
-
-int camera_start_recording(struct camera_device * device)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return EINVAL;
-
-    return VENDOR_CALL(device, start_recording);
-}
-
-void camera_stop_recording(struct camera_device * device)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return;
-
-
-    VENDOR_CALL(device, stop_recording);
-}
-
-int camera_recording_enabled(struct camera_device * device)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return -EINVAL;
-
-    return VENDOR_CALL(device, recording_enabled);
-}
-
-void camera_release_recording_frame(struct camera_device * device,
-                const void *opaque)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return;
-
-    VENDOR_CALL(device, release_recording_frame, opaque);
-}
-
-int camera_auto_focus(struct camera_device * device)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return -EINVAL;
-
-
-    return VENDOR_CALL(device, auto_focus);
-}
-
-int camera_cancel_auto_focus(struct camera_device * device)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return -EINVAL;
-
-    return VENDOR_CALL(device, cancel_auto_focus);
-}
-
-int camera_take_picture(struct camera_device * device)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return -EINVAL;
-
-    return VENDOR_CALL(device, take_picture);
-}
-
-int camera_cancel_picture(struct camera_device * device)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return -EINVAL;
-
-    return VENDOR_CALL(device, cancel_picture);
-}
-
-int camera_set_parameters(struct camera_device * device, const char *params)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return -EINVAL;
-
-    char *tmp = NULL;
-    tmp = camera_fixup_setparams(CAMERA_ID(device), params);
-
-#ifdef LOG_PARAMETERS
-    __android_log_write(ANDROID_LOG_VERBOSE, LOG_TAG, tmp);
-#endif
-
-    int ret = VENDOR_CALL(device, set_parameters, tmp);
-    return ret;
-}
-
-char* camera_get_parameters(struct camera_device * device)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return NULL;
-
-    char* params = VENDOR_CALL(device, get_parameters);
-
-#ifdef LOG_PARAMETERS
-    __android_log_write(ANDROID_LOG_VERBOSE, LOG_TAG, params);
-#endif
-
-    char * tmp = camera_fixup_getparams(CAMERA_ID(device), params);
-    VENDOR_CALL(device, put_parameters, params);
-    params = tmp;
-
-#ifdef LOG_PARAMETERS
-    __android_log_write(ANDROID_LOG_VERBOSE, LOG_TAG, params);
-#endif
-
-    return params;
-}
-
-static void camera_put_parameters(struct camera_device *device, char *params)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(params)
-        free(params);
-}
-
-int camera_send_command(struct camera_device * device,
-            int32_t cmd, int32_t arg1, int32_t arg2)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return -EINVAL;
-
-    return VENDOR_CALL(device, send_command, cmd, arg1, arg2);
-}
-
-void camera_release(struct camera_device * device)
-{
-    ALOGV("%s", __FUNCTION__);
-    ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera_device_t*)device)->vendor));
-
-    if(!device)
-        return;
-
-    VENDOR_CALL(device, release);
-}
-
-int camera_dump(struct camera_device * device, int fd)
-{
-    if(!device)
-        return -EINVAL;
-
-    return VENDOR_CALL(device, dump, fd);
-}
-
-extern "C" void heaptracker_free_leaked_memory(void);
-
-int camera_device_close(hw_device_t* device)
-{
-    int ret = 0;
-    wrapper_camera_device_t *wrapper_dev = NULL;
-
-    ALOGV("%s", __FUNCTION__);
-
-    android::Mutex::Autolock lock(gCameraWrapperLock);
-
-    if (!device) {
-        ret = -EINVAL;
-        goto done;
-    }
-
-    wrapper_dev = (wrapper_camera_device_t*) device;
-
-    wrapper_dev->vendor->common.close((hw_device_t*)wrapper_dev->vendor);
-    if (wrapper_dev->base.ops)
-        free(wrapper_dev->base.ops);
-    free(wrapper_dev);
-done:
-#ifdef HEAPTRACKER
-    heaptracker_free_leaked_memory();
-#endif
-    return ret;
-}
-
-/*******************************************************************
- * implementation of camera_module functions
- *******************************************************************/
-
-/* open device handle to one of the cameras
- *
- * assume camera service will keep singleton of each camera
- * so this function will always only be called once per camera instance
- */
-
-int camera_device_open(const hw_module_t* module, const char* name,
-                hw_device_t** device)
-{
-    int rv = 0;
-    int num_cameras = 0;
-    int cameraid;
-    wrapper_camera_device_t* camera_device = NULL;
-    camera_device_ops_t* camera_ops = NULL;
-
-    android::Mutex::Autolock lock(gCameraWrapperLock);
-
-    ALOGV("camera_device open");
-
-    if (name != NULL) {
-        if (check_vendor_module())
-            return -EINVAL;
-
-        cameraid = atoi(name);
-        num_cameras = gVendorModule->get_number_of_cameras();
-
-        if(cameraid > num_cameras)
-        {
-            ALOGE("camera service provided cameraid out of bounds, "
-                    "cameraid = %d, num supported = %d",
-                    cameraid, num_cameras);
-            rv = -EINVAL;
-            goto fail;
-        }
-
-        camera_device = (wrapper_camera_device_t*)malloc(sizeof(*camera_device));
-        if(!camera_device)
-        {
-            ALOGE("camera_device allocation fail");
-            rv = -ENOMEM;
-            goto fail;
-        }
-        memset(camera_device, 0, sizeof(*camera_device));
-        camera_device->id = cameraid;
-
-        if(rv = gVendorModule->common.methods->open((const hw_module_t*)gVendorModule, name, (hw_device_t**)&(camera_device->vendor)))
-        {
-            ALOGE("vendor camera open fail");
-            goto fail;
-        }
-        ALOGV("%s: got vendor camera device 0x%08X", __FUNCTION__, (uintptr_t)(camera_device->vendor));
-
-        camera_ops = (camera_device_ops_t*)malloc(sizeof(*camera_ops));
-        if(!camera_ops)
-        {
-            ALOGE("camera_ops allocation fail");
-            rv = -ENOMEM;
-            goto fail;
-        }
-
-        memset(camera_ops, 0, sizeof(*camera_ops));
-
-        camera_device->base.common.tag = HARDWARE_DEVICE_TAG;
-        camera_device->base.common.version = CAMERA_DEVICE_API_VERSION_1_0;
-        camera_device->base.common.module = (hw_module_t *)(module);
-        camera_device->base.common.close = camera_device_close;
-        camera_device->base.ops = camera_ops;
-
-        camera_ops->set_preview_window = camera_set_preview_window;
-        camera_ops->set_callbacks = camera_set_callbacks;
-        camera_ops->enable_msg_type = camera_enable_msg_type;
-        camera_ops->disable_msg_type = camera_disable_msg_type;
-        camera_ops->msg_type_enabled = camera_msg_type_enabled;
-        camera_ops->start_preview = camera_start_preview;
-        camera_ops->stop_preview = camera_stop_preview;
-        camera_ops->preview_enabled = camera_preview_enabled;
-        camera_ops->store_meta_data_in_buffers = camera_store_meta_data_in_buffers;
-        camera_ops->start_recording = camera_start_recording;
-        camera_ops->stop_recording = camera_stop_recording;
-        camera_ops->recording_enabled = camera_recording_enabled;
-        camera_ops->release_recording_frame = camera_release_recording_frame;
-        camera_ops->auto_focus = camera_auto_focus;
-        camera_ops->cancel_auto_focus = camera_cancel_auto_focus;
-        camera_ops->take_picture = camera_take_picture;
-        camera_ops->cancel_picture = camera_cancel_picture;
-        camera_ops->set_parameters = camera_set_parameters;
-        camera_ops->get_parameters = camera_get_parameters;
-        camera_ops->put_parameters = camera_put_parameters;
-        camera_ops->send_command = camera_send_command;
-        camera_ops->release = camera_release;
-        camera_ops->dump = camera_dump;
-
-        *device = &camera_device->base.common;
-    }
-
-    return rv;
-
-fail:
-    if(camera_device) {
-        free(camera_device);
-        camera_device = NULL;
-    }
-    if(camera_ops) {
-        free(camera_ops);
-        camera_ops = NULL;
-    }
-    *device = NULL;
-    return rv;
-}
-
-int camera_get_number_of_cameras(void)
-{
-    ALOGV("%s", __FUNCTION__);
-    if (check_vendor_module())
-        return 0;
-    return gVendorModule->get_number_of_cameras();
-}
-
-int camera_get_camera_info(int camera_id, struct camera_info *info)
-{
-    ALOGV("%s", __FUNCTION__);
-    if (check_vendor_module())
-        return 0;
-    return gVendorModule->get_camera_info(camera_id, info);
-}
diff --git a/espresso-common.mk b/espresso-common.mk
index d4c7a3f..792c34d 100644
--- a/espresso-common.mk
+++ b/espresso-common.mk
@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-# Include omap4 common makefile
-$(call inherit-product, device/samsung/omap4-common/common.mk)
+# Include common omap4 makefile
+$(call inherit-product, hardware/ti/omap4/omap4.mk)
 
 DEVICE_PACKAGE_OVERLAYS += device/samsung/espresso-common/overlay/aosp-common
 
@@ -61,7 +61,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     audio.primary.piranha \
     audio.r_submix.default \
-    camera.piranha \
+    camera.omap4 \
     lights.piranha \
     libinvensense_mpl \
     power.piranha \
@@ -81,6 +81,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.sys.isUsbOtgEnabled=true
 
+# Set default USB interface
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+    persist.sys.usb.config=mtp
+
 # Charger
 PRODUCT_PACKAGES += \
     charger \
@@ -127,9 +131,11 @@ PRODUCT_COPY_FILES += \
     packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml
 
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.opengles.version=131072
+    ro.opengles.version=131072 \
+    ro.bq.gpu_to_cpu_unsupported=1
 
 PRODUCT_TAGS += dalvik.gc.type-precise
 
+$(call inherit-product-if-exists, vendor/samsung/omap4-common/common-vendor.mk)
 $(call inherit-product, frameworks/native/build/tablet-dalvik-heap.mk)
 $(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/device-bcm.mk)