summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xBoardCommonConfig.mk15
-rw-r--r--bluetooth/vnd_smdk4x12.txt3
-rw-r--r--camera/exynos_camera.c12
-rw-r--r--common.mk32
-rwxr-xr-xconfigs/80cfw10
-rw-r--r--overlay/packages/apps/Camera/res/values/config.xml34
-rw-r--r--rootdir/init.recovery.smdk4x12.rc3
-rwxr-xr-xrootdir/init.smdk4x12.rc2
8 files changed, 59 insertions, 52 deletions
diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk
index e7ae11f..28f76d7 100755
--- a/BoardCommonConfig.mk
+++ b/BoardCommonConfig.mk
@@ -72,9 +72,7 @@ TARGET_USERIMAGES_USE_EXT4 := true
BOARD_HARDWARE_CLASS := hardware/samsung/cmhw
# Graphics
-BOARD_EGL_CFG := device/samsung/smdk4412-common/configs/egl.cfg
-BOARD_EGL_NEEDS_HANDLE_VALUE := true
-USE_OPENGL_RENDERER := true
+USE_OPENGL_RENDERER := false
BOARD_USES_SKIAHWJPEG := true
COMMON_GLOBAL_CFLAGS += -DSEC_HWJPEG_G2D -DFORCE_SCREENSHOT_CPU_PATH -DWORKAROUND_BUG_10194508 -DADD_LEGACY_ACQUIRE_BUFFER_SYMBOL
TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK := true
@@ -95,7 +93,6 @@ BOARD_CAMERA_HAVE_ISO := true
COMMON_GLOBAL_CFLAGS += -DHAVE_ISO
COMMON_GLOBAL_CFLAGS += -DSAMSUNG_CAMERA_HARDWARE
COMMON_GLOBAL_CFLAGS += -DSAMSUNG_DVFS
-BOARD_USES_PROPRIETARY_LIBFIMC := true
BOARD_CAMERA_MSG_MGMT := true
# OMX
@@ -128,12 +125,12 @@ BOARD_HOSTAPD_DRIVER := NL80211
BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd
WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/dhd.ko"
WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/dhd/parameters/firmware_path"
-WIFI_DRIVER_FW_PATH_STA := "/system/etc/wifi/bcmdhd_sta.bin"
-WIFI_DRIVER_FW_PATH_AP := "/system/etc/wifi/bcmdhd_apsta.bin"
-WIFI_DRIVER_FW_PATH_P2P := "/system/etc/wifi/bcmdhd_p2p.bin"
+WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/bcmdhd_sta.bin"
+WIFI_DRIVER_FW_PATH_AP := "/vendor/firmware/bcmdhd_apsta.bin"
+WIFI_DRIVER_FW_PATH_P2P := "/vendor/firmware/bcmdhd_p2p.bin"
WIFI_DRIVER_MODULE_NAME := "dhd"
-WIFI_DRIVER_MODULE_ARG := "firmware_path=/system/etc/wifi/bcmdhd_sta.bin nvram_path=/system/etc/wifi/nvram_net.txt"
-WIFI_DRIVER_MODULE_AP_ARG := "firmware_path=/system/etc/wifi/bcmdhd_apsta.bin nvram_path=/system/etc/wifi/nvram_net.txt"
+WIFI_DRIVER_MODULE_ARG := "firmware_path=/vendor/firmware/bcmdhd_sta.bin nvram_path=/vendor/firmware/nvram_net.txt"
+WIFI_DRIVER_MODULE_AP_ARG := "firmware_path=/vendor/firmware/bcmdhd_apsta.bin nvram_path=/vendor/firmware/nvram_net.txt"
WIFI_BAND := 802_11_ABG
BOARD_HAVE_SAMSUNG_WIFI := true
diff --git a/bluetooth/vnd_smdk4x12.txt b/bluetooth/vnd_smdk4x12.txt
index b680ecb..a301045 100644
--- a/bluetooth/vnd_smdk4x12.txt
+++ b/bluetooth/vnd_smdk4x12.txt
@@ -1,5 +1,6 @@
BLUETOOTH_UART_DEVICE_PORT = "/dev/ttySAC0"
-FW_PATCHFILE_LOCATION = "/system/bin/"
+FW_PATCHFILE_CHIP_NAME = "bcm4334"
+FW_PATCHFILE_LOCATION = "/vendor/firmware/"
LPM_IDLE_TIMEOUT_MULTIPLE = 5
BTVND_DBG = FALSE
BTHW_DBG = TRUE
diff --git a/camera/exynos_camera.c b/camera/exynos_camera.c
index 3021ff5..9f857e1 100644
--- a/camera/exynos_camera.c
+++ b/camera/exynos_camera.c
@@ -86,10 +86,10 @@ struct exynos_camera_preset exynos_camera_presets_smdk4x12[] = {
.vertical_view_angle = 49.3f,
.metering = METERING_CENTER,
.params = {
- .preview_size_values = "960x720,1280x720,1184x666,960x640,704x576,640x480,352x288,320x240",
- .preview_size = "960x720",
+ .preview_size_values = "640x480,352x288,320x240",
+ .preview_size = "640x480",
.preview_format_values = "yuv420sp,yuv420p,rgb565",
- .preview_format = "yuv420sp",
+ .preview_format = "rgb565",
.preview_frame_rate_values = "30,20,15",
.preview_frame_rate = 30,
.preview_fps_range_values = "(15000,15000),(15000,30000),(30000,30000)",
@@ -179,10 +179,10 @@ struct exynos_camera_preset exynos_camera_presets_smdk4x12[] = {
.vertical_view_angle = 52.58f,
.metering = METERING_CENTER,
.params = {
- .preview_size_values = "1280x720,960x720,640x480,320x240,704x704,320x320",
- .preview_size = "960x720",
+ .preview_size_values = "640x480,320x240,704x704,320x320",
+ .preview_size = "640x480",
.preview_format_values = "yuv420sp,yuv420p,rgb565",
- .preview_format = "yuv420sp",
+ .preview_format = "rgb565",
.preview_frame_rate_values = "30,20,15,8",
.preview_frame_rate = 30,
.preview_fps_range_values = "(8000,8000),(15000,15000),(15000,30000),(30000,30000)",
diff --git a/common.mk b/common.mk
index bf22206..2b7d54c 100644
--- a/common.mk
+++ b/common.mk
@@ -31,7 +31,8 @@ PRODUCT_COPY_FILES := \
$(COMMON_PATH)/rootdir/init.smdk4x12.usb.rc:root/init.smdk4x12.usb.rc \
$(COMMON_PATH)/rootdir/init.trace.rc:root/init.trace.rc \
$(COMMON_PATH)/rootdir/ueventd.smdk4x12.rc:root/ueventd.smdk4x12.rc \
- $(COMMON_PATH)/rootdir/ueventd.smdk4x12.rc:recovery/root/ueventd.smdk4x12.rc
+ $(COMMON_PATH)/rootdir/ueventd.smdk4x12.rc:recovery/root/ueventd.smdk4x12.rc \
+ $(COMMON_PATH)/rootdir/init.recovery.smdk4x12.rc:root/init.recovery.smdk4x12.rc
# Audio
PRODUCT_COPY_FILES += \
@@ -39,9 +40,6 @@ PRODUCT_COPY_FILES += \
$(COMMON_PATH)/configs/audio_policy.conf:system/etc/audio_policy.conf \
$(COMMON_PATH)/audio/silence.wav:system/etc/sound/silence.wav
-# Camera FW
-PRODUCT_COPY_FILES += \
- $(COMMON_PATH)/configs/80cfw:system/etc/init.d/80cfw
# Netflix hack
PRODUCT_COPY_FILES += \
@@ -67,9 +65,8 @@ PRODUCT_PACKAGES := \
audio.primary.smdk4x12 \
audio.r_submix.default \
audio.usb.default \
+ Camera \
com.android.future.usb.accessory \
- Gello \
- gralloc.exynos4 \
hwcomposer.exynos4 \
libfimg \
libnetcmdiface \
@@ -78,7 +75,6 @@ PRODUCT_PACKAGES := \
libsync \
lights.exynos4 \
macloader \
- Snap \
tinymix
# MFC API
@@ -110,19 +106,6 @@ PRODUCT_PACKAGES += \
make_ext4fs \
setup_fs
-# Live Wallpapers
-PRODUCT_PACKAGES += \
- Galaxy4 \
- HoloSpiralWallpaper \
- LiveWallpapers \
- LiveWallpapersPicker \
- MagicSmokeWallpapers \
- NoiseField \
- PhaseBeam \
- VisualizationWallpapers \
- librs_jni
-
-
# Wifi
PRODUCT_PACKAGES += \
libwpa_client \
@@ -133,6 +116,7 @@ PRODUCT_PACKAGES += \
# Charger
PRODUCT_PACKAGES += \
+ charger \
charger_res_images
# These are the hardware-specific features
@@ -159,10 +143,6 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
frameworks/native/data/etc/android.software.sip.xml:system/etc/permissions/android.software.sip.xml
-# Feature live wallpaper
-PRODUCT_COPY_FILES += \
- packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml
-
# Keylayouts
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/excluded-input-devices.xml:system/etc/excluded-input-devices.xml
@@ -183,5 +163,5 @@ TARGET_HAL_PATH := hardware/samsung/exynos4/hal
TARGET_OMX_PATH := hardware/samsung/exynos/multimedia/openmax
$(call inherit-product, hardware/samsung/exynos4x12.mk)
-# Include non-opensource parts
-$(call inherit-product, vendor/samsung/smdk4412-common/common-vendor.mk)
+# Include non-opensource parts if available
+$(call inherit-product-if-exists, vendor/samsung/smdk4412-common/common-vendor.mk)
diff --git a/configs/80cfw b/configs/80cfw
deleted file mode 100755
index b6fdc95..0000000
--- a/configs/80cfw
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/system/bin/sh
-#
-# Copy camera firmware to /data/cfw
-#
-
-cp /system/vendor/firmware/SlimISP_*.bin /data/cfw/
-
-chown system /data/cfw/*
-chgrp media /data/cfw/*
-chmod 0775 /data/cfw/*
diff --git a/overlay/packages/apps/Camera/res/values/config.xml b/overlay/packages/apps/Camera/res/values/config.xml
new file mode 100644
index 0000000..255d6ad
--- /dev/null
+++ b/overlay/packages/apps/Camera/res/values/config.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2011, 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.
+*/
+-->
+
+<resources>
+ <!-- Allows setting video size before recording starts -->
+ <bool name="needsEarlyVideoSize">true</bool>
+ <!-- Force use of profile video size -->
+ <bool name="useProfileVideoSize">true</bool>
+ <!-- Samsung Camera Settings -->
+ <bool name="hasSamsungCamSettings">true</bool>
+ <!-- Use ZSL mode -->
+ <bool name="enableZSL">true</bool>
+ <!-- Magic for enabling ZSL on Samsung cameras -->
+ <bool name="sendMagicSamsungZSLCommand">true</bool>
+ <!-- The camera removes the focus modes by default when touch-to-focus
+ exists. Use this option to change that behavior -->
+ <bool name="wantsFocusModes">true</bool>
+</resources>
diff --git a/rootdir/init.recovery.smdk4x12.rc b/rootdir/init.recovery.smdk4x12.rc
new file mode 100644
index 0000000..631307f
--- /dev/null
+++ b/rootdir/init.recovery.smdk4x12.rc
@@ -0,0 +1,3 @@
+on boot
+ # enable touchkey light
+ write /sys/class/sec/sec_touchkey/brightness 1
diff --git a/rootdir/init.smdk4x12.rc b/rootdir/init.smdk4x12.rc
index 9be37d7..ecc91a2 100755
--- a/rootdir/init.smdk4x12.rc
+++ b/rootdir/init.smdk4x12.rc
@@ -164,6 +164,8 @@ on post-fs-data
chown radio system /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_lock
chown radio system /sys/devices/system/cpu/busfreq/curr_freq
chown radio system /sys/module/mali/parameters/mali_dvfs_control
+ chown radio system /sys/devices/platform/s5p-ehci/ehci_power
+ chown radio system /sys/devices/platform/s5p-ohci/ohci_power
chown system radio /sys/bus/platform/devices/s5p-tmu/lot_id
chmod 0660 /sys/power/state
chmod 0660 /sys/power/wake_lock
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 04:44:17 +0000