Modified fortuna files to target the gprimeltecan device.
Renamed references to "fortuna" to "gprimeltecan"
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index a88ca99..720007b 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,2 +1,2 @@
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/full_fortuna.mk
\ No newline at end of file
+ $(LOCAL_DIR)/full_gprimeltecan.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index fcf4c2b..f9448ba 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,8 +1,8 @@
FORCE_32_BIT := true
--include vendor/samsung/fortuna/BoardConfigVendor.mk
+-include vendor/samsung/gprimeltecan/BoardConfigVendor.mk
-LOCAL_PATH := device/samsung/fortuna
+LOCAL_PATH := device/samsung/gprimeltecan
# Inherit from common
-include device/samsung/qcom-common/BoardConfigCommon.mk
@@ -23,7 +23,7 @@
BOARD_USES_ALSA_AUDIO := true
# Asserts
-TARGET_OTA_ASSERT_DEVICE := grandprimelte,fortuna,fortunave3g
+TARGET_OTA_ASSERT_DEVICE := grandprimelte,gprimeltecan,fortunave3g
# Bluetooth
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(LOCAL_PATH)/bluetooth
@@ -76,7 +76,7 @@
# Init
TARGET_INIT_VENDOR_LIB := libinit_msm
-TARGET_LIBINIT_DEFINES_FILE := $(LOCAL_PATH)/init/init_fortuna.c
+TARGET_LIBINIT_DEFINES_FILE := $(LOCAL_PATH)/init/init_gprimeltecan.cpp
TARGET_PLATFORM_DEVICE_BASE := /devices/soc.0/
TARGET_UNIFIED_DEVICE := true
TARGET_PROVIDES_INIT_RC := true
@@ -89,10 +89,11 @@
BOARD_KERNEL_SEPARATED_DT := true
BOARD_KERNEL_TAGS_OFFSET := 0x01E00000
BOARD_RAMDISK_OFFSET := 0x02000000
-TARGET_KERNEL_CONFIG := msm8916_sec_defconfig
-TARGET_KERNEL_VARIANT_CONFIG := msm8916_sec_fortuna_eur_defconfig
-TARGET_KERNEL_SELINUX_CONFIG := selinux_defconfig
-TARGET_KERNEL_SOURCE := kernel/samsung/fortuna
+TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/kernel
+#TARGET_KERNEL_CONFIG := msm8916_sec_defconfig
+#TARGET_KERNEL_VARIANT_CONFIG := msm8916_sec_fortuna_eur_defconfig
+#TARGET_KERNEL_SELINUX_CONFIG := selinux_defconfig
+#TARGET_KERNEL_SOURCE := kernel/samsung/fortuna
# Lights
TARGET_PROVIDES_LIBLIGHT := true
@@ -100,13 +101,19 @@
# malloc implementation
MALLOC_IMPL := dlmalloc
-# Partitions
-BOARD_BOOTIMAGE_PARTITION_SIZE := 13631488 #13312 * 1024 mmcblk0p16
+# Partition sizes
+#TARGET_USERIMAGES_USE_EXT4 := true
+BOARD_BOOTIMAGE_PARTITION_SIZE := 13631488
+BOARD_RECOVERYIMAGE_PARTITION_SIZE := 15728640
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2359296000
+BOARD_SYSTEMIMAGE_PARTITION_TPE := ext4
+BOARD_CACHEIMAGE_PARTITION_SIZE := 314572800
+BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_PERSISTIMAGE_PARTITION_SIZE := 8388608
+BOARD_PERSISTIMAGE_FILE_SYSTEM_TYPE := ext4
+# (5731495936 - 16384)
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 4942966784
BOARD_FLASH_BLOCK_SIZE := 131072
-BOARD_PERSISTIMAGE_PARTITION_SIZE := 8388608 # 8192 * 1024 mmcblk0p22
-BOARD_RECOVERYIMAGE_PARTITION_SIZE := 15728640 #15360 * 1024 mmcblk0p17
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1568669696 #1531904 * 1024 mmcblk0p24
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 5637124096 # 5505004 * 1024 mmcblk0p27
# Platform
TARGET_BOARD_PLATFORM := msm8916
@@ -134,7 +141,7 @@
include device/qcom/sepolicy/sepolicy.mk
BOARD_SEPOLICY_DIRS += \
- device/samsung/fortuna/sepolicy
+ device/samsung/gprimeltecan/sepolicy
BOARD_SEPOLICY_UNION += \
bluetooth_loader.te \
@@ -207,4 +214,4 @@
WPA_SUPPLICANT_VERSION := VER_0_8_X
# inherit from the proprietary version
--include vendor/samsung/fortuna/BoardConfigVendor.mk
+-include vendor/samsung/gprimeltecan/BoardConfigVendor.mk
diff --git a/cm.mk b/cm.mk
index 84da71a..f0efbfc 100644
--- a/cm.mk
+++ b/cm.mk
@@ -1,3 +1,4 @@
+
# Release name
PRODUCT_RELEASE_NAME := Samsung Galaxy Grand Prime
@@ -5,7 +6,7 @@
TARGET_SCREEN_WIDTH := 540
TARGET_SCREEN_HEIGHT := 960
-$(call inherit-product, device/samsung/fortuna/full_fortuna.mk)
+$(call inherit-product, device/samsung/gprimeltecan/full_gprimeltecan.mk)
# Enhanced NFC
$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
@@ -14,10 +15,11 @@
$(call inherit-product, vendor/cm/config/common_full_phone.mk)
## Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := fortuna
-PRODUCT_NAME := cm_fortuna
+PRODUCT_DEVICE := gprimeltecan
+PRODUCT_NAME := cm_gprimeltecan
PRODUCT_BRAND := samsung
-PRODUCT_MODEL := SM-G530FZ
+PRODUCT_MODEL := SM-G530W
PRODUCT_MANUFACTURER := samsung
+PRODUCT_CHARACTERISTICS := phone
PRODUCT_GMS_CLIENTID_BASE := android-samsung
diff --git a/device.mk b/device.mk
index ff7aa2c..4ec5142 100644
--- a/device.mk
+++ b/device.mk
@@ -1,10 +1,22 @@
-LOCAL_PATH := device/samsung/fortuna
-$(call inherit-product-if-exists, vendor/samsung/fortuna/fortuna-vendor.mk)
+LOCAL_PATH := device/samsung/gprimeltecan
+$(call inherit-product-if-exists, vendor/samsung/gprimeltecan/gprimeltecan-vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
# Inherit from common
$(call inherit-product, device/samsung/qcom-common/qcom-common.mk)
+# Common overlay
+DEVICE_PACKAGE_OVERLAYS += device/samsung/gprimeltecan/overlay
+
+ifeq ($(TARGET_PREBUILT_KERNEL),)
+ LOCAL_KERNEL := device/samsung/gprimeltecan/kernel
+else
+ LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
+endif
+
+PRODUCT_COPY_FILES += \
+$(LOCAL_KERNEL):kernel
+
#Android EGL implementation
PRODUCT_PACKAGES += libGLES_android
diff --git a/dt.img b/dt.img
new file mode 100644
index 0000000..d8ab7a5
--- /dev/null
+++ b/dt.img
Binary files differ
diff --git a/full_fortuna.mk b/full_gprimeltecan.mk
similarity index 75%
rename from full_fortuna.mk
rename to full_gprimeltecan.mk
index 5648e4e..47c523f 100644
--- a/full_fortuna.mk
+++ b/full_gprimeltecan.mk
@@ -1,3 +1,4 @@
+
#
# Copyright (C) 2015 The Android Open-Source Project
#
@@ -18,16 +19,14 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
# Inherit from device.mk
-$(call inherit-product, device/samsung/fortuna/device.mk)
+$(call inherit-product, device/samsung/gprimeltecan/device.mk)
# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := fortuna
-PRODUCT_NAME := full_fortuna
+PRODUCT_DEVICE := gprimeltecan
+PRODUCT_NAME := full_gprimeltecan
PRODUCT_BRAND := samsung
-PRODUCT_MODEL := SM-G530FZ
+PRODUCT_MODEL := SM-G530W
PRODUCT_MANUFACTURER := samsung
-# My own ID
-TARGET_UNOFFICIAL_BUILD_ID := by_baran0119_for
-$(call inherit-product-if-exists, vendor/samsung/fortuna/fortuna-vendor.mk)
+$(call inherit-product-if-exists, vendor/samsung/gprimeltecan/gprimeltecan-vendor.mk)
diff --git a/gps/Android.mk b/gps/Android.mk
index f530764..3831662 100644
--- a/gps/Android.mk
+++ b/gps/Android.mk
@@ -16,6 +16,6 @@
LOCAL_PATH := $(call my-dir)
-ifeq ($(TARGET_DEVICE),fortuna)
+ifeq ($(TARGET_DEVICE),gprimeltecan)
include $(call all-subdir-makefiles,$(LOCAL_PATH))
endif
diff --git a/init/init_fortuna.c b/init/init_fortuna.c
deleted file mode 100644
index d27b9a7..0000000
--- a/init/init_fortuna.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- Copyright (c) 2014, The Linux Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- * Neither the name of The Linux Foundation nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdlib.h>
-
-#include "vendor_init.h"
-#include "property_service.h"
-#include "log.h"
-#include "util.h"
-
-#include "init_msm.h"
-
-void init_msm_properties(unsigned long msm_id, unsigned long msm_ver, char *board_type)
-{
- char platform[PROP_VALUE_MAX];
- char bootloader[PROP_VALUE_MAX];
- char device[PROP_VALUE_MAX];
- char devicename[PROP_VALUE_MAX];
- int rc;
-
- UNUSED(msm_id);
- UNUSED(msm_ver);
- UNUSED(board_type);
-
- rc = property_get("ro.board.platform", platform);
- if (!rc || !ISMATCH(platform, ANDROID_TARGET))
- return;
-
- property_get("ro.bootloader", bootloader);
-
- if (strstr(bootloader, "G530FZ")) {
- /* SM-G530FZ */
- property_set("ro.build.fingerprint", "samsung/grandprimeltexx/grandprimelte:5.0.2/LRX22G/G530FZXXU1BOG2:user/release-keys");
- property_set("ro.build.description", "grandprimeltexx-user 5.0.2 LRX22G G530FZXXU1BOG2 release-keys");
- property_set("ro.product.model", "SM-G530FZ");
- property_set("ro.product.device", "grandprimelte");
- property_set("ro.product.name", "grandprimeltexx");
- property_set("ro.build.product", "grandprimelte");
- property_set("telephony.lteOnCdmaDevice", "0");
- property_set("persist.radio.apm_sim_not_pwdn", "1");
- property_set("persist.radio.add_power_save", "1");
- property_set("persist.data.netmgrd.qos.enable", "false");
- property_set("persist.cne.feature", "0");
- property_set("persist.radio.lte_vrte_ltd", "1");
- } else if (strstr(bootloader, "G530H")) {
- /* SM-G530H */
- property_set("ro.build.fingerprint", "samsung/fortunave3gxx/fortunave3g:5.0.2/LRX22G/G530HXCU1BOI1:user/release-keys");
- property_set("ro.build.description", "fortunave3gxx-user 5.0.2 LRX22G G530HXCU1BOI1 release-keys");
- property_set("ro.product.model", "SM-G530H");
- property_set("ro.product.device", "fortunave3g");
- property_set("ro.product.name", "fortunave3gxx");
- property_set("ro.build.product", "fortunave3g");
- property_set("persist.radio.multisim.config", "dsds");
- property_set("ro.multisim.simslotcount", "2");
- }
-
- property_get("ro.product.device", device);
- strlcpy(devicename, device, sizeof(devicename));
- INFO("Found bootloader id %s setting build properties for %s device\n", bootloader, devicename);
-}
-
diff --git a/init/init_gprimeltecan.cpp b/init/init_gprimeltecan.cpp
new file mode 100644
index 0000000..3eb1f65
--- /dev/null
+++ b/init/init_gprimeltecan.cpp
@@ -0,0 +1,52 @@
+/*
+ Copyright (c) 2013, The Linux Foundation. All rights reserved.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+
+#include "vendor_init.h"
+#include "property_service.h"
+#include "log.h"
+#include "util.h"
+
+#include "init_msm.h"
+
+void init_msm_properties(unsigned long msm_id, unsigned long msm_ver, char *board_type)
+{
+ char platform[PROP_VALUE_MAX];
+ int rc;
+
+ UNUSED(msm_id);
+ UNUSED(msm_ver);
+ UNUSED(board_type);
+
+ rc = property_get("ro.board.platform", platform);
+ if (!rc || !ISMATCH(platform, ANDROID_TARGET))
+ return;
+
+ property_set("ro.product.model", "SM-G530W");
+ property_set("ro.product.device", "gprimeltecan");
+}
diff --git a/kernel b/kernel
new file mode 100755
index 0000000..9b9c380
--- /dev/null
+++ b/kernel
Binary files differ
diff --git a/mkbootimg.mk b/mkbootimg.mk
index 02fbb37..41d5910 100644
--- a/mkbootimg.mk
+++ b/mkbootimg.mk
@@ -1,24 +1,20 @@
LOCAL_PATH := $(call my-dir)
## Build and run dtbtool
-DTBTOOL := $(HOST_OUT_EXECUTABLES)/dtbToolCM$(HOST_EXECUTABLE_SUFFIX)
-INSTALLED_DTIMAGE_TARGET := $(PRODUCT_OUT)/dt.img
+INSTALLED_DTIMAGE_TARGET := $(LOCAL_PATH)/dt.img
ifneq ($(TARGET_KERNEL_ARCH),)
KERNEL_ARCH := $(TARGET_KERNEL_ARCH)
else
KERNEL_ARCH := $(TARGET_ARCH)
endif
-
-$(INSTALLED_DTIMAGE_TARGET): $(DTBTOOL) $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr $(INSTALLED_KERNEL_TARGET)
- $(call pretty,"Target dt image: $(INSTALLED_DTIMAGE_TARGET)")
- $(hide) $(DTBTOOL) -2 -o $(INSTALLED_DTIMAGE_TARGET) -s $(BOARD_KERNEL_PAGESIZE) -p $(KERNEL_OUT)/scripts/dtc/ $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts/
- @echo -e ${CL_CYN}"Made DT image: $@"${CL_RST}
-
## Overload bootimg generation: Same as the original, + --dt arg
$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(INSTALLED_DTIMAGE_TARGET)
$(call pretty,"Target boot image: $@")
- $(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --dt $(INSTALLED_DTIMAGE_TARGET) --ramdisk_offset $(BOARD_RAMDISK_OFFSET) --tags_offset $(BOARD_KERNEL_TAGS_OFFSET) --output $@
+ $(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) \
+ --second_offset $(BOARD_SECOND_OFFSET) --base $(BOARD_KERNEL_BASE) --pagesize $(BOARD_KERNEL_PAGESIZE) \
+ --dt $(INSTALLED_DTIMAGE_TARGET) --ramdisk_offset $(BOARD_RAMDISK_OFFSET) \
+ --tags_offset $(BOARD_KERNEL_TAGS_OFFSET) --output $@
$(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE),raw)
@echo -e ${CL_CYN}"Made boot image: $@"${CL_RST}
@@ -27,6 +23,11 @@
$(recovery_ramdisk) \
$(recovery_kernel)
@echo -e ${CL_CYN}"----- Making recovery image ------"${CL_RST}
- $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --dt $(INSTALLED_DTIMAGE_TARGET) --ramdisk_offset $(BOARD_RAMDISK_OFFSET) --tags_offset $(BOARD_KERNEL_TAGS_OFFSET) --output $@
+ $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) \
+ --second_offset $(BOARD_SECOND_OFFSET) --base $(BOARD_KERNEL_BASE) --pagesize $(BOARD_KERNEL_PAGESIZE) \
+ --dt $(INSTALLED_DTIMAGE_TARGET) --ramdisk_offset $(BOARD_RAMDISK_OFFSET) \
+ --tags_offset $(BOARD_KERNEL_TAGS_OFFSET) --output $@
$(hide) $(call assert-max-image-size,$@,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE),raw)
@echo -e ${CL_CYN}"Made recovery image: $@"${CL_RST}
+
+
diff --git a/vendorsetup.sh b/vendorsetup.sh
new file mode 100644
index 0000000..f1fe1c1
--- /dev/null
+++ b/vendorsetup.sh
@@ -0,0 +1,5 @@
+for i in eng userdebug user; do
+ add_lunch_combo cm_gprimeltecan-${i}
+# add_lunch_combo omni_gprimeltecan-${i}
+# add_lunch_combo full_gprimeltecan-${i}
+done