diff --git a/BoardConfig.mk b/BoardConfig.mk index d8a76e1..7eb827c 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -35,7 +35,6 @@ TARGET_KERNEL_SOURCE := kernel/samsung/klte TARGET_KERNEL_CONFIG := msm8974_sec_defconfig TARGET_KERNEL_SELINUX_CONFIG := selinux_defconfig TARGET_KERNEL_VARIANT_CONFIG := msm8974pro_sec_klte_spr_defconfig - # Kernel BOARD_KERNEL_CMDLINE := console=null androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 BOARD_KERNEL_BASE := 0x00000000 @@ -79,11 +78,11 @@ BOARD_HAVE_NEW_QCOM_CSDCLIENT := true # QCOM support BOARD_USES_QCOM_HARDWARE := true -TARGET_QCOM_MEDIA_VARIANT := caf-new -TARGET_QCOM_DISPLAY_VARIANT := caf-new +TARGET_QCOM_MEDIA_VARIANT := caf +TARGET_QCOM_DISPLAY_VARIANT := caf BOARD_USES_LEGACY_ALSA_AUDIO := TARGET_QCOM_AUDIO_VARIANT := caf- -#TARGET_USES_QCOM_BSP := true +TARGET_USES_QCOM_BSP := true # Audio settings BOARD_USES_CUSTOM_AUDIO_PLATFORM_PATH := device/samsung/klte/audio/platform diff --git a/device.mk~ b/device.mk~ deleted file mode 100644 index 3e571fa..0000000 --- a/device.mk~ +++ /dev/null @@ -1,229 +0,0 @@ -# -# Copyright (C) 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. -# - -$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) - -## Get non-open-source specific aspects -$(call inherit-product-if-exists, vendor/samsung/klte/klte-vendor.mk) - -## overlays -DEVICE_PACKAGE_OVERLAYS += device/samsung/klte/overlay - -# Device uses high-density artwork where available -PRODUCT_AAPT_CONFIG := normal hdpi xhdpi xxhdpi -PRODUCT_AAPT_PREF_CONFIG := xxhdpi - -# Boot animation -TARGET_SCREEN_HEIGHT := 1920 -TARGET_SCREEN_WIDTH := 1080 - -# Audio configuration -PRODUCT_COPY_FILES += \ - device/samsung/klte/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf \ - device/samsung/klte/audio/mixer_paths.xml:system/etc/mixer_paths.xml \ - device/samsung/klte/audio/audio_policy.conf:system/etc/audio_policy.conf \ - frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml - -PRODUCT_PROPERTY_OVERRIDES += \ - af.resampler.quality=4 \ - audio.offload.buffer.size.kb=32 \ - audio.offload.gapless.enabled=false \ - av.offload.enable=true - -# Thermal config -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/thermal-engine-8974.conf:system/etc/thermal-engine-8974.conf - -# Media Profile -PRODUCT_COPY_FILES += \ - device/samsung/klte/media/media_profiles.xml:system/etc/media_profiles.xml - -# Extended media support -PRODUCT_PACKAGES += \ - qcmediaplayer - -PRODUCT_BOOT_JARS += qcmediaplayer - -# GPS -PRODUCT_PACKAGES += \ - gps.msm8974 \ - libgps.utils \ - libloc_core \ - libloc_eng - -GPS_CONF := device/samsung/klte/gps/etc/gps.conf - -PRODUCT_COPY_FILES += \ - $(GPS_CONF):/system/etc/gps.conf \ - device/samsung/klte/gps/etc/sap.conf:/system/etc/sap.conf - -# Keylayouts -PRODUCT_COPY_FILES += \ - device/samsung/klte/keylayout/atmel_mxt_ts.kl:system/usr/keylayout/atmel_mxt_ts.kl \ - device/samsung/klte/keylayout/Button_Jack.kl:system/usr/keylayout/Button_Jack.kl \ - device/samsung/klte/keylayout/gpio-keys.kl:system/usr/keylayout/gpio-keys.kl \ - device/samsung/klte/keylayout/philips_remote_ir.kl:system/usr/keylayout/philips_remote_ir.kl \ - device/samsung/klte/keylayout/samsung_remote_ir.kl:system/usr/keylayout/samsung_remote_ir.kl \ - device/samsung/klte/keylayout/sec_touchkey.kl:system/usr/keylayout/sec_touchkey.kl \ - device/samsung/klte/keylayout/ue_rf4ce_remote.kl:system/usr/keylayout/ue_rf4ce_remote.kl - -# Ramdisk -PRODUCT_PACKAGES += \ - fstab.qcom \ - initlogo.rle \ - init.bt.rc \ - init.carrier.rc \ - init.crda.sh \ - init.qcom.rc \ - init.qcom.usb.rc \ - init.ril.rc \ - init.target.rc \ - ueventd.qcom.rc -# HAL -PRODUCT_PACKAGES += \ - copybit.msm8974 \ - gralloc.msm8974 \ - hwcomposer.msm8974 \ - memtrack.msm8974 \ - power.msm8974 - -# Audio -PRODUCT_PACKAGES += \ - audiod \ - audio.a2dp.default \ - audio_policy.msm8974 \ - audio.primary.msm8974 \ - audio.r_submix.default \ - audio.usb.default \ - libaudio-resampler \ - libqcomvisualizer \ - libqcomvoiceprocessing \ - tinymix - -# Torch -PRODUCT_PACKAGES += Torch - -# Wifi -PRODUCT_PACKAGES += \ - libnetcmdiface \ - macloader \ - crda \ - regulatory.bin \ - linville.key.pub.pem - -# libxml2 is needed for camera -PRODUCT_PACKAGES += libxml2 - -# IR packages -PRODUCT_PACKAGES += \ - consumerir.msm8974 -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.consumerir.xml:system/etc/permissions/android.hardware.consumerir.xml - -# Nfc -NFCEE_ACCESS_PATH := device/samsung/klte/nfc/nfcee_access.xml - -ifeq ($(TARGET_NFC_TECH), nxp) -PRODUCT_PACKAGES += \ - libnfc \ - libnfc_jni \ - Nfc \ - Tag \ - com.android.nfc_extras - -PRODUCT_COPY_FILES += \ - $(NFCEE_ACCESS_PATH):system/etc/nfcee_access.xml - -else - -PRODUCT_PACKAGES += \ - libnfc-nci \ - libnfc_nci_jni \ - nfc_nci.msm8974 \ - NfcNci \ - Tag \ - com.android.nfc_extras - -PRODUCT_COPY_FILES += \ - $(NFCEE_ACCESS_PATH):system/etc/nfcee_access.xml \ - device/samsung/klte/nfc/libnfc-brcm-20791b05.conf:system/etc/libnfc-brcm-20791b05.conf \ - device/samsung/klte/nfc/libnfc-brcm-20791b04.conf:system/etc/libnfc-brcm-20791b04.conf \ - device/samsung/klte/nfc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf - -endif - -# Set default USB interface -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - persist.sys.usb.config=mtp,diag - -# Lights -PRODUCT_PACKAGES += lights.MSM8974 - -# QC Perf -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.extension_library=/vendor/lib/libqc-opt.so - -#common build.props -PRODUCT_PROPERTY_OVERRIDES += \ - ro.chipname=msm8974 \ - ro.sf.lcd_density=480 \ - ro.opengles.version=196608 \ - persist.timed.enable=true \ - keyguard.no_require_sim=true - -# Radio properties -PRODUCT_PROPERTY_OVERRIDES += \ - rild.libpath=/system/lib/libsec-ril.so \ - ril.subscription.types=NV,RUIM \ - ro.ril.hsxpa=1 \ - ro.ril.gprsclass=10 \ - ro.use_data_netmgrd=true \ - persist.data.netmgrd.qos.enable=true \ - persist.radio.add_power_save=1 \ - persist.radio.apm_sim_not_pwdn=1 \ - persist.radio.lte_vrat_report=1 \ - persist.rild.nitz_plmn="" \ - persist.rild.nitz_long_ons_0="" \ - persist.rild.nitz_long_ons_1="" \ - persist.rild.nitz_long_ons_2="" \ - persist.rild.nitz_long_ons_3="" \ - persist.rild.nitz_short_ons_0="" \ - persist.rild.nitz_short_ons_1="" \ - persist.rild.nitz_short_ons_2="" \ - persist.rild.nitz_short_ons_3="" - -# msm_rng entropy feeder -PRODUCT_PACKAGES += \ - qrngd \ - qrngp - -# Wifi -PRODUCT_COPY_FILES += \ - device/samsung/klte/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \ - device/samsung/klte/p2p_supplicant_overlay.conf:system/etc/wifi/p2p_supplicant_overlay.conf - -# Keymaster -PRODUCT_PACKAGES += \ - keystore.msm8974 - -# call common msm8960 -$(call inherit-product, device/samsung/msm8960-common/msm8960.mk) - -# call dalvik heap config -$(call inherit-product, frameworks/native/build/phone-xxhdpi-2048-dalvik-heap.mk) - -# call hwui memory config -$(call inherit-product-if-exists, frameworks/native/build/phone-xxhdpi-2048-hwui-memory.mk) diff --git a/dt.img b/dt.img deleted file mode 100644 index 6d8a0c3..0000000 Binary files a/dt.img and /dev/null differ diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 39c459d..e4db70a 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -2,15 +2,17 @@ # The filesystem that contains the filesystem checker binary (typically /system) cannot # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK -# -/dev/block/platform/msm_sdcc.1/by-name/boot /boot emmc defaults defaults -/dev/block/platform/msm_sdcc.1/by-name/recovery /recovery emmc defaults defaults +#TODO: Add 'check' as fs_mgr_flags with data partition. +# Currently we dont have e2fsck compiled. So fs check would failed. + +# +/dev/block/platform/msm_sdcc.1/by-name/boot /boot emmc defaults defaults +/dev/block/platform/msm_sdcc.1/by-name/recovery /recovery emmc defaults defaults /dev/block/platform/msm_sdcc.1/by-name/system /system ext4 ro,errors=panic wait /dev/block/platform/msm_sdcc.1/by-name/userdata /data ext4 nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic wait,check,encryptable=footer -/dev/block/platform/msm_sdcc.1/by-name/cache /cache ext4 nosuid,nodev,noatime,noauto_da_alloc,journal_async_commit,errors=panic wait,check -/dev/block/platform/msm_sdcc.1/by-name/apnhlos /firmware vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337 wait -/dev/block/platform/msm_sdcc.1/by-name/mdm /firmware-mdm vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337 wait -/dev/block/platform/msm_sdcc.1/by-name/efs /efs ext4 nosuid,nodev,noatime,noauto_da_alloc,journal_async_commit,errors=panic wait,check +/dev/block/platform/msm_sdcc.1/by-name/cache /cache ext4 nosuid,nodev,barrier=1 wait,check +/dev/block/platform/msm_sdcc.1/by-name/apnhlos /firmware vfat ro,shortname=lower,uid=1000,gid=1026,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait +/dev/block/platform/msm_sdcc.1/by-name/modem /firmware-modem vfat ro,shortname=lower,uid=1000,gid=1026,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait # VOLD /devices/msm_sdcc.3/mmc_host/mmc2,/devices/msm_sdcc.2/mmc_host/mmc1 auto vfat default voldmanaged=extSdCard:auto,noemulatedsd diff --git a/rootdir/etc/fstab.qcom~ b/rootdir/etc/fstab.qcom~ deleted file mode 100644 index 12a6924..0000000 --- a/rootdir/etc/fstab.qcom~ +++ /dev/null @@ -1,22 +0,0 @@ -# Android fstab file. -# The filesystem that contains the filesystem checker binary (typically /system) cannot -# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK - -# -/dev/block/platform/msm_sdcc.1/by-name/boot /boot emmc defaults defaults -/dev/block/platform/msm_sdcc.1/by-name/recovery /recovery emmc defaults defaults -/dev/block/platform/msm_sdcc.1/by-name/system /system ext4 ro,errors=panic wait -/dev/block/platform/msm_sdcc.1/by-name/cache /cache ext4 nosuid,nodev,noatime,noauto_da_alloc,journal_async_commit,errors=panic wait,check -/dev/block/platform/msm_sdcc.1/by-name/apnhlos /firmware vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337 wait -/dev/block/platform/msm_sdcc.1/by-name/mdm /firmware-mdm vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337 wait -/dev/block/platform/msm_sdcc.1/by-name/efs /efs ext4 nosuid,nodev,noatime,noauto_da_alloc,journal_async_commit,errors=panic wait,check -/dev/block/platform/msm_sdcc.1/by-name/userdata /data ext4 nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic wait,check,encryptable=footer - -# VOLD -/devices/msm_sdcc.3/mmc_host/mmc2,/devices/msm_sdcc.2/mmc_host/mmc1 auto vfat default voldmanaged=extSdCard:auto,noemulatedsd -/devices/platform/xhci-hcd/usb1*sda,/devices/platform/xhci-hcd/usb2*sda auto vfat default voldmanaged=UsbDriveA:auto -/devices/platform/xhci-hcd/usb1*sdb,/devices/platform/xhci-hcd/usb2*sdb auto vfat default voldmanaged=UsbDriveB:auto -/devices/platform/xhci-hcd/usb1*sdc,/devices/platform/xhci-hcd/usb2*sdc auto vfat default voldmanaged=UsbDriveC:auto -/devices/platform/xhci-hcd/usb1*sdd,/devices/platform/xhci-hcd/usb2*sdd auto vfat default voldmanaged=UsbDriveD:auto -/devices/platform/xhci-hcd/usb1*sde,/devices/platform/xhci-hcd/usb2*sde auto vfat default voldmanaged=UsbDriveE:auto -/devices/platform/xhci-hcd/usb1*sdf,/devices/platform/xhci-hcd/usb2*sdf auto vfat default voldmanaged=UsbDriveF:auto