Commit f07f35d1 authored by sub77's avatar sub77

matissewifi: s3ve3g -> matissewifi

Change-Id: I730297605bed893661bbe9395120509e012543ad
parent 73dfd96d
......@@ -14,7 +14,7 @@
LOCAL_PATH := $(call my-dir)
ifeq ($(TARGET_DEVICE),s3ve3g)
ifeq ($(TARGET_DEVICE),matissewifi)
include $(call all-makefiles-under,$(LOCAL_PATH))
......
......@@ -13,4 +13,4 @@
# limitations under the License.
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/full_s3ve3g.mk
$(LOCAL_DIR)/full_matissewifi.mk
......@@ -15,9 +15,9 @@
# Inherit from msm8226-common
-include device/samsung/msm8226-common/BoardConfigCommon.mk
TARGET_OTA_ASSERT_DEVICE := s3ve3g,s3ve3gds,s3ve3gjv
TARGET_OTA_ASSERT_DEVICE := matissewifi,matissewifiue,matissewifixx
DEVICE_PATH := device/samsung/s3ve3g
DEVICE_PATH := device/samsung/matissewifi
# Audio
#AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true
......@@ -27,7 +27,7 @@ DEVICE_PATH := device/samsung/s3ve3g
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
# Init
TARGET_LIBINIT_DEFINES_FILE := $(DEVICE_PATH)/init/init_s3ve3g.cpp
TARGET_LIBINIT_DEFINES_FILE := $(DEVICE_PATH)/init/init_matissewifi.cpp
TARGET_UNIFIED_DEVICE := true
# Kernel
......@@ -37,8 +37,8 @@ BOARD_KERNEL_CMDLINE := console=null androidboot.console=null androidboot.hardwa
BOARD_KERNEL_PAGESIZE := 2048
BOARD_KERNEL_SEPARATED_DT := true
BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x02000000 --tags_offset 0x1e00000
TARGET_KERNEL_SOURCE := kernel/samsung/s3ve3g
TARGET_KERNEL_CONFIG := cyanogenmod_s3ve3g_defconfig
TARGET_KERNEL_SOURCE := kernel/samsung/matissewifi
TARGET_KERNEL_CONFIG := cyanogenmod_matissewifi_defconfig
# Lights
TARGET_PROVIDES_LIBLIGHT := true
......@@ -47,7 +47,7 @@ TARGET_PROVIDES_LIBLIGHT := true
BOARD_FLASH_BLOCK_SIZE := 131072
BOARD_BOOTIMAGE_PARTITION_SIZE := 0x00A00000
BOARD_CACHEIMAGE_PARTITION_SIZE := 721420288
BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x00A7DEA0
BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x01A7DEA0
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2097152000
BOARD_USERDATAIMAGE_PARTITION_SIZE := 12562627584
TARGET_USERIMAGES_USE_F2FS := true
......
<?xml version="1.0" encoding="ISO-8859-1"?>
<mixer>
<!-- GT-I9301I_EUR_XX (s3ve3g) ======================================= -->
<!-- GT-I9301I_EUR_XX (matissewifi) ======================================= -->
<!-- These are the initial mixer settings -->
<!-- reset RX part -->
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
......
[
{
"repository": "android_external_sony_boringssl-compat",
"target_path": "external/sony/boringssl-compat"
},
{
"repository": "android_device_samsung_msm8226-common",
"target_path": "device/samsung/msm8226-common"
},
{
"repository": "android_kernel_samsung_matissewifi",
"target_path": "kernel/samsung/matissewifi"
}
]
......@@ -16,8 +16,8 @@
$(call inherit-product, vendor/cm/config/common_full_phone.mk)
# Inherit device configuration
$(call inherit-product, device/samsung/s3ve3g/full_s3ve3g.mk)
$(call inherit-product, device/samsung/matissewifi/full_matissewifi.mk)
# Release name
PRODUCT_RELEASE_NAME := GT-I9301I
PRODUCT_NAME := cm_s3ve3g
PRODUCT_NAME := cm_matissewifi
......@@ -16,7 +16,7 @@
DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
# Proprietary files
$(call inherit-product, vendor/samsung/s3ve3g/s3ve3g-vendor.mk)
$(call inherit-product, vendor/samsung/matissewifi/matissewifi-vendor.mk)
# Audio configuration
PRODUCT_COPY_FILES += \
......
......@@ -2,7 +2,7 @@
set -e
export DEVICE=s3ve3g
export DEVICE=matissewifi
export VENDOR=samsung
function extract() {
......
......@@ -15,12 +15,12 @@
# Inherit from those products. Most specific first.
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
# Inherit from s3ve3g device
$(call inherit-product, device/samsung/s3ve3g/device.mk)
# Inherit from matissewifi device
$(call inherit-product, device/samsung/matissewifi/device.mk)
# Device identifier. This must come after all inclusions
PRODUCT_DEVICE := s3ve3g
PRODUCT_NAME := full_s3ve3g
PRODUCT_DEVICE := matissewifi
PRODUCT_NAME := full_matissewifi
PRODUCT_BRAND := samsung
PRODUCT_MODEL := GT-I9301I
PRODUCT_MANUFACTURER := samsung
......@@ -54,27 +54,26 @@ void init_msm_properties(unsigned long msm_id, unsigned long msm_ver, char *boar
property_get("ro.bootloader", bootloader);
if (strstr(bootloader, "I9301I")) {
/* s3ve3g */
property_set("ro.build.fingerprint", "samsung/s3ve3gxx/s3ve3g:4.4.2/KOT49H/I9301IXXUANL1:user/release-keys");
property_set("ro.build.description", "s3ve3gxx-user 4.4.2 KOT49H I9301IXXUANL1 release-keys");
property_set("ro.product.model", "GT-I9301I");
property_set("ro.product.device", "s3ve3g");
} else if (strstr(bootloader, "I9301Q")) {
/* s3ve3gjv */
property_set("ro.build.fingerprint", "samsung/s3ve3gjv/s3ve3g:4.4.2/KOT49H/I9301QXXUANH1:user/release-keys");
property_set("ro.build.description", "s3ve3gjv-user 4.4.2 KOT49H I9301QXXUANH1 release-keys");
property_set("ro.product.model", "GT-I9301Q");
property_set("ro.product.device", "s3ve3gjv");
} else if (strstr(bootloader, "I9300I")) {
/* s3ve3gds */
property_set("ro.build.fingerprint", "samsung/s3ve3gdsxx/s3ve3gds:4.4.4/KTU84P/I9300IXWUBNJ1:user/release-keys");
property_set("ro.build.description", "s3ve3gdsxx-user 4.4.4 KTU84P I9300IXWUBNJ1 release-keys");
property_set("ro.product.model", "GT-I9300I");
property_set("ro.product.device", "s3ve3gds");
property_set("ro.multisim.set_audio_params", "true");
property_set("ro.multisim.simslotcount", "2");
property_set("persist.radio.multisim.config", "dsds");
if (strstr(bootloader, "T530")) {
property_set("ro.build.fingerprint", "samsung/matissewifixx/matissewifi:5.0.2/LRX22G/T530XXU1BOD8:user/release-keys");
property_set("ro.build.description", "matissewifixx-user 5.0.2 LRX22G T530XXU1BOD8 release-keys");
property_set("ro.product.model", "SM-T530");
property_set("ro.product.device", "matissewifi");
property_set("ro.radio.noril", "1");
} else if (strstr(bootloader, "T531")) {
property_set("ro.build.fingerprint", "samsung/matisse3gxx/matisse3g:5.0.2/LRX22G/T531XXU1BOD8:user/release-keys");
property_set("ro.build.description", "matisse3gxx-user 5.0.2 LRX22G T531XXU1BOD8 release-keys");
property_set("ro.product.model", "SM-T531");
property_set("ro.product.device", "matisse3g");
property_set("telephony.lteOnGsmDevice", "0");
property_set("ro.telephony.default_network", "0");
} else if (strstr(bootloader, "T535")) {
property_set("ro.build.fingerprint", "samsung/matisseltexx/matisselte:5.0.2/LRX22G/T535XXU1BOD8:user/release-keys");
property_set("ro.build.description", "matisseltexx-user 5.0.2 LRX22G T535XXU1BOD8 release-keys");
property_set("ro.product.model", "SM-T535");
property_set("ro.product.device", "matisselte");
property_set("telephony.lteOnGsmDevice", "0");
property_set("ro.telephony.default_network", "0");
}
property_get("ro.product.device", device);
......
......@@ -8,7 +8,7 @@ LOCAL_PATH := $(call my-dir)
KERNEL_CONFIG := $(KERNEL_OUT)/.config
MSM8226_DTS_NAMES := msm8226
MSM8226_DTS_FILES = $(wildcard $(TOP)/$(TARGET_KERNEL_SOURCE)/arch/arm/boot/dts/msm8226-sec-s3ve3geur*.dts)
MSM8226_DTS_FILES = $(wildcard $(TOP)/$(TARGET_KERNEL_SOURCE)/arch/arm/boot/dts/msm8226-sec-matissewifieur*.dts)
MSM8226_DTS_FILE = $(lastword $(subst /, ,$(1)))
DTB_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%.dtb,$(call MSM8226_DTS_FILE,$(1))))
ZIMG_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%-zImage,$(call MSM8226_DTS_FILE,$(1))))
......
From 78a444053558a970fde777e47cf50ab9596d7f1a Mon Sep 17 00:00:00 2001
From: sub77 <sub77@ymail.com>
Date: Tue, 16 Feb 2016 06:02:19 +0100
Subject: [PATCH 1/3] perl: Can't use 'defined(@array)'
Change-Id: I28e206d4b3c383c16df807e8602c24bb78b5a7d8
---
kernel/timeconst.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/timeconst.pl b/kernel/timeconst.pl
index eb51d76..0461239 100644
--- a/kernel/timeconst.pl
+++ b/kernel/timeconst.pl
@@ -370,7 +370,7 @@ if ($hz eq '--can') {
}
@val = @{$canned_values{$hz}};
- if (!defined(@val)) {
+ if (!@val) {
@val = compute_values($hz);
}
output($hz, @val);
--
2.7.0.rc3
This source diff could not be displayed because it is too large. You can view the blob instead.
From cf4845ae7fc3ddda79b2575e6e73aeb35a48bcdd Mon Sep 17 00:00:00 2001
From: sub77 <sub77@ymail.com>
Date: Tue, 16 Feb 2016 06:05:21 +0100
Subject: [PATCH 3/3] matissewifi: touchscreen: mxts_1188s: Fix build when DVFS
is disabled
Change-Id: I232facdc46fe8aa5a32760bd2880bf1424dc26c4
---
drivers/input/touchscreen/mxt1188s/mxts_1188s.c | 16 ++++++++++++++++
drivers/input/touchscreen/mxt1188s/mxts_sec_1188s.c | 14 ++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/drivers/input/touchscreen/mxt1188s/mxts_1188s.c b/drivers/input/touchscreen/mxt1188s/mxts_1188s.c
index 81b577f..2a6ce3e 100644
--- a/drivers/input/touchscreen/mxt1188s/mxts_1188s.c
+++ b/drivers/input/touchscreen/mxt1188s/mxts_1188s.c
@@ -1031,9 +1031,11 @@ static void mxt_report_input_data(struct mxt_data *data)
input_sync(data->input_dev);
}
+#ifdef CONFIG_SEC_DVFS
#if TSP_BOOSTER
mxt_set_dvfs_lock(data, count);
#endif
+#endif
data->finger_mask = 0;
}
@@ -1171,9 +1173,11 @@ static void mxt_release_all_keys(struct mxt_data *data)
input_report_key(data->input_dev, KEY_RECENT, KEY_RELEASE);
dev_info(&data->client->dev,
"%s: [TSP_KEY] menu R!\n", __func__);
+#ifdef CONFIG_SEC_DVFS
#if MXT_TKEY_BOOSTER
mxt_tkey_set_dvfs_lock(data, !!KEY_RELEASE);
#endif
+#endif
}
}
@@ -1192,9 +1196,11 @@ static void mxt_release_all_keys(struct mxt_data *data)
input_report_key(data->input_dev, KEY_BACK, KEY_RELEASE);
dev_info(&data->client->dev,
"%s: [TSP_KEY] back R!\n", __func__);
+#ifdef CONFIG_SEC_DVFS
#if MXT_TKEY_BOOSTER
mxt_tkey_set_dvfs_lock(data, !!KEY_RELEASE);
#endif
+#endif
}
}
}
@@ -1282,9 +1288,11 @@ static void mxt_treat_T15_object(struct mxt_data *data,
}
data->ignore_back_key_by_menu = false;
}
+#ifdef CONFIG_SEC_DVFS
#if MXT_TKEY_BOOSTER
mxt_tkey_set_dvfs_lock(data, !!key_state);
#endif
+#endif
}
}
@@ -1322,9 +1330,11 @@ static void mxt_treat_T15_object(struct mxt_data *data,
}
data->ignore_menu_key_by_back = false;
}
+#ifdef CONFIG_SEC_DVFS
#if MXT_TKEY_BOOSTER
mxt_tkey_set_dvfs_lock(data, !!key_state);
#endif
+#endif
}
}
@@ -2294,9 +2304,11 @@ static int mxt_stop(struct mxt_data *data)
#if ENABLE_TOUCH_KEY
mxt_release_all_keys(data);
#endif
+#ifdef CONFIG_SEC_DVFS
#if TSP_BOOSTER
mxt_set_dvfs_lock(data, -1);
#endif
+#endif
data->mxt_enabled = false;
@@ -2447,12 +2459,16 @@ static int mxt_touch_finish_init(struct mxt_data *data)
goto err_req_irq;
}
+#ifdef CONFIG_SEC_DVFS
#if TSP_BOOSTER
mxt_init_dvfs(data);
#endif
+#endif
+#ifdef CONFIG_SEC_DVFS
#if MXT_TKEY_BOOSTER
mxt_tkey_init_dvfs(data);
#endif
+#endif
dev_info(&client->dev, "Mxt touch controller initialized\n");
diff --git a/drivers/input/touchscreen/mxt1188s/mxts_sec_1188s.c b/drivers/input/touchscreen/mxt1188s/mxts_sec_1188s.c
index 4ffe6d1..8dfbcc3 100644
--- a/drivers/input/touchscreen/mxt1188s/mxts_sec_1188s.c
+++ b/drivers/input/touchscreen/mxt1188s/mxts_sec_1188s.c
@@ -1554,6 +1554,7 @@ struct tsp_cmd {
void (*cmd_func)(void *device_data);
};
+#ifdef CONFIG_SEC_DVFS
#if TSP_BOOSTER
static void boost_level(void *device_data)
{
@@ -1599,6 +1600,7 @@ static void boost_level(void *device_data)
return;
}
#endif
+#endif
static struct tsp_cmd tsp_cmds[] = {
{TSP_CMD("fw_update", fw_update),},
@@ -1629,9 +1631,11 @@ static struct tsp_cmd tsp_cmds[] = {
{TSP_CMD("set_tk_threshold", set_tk_threshold),},
#endif
#endif
+#ifdef CONFIG_SEC_DVFS
#if TSP_BOOSTER
{TSP_CMD("boost_level", boost_level),},
#endif
+#endif
#if TSP_PATCH
{TSP_CMD("patch_update", patch_update),},
#endif
@@ -2038,6 +2042,7 @@ static ssize_t touchkey_report_dummy_key_store(struct device *dev,
return size;
}
+#ifdef CONFIG_SEC_DVFS
#if MXT_TKEY_BOOSTER
static ssize_t boost_level_store(struct device *dev,
struct device_attribute *attr,
@@ -2082,6 +2087,7 @@ static ssize_t boost_level_store(struct device *dev,
return count;
}
#endif
+#endif
static DEVICE_ATTR(touchkey_d_menu, S_IRUGO | S_IWUSR | S_IWGRP, touchkey_d_menu_show, NULL);
static DEVICE_ATTR(touchkey_d_back, S_IRUGO | S_IWUSR | S_IWGRP, touchkey_d_back_show, NULL);
@@ -2091,9 +2097,11 @@ static DEVICE_ATTR(touchkey_threshold, S_IRUGO | S_IWUSR | S_IWGRP, get_touchkey
static DEVICE_ATTR(brightness, S_IRUGO | S_IWUSR | S_IWGRP, NULL, touchkey_led_control);
static DEVICE_ATTR(extra_button_event, S_IRUGO | S_IWUSR | S_IWGRP,
touchkey_report_dummy_key_show, touchkey_report_dummy_key_store);
+#ifdef CONFIG_SEC_DVFS
#if MXT_TKEY_BOOSTER
static DEVICE_ATTR(boost_level, S_IWUSR | S_IWGRP, NULL, boost_level_store);
#endif
+#endif
static struct attribute *touchkey_attributes[] = {
&dev_attr_touchkey_d_menu.attr,
@@ -2103,9 +2111,11 @@ static struct attribute *touchkey_attributes[] = {
&dev_attr_touchkey_threshold.attr,
&dev_attr_brightness.attr,
&dev_attr_extra_button_event.attr,
+#ifdef CONFIG_SEC_DVFS
#if MXT_TKEY_BOOSTER
&dev_attr_boost_level.attr,
#endif
+#endif
NULL,
};
@@ -2736,6 +2746,7 @@ static void mxt_sysfs_remove(struct mxt_data *data)
#endif
}
+#ifdef CONFIG_SEC_DVFS
#if TSP_BOOSTER
static void mxt_change_dvfs_lock(struct work_struct *work)
{
@@ -2860,6 +2871,8 @@ void mxt_init_dvfs(struct mxt_data *data)
data->dvfs_lock_status = false;
}
#endif
+#endif
+#ifdef CONFIG_SEC_DVFS
#if MXT_TKEY_BOOSTER
static void mxt_tkey_change_dvfs_lock(struct work_struct *work)
{
@@ -2949,3 +2962,4 @@ void mxt_tkey_init_dvfs(struct mxt_data *data)
data->tkey_dvfs_lock_status = true;
}
#endif
+#endif
--
2.7.0.rc3
......@@ -13,11 +13,11 @@
# limitations under the License.
#
""" Custom OTA commands for s3ve3g devices """
""" Custom OTA commands for matissewifi devices """
def FullOTA_InstallEnd(info):
info.script.Mount("/system")
info.script.AppendExtra('ifelse(is_substring("I9300I", getprop("ro.bootloader")), run_program("/sbin/sh", "-c", "busybox cp -R /system/blobs/s3ve3gds/* /system/"));')
info.script.AppendExtra('ifelse(is_substring("I9300I", getprop("ro.bootloader")), run_program("/sbin/sh", "-c", "busybox cp -R /system/blobs/matissewifids/* /system/"));')
info.script.AppendExtra('set_metadata("/system/bin/qmuxd", "uid", 0, "gid", 2000, "mode", 0755, "capabilities", 0x0, "selabel", "u:object_r:qmuxd_exec:s0");')
info.script.AppendExtra('set_metadata("/system/bin/radish", "uid", 0, "gid", 2000, "mode", 0755, "capabilities", 0x0, "selabel", "u:object_r:system_file:s0");')
info.script.Unmount("/system")
add_lunch_combo cm_s3ve3g-eng
add_lunch_combo cm_s3ve3g-userdebug
add_lunch_combo cm_matissewifi-eng
add_lunch_combo cm_matissewifi-userdebug
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment