Additional device files for SGH-T769.

Allows complete builds, in addition to recovery images.

BoardConfig.mk

@@ -23,16 +23,13 @@
 # WARNING: This line must come *before* including the proprietary
 # variant, so that it gets overwritten by the parent (which goes
 # against the traditional rules of inheritance).
-
-# inherit from the proprietary version
--include vendor/samsung/T769/BoardConfigVendor.mk
-
 USE_CAMERA_STUB := true
-BOARD_USES_GENERIC_AUDIO := false
 
-TARGET_NO_BOOTLOADER := true
-TARGET_NO_KERNEL := false
-TARGET_NO_RADIOIMAGE := true
+# inherit from common msm8660
+-include device/samsung/msm8660-common/BoardConfigCommon.mk
+
+# inherit from the proprietary version
+-include vendor/samsung/t769/BoardConfigVendor.mk
 
 TARGET_BOOTLOADER_BOARD_NAME := MSM8660_SURF
 TARGET_BOARD_PLATFORM := msm8660
@@ -48,63 +45,57 @@ TARGET_GLOBAL_CFLAGS += -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp
 TARGET_GLOBAL_CPPFLAGS += -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp
 
 BOARD_USE_CUSTOM_RECOVERY_FONT := "\"roboto_15x24.h\""
-TARGET_RECOVERY_INITRC := device/samsung/T769/recovery/init.rc
-BOARD_CUSTOM_GRAPHICS := ../../../device/samsung/T769/recovery/graphics.c
-BOARD_CUSTOM_RECOVERY_UI := ../../device/samsung/T769/recovery/recovery_ui.c
+TARGET_RECOVERY_INITRC := device/samsung/t769/recovery/init.rc
+BOARD_CUSTOM_GRAPHICS := ../../../device/samsung/t769/recovery/graphics.c
+BOARD_CUSTOM_RECOVERY_UI := ../../device/samsung/t769/recovery/recovery_ui.c
 BOARD_HAS_SDCARD_INTERNAL := true
 BOARD_HAS_INTERNAL_PARTITIONS := true
 
-BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom msm_watchdog.appsbark=0 msm_watchdog.enable=1 loglevel=4
-BOARD_KERNEL_BASE := 0x40400000
-BOARD_KERNEL_PAGESIZE := 2048
-BOARD_FORCE_RAMDISK_ADDRESS := 0x41900000
+TARGET_OTA_ASSERT_DEVICE := SGH-T769,t769,blaze4g
 
-# fix this up by examining /proc/mtd on a running device
-BOARD_BOOTIMAGE_PARTITION_SIZE := 0x00a00000
-BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x00a00000
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 0x25600000
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 0x80200000
-BOARD_FLASH_BLOCK_SIZE := 131072
+# Kernel
+TARGET_KERNEL_CONFIG        := cyanogenmod_t769_defconfig
+TARGET_KERNEL_SOURCE        := kernel/samsung/msm8660-common
+BOARD_KERNEL_CMDLINE        := androidboot.hardware=qcom usb_id_pin_rework=true no_console_suspend=true zcache
+BOARD_KERNEL_BASE           := 0x40400000
+BOARD_KERNEL_PAGESIZE       := 2048
+BOARD_FORCE_RAMDISK_ADDRESS := 0x41800000
 
-TARGET_PREBUILT_KERNEL := device/samsung/T769/kernel
+# cat /proc/emmc
+#dev:        size     erasesize name
+#mmcblk0p22: 00fffc00 00000200 "recovery"
+#mmcblk0p8: 01000000 00000200 "boot"
+#mmcblk0p24: 5ffffc00 00000200 "system"
+#mmcblk0p26: 13fffe00 00000200 "cache"
+#mmcblk0p25: 9ffffe00 00000200 "userdata"
 
-BOARD_HAS_NO_SELECT_BUTTON := true
-# Use this flag if the board has a ext4 partition larger than 2gb
-BOARD_HAS_LARGE_FILESYSTEM := true
 TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_HAS_NO_MISC_PARTITION := true
-BOARD_USES_MMCUTILS := true
-BOARD_VOLD_EMMC_SHARES_DEV_MAJOR := true
-BOARD_VOLD_MAX_PARTITIONS := 28
-BOARD_USES_SAMSUNG_AUDIO_STUB := true
-
-BOARD_DATA_DEVICE := /dev/block/mmcblk0p25
-BOARD_DATA_FILESYSTEM := ext4
-BOARD_DATA_FILESYSTEM_OPTIONS := nosuid,nodev,relatime,barrier=1,noauto_da_alloc
-BOARD_SYSTEM_DEVICE := /dev/block/mmcblk0p24
-BOARD_SYSTEM_FILESYSTEM_OPTIONS := noatime,nodiratime,barrier=1,noauto_da_alloc
-BOARD_SYSTEM_FILESYSTEM := ext4
-BOARD_CACHE_DEVICE := /dev/block/mmcblk0p26
-BOARD_CACHE_FILESYSTEM := ext4
-BOARD_CACHE_FILESYSTEM_OPTIONS := nosuid,nodev,relatime,barrier=1,noauto_da_alloc
+BOARD_BOOTIMAGE_PARTITION_SIZE := 16777216
+BOARD_RECOVERYIMAGE_PARTITION_SIZE := 16776192
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 838860800
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 20044333056
+BOARD_FLASH_BLOCK_SIZE := 131072
 
 BOARD_SDCARD_DEVICE_PRIMARY := /dev/block/mmcblk1p1
-BOARD_SDCARD_DEVICE_SECONDARY := /dev/block/mmcblk1
-#BOARD_SDCARD_DEVICE_INTERNAL := /dev/block/mmcblk0p28
-BOARD_UMS_LUNFILE := /sys/devices/platform/usb_mass_storage/lun1/file
+BOARD_SDCARD_DEVICE_SECONDARY := /dev/block/mmcblk0p28
+BOARD_SDEXT_DEVICE := /dev/block/mmcblk1p2
+BOARD_USES_MMCUTILS := true
+BOARD_HAS_NO_MISC_PARTITION := true
+BOARD_HAS_NO_SELECT_BUTTON := true
 
 USE_OPENGL_RENDERER :=true
 
-# WiFi
-BOARD_WPA_SUPPLICANT_DRIVER := WEXT
-WPA_SUPPLICANT_VERSION      := VER_0_6_X
-BOARD_WLAN_DEVICE           := bcm4330
-WIFI_DRIVER_MODULE_PATH     := "/system/lib/modules/dhd.ko"
-WIFI_DRIVER_FW_STA_PATH     := "/system/etc/wifi/bcm4330_sta.bin"
-WIFI_DRIVER_FW_AP_PATH      := "/system/etc/wifi/bcm4330_aps.bin"
-WIFI_DRIVER_MODULE_ARG      := "firmware_path=/system/etc/wifi/bcm4330_mfg.bin nvram_path=/system/etc/wifi/nvram_mfg.txt"
-WIFI_DRIVER_MODULE_NAME     := "dhd"
-
-# Bluetooth
-BOARD_HAVE_BLUETOOTH := true
-BOARD_HAVE_BLUETOOTH_BCM := true
+# Suppress the WIPE command since it can brick our EMMC
+BOARD_SUPPRESS_EMMC_WIPE := true
+
+# Workaround for glitches while cropping bypass layers
+TARGET_NO_BYPASS_CROPPING := true
+
+# MTP
+#BOARD_MTP_DEVICE := "/dev/mtp_usb"
+
+# Disable initlogo, Samsungs framebuffer is weird
+TARGET_NO_INITLOGO := true
+
+# Preload the boot animation to avoid jerkiness
+TARGET_BOOTANIMATION_PRELOAD := true

cm.dependencies

@@ -0,0 +1,11 @@
+[
+  {
+    "repository": "android_kernel_samsung_msm8660-common",
+    "target_path": "kernel/samsung/msm8660-common"
+  },
+  {
+    "repository": "android_device_samsung_msm8660-common",
+    "target_path": "device/samsung/msm8660-common"
+  }
+]
+

cm.mk

@@ -1,18 +1,17 @@
-## Specify phone tech before including full_phone
+$(call inherit-product, device/samsung/t769/full_t769.mk)
+
+# Inherit some common CM stuff.
 $(call inherit-product, vendor/cm/config/gsm.mk)
 
-# Release name
-PRODUCT_RELEASE_NAME := T769 
+# Enhanced NFC
+$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
 
 # Inherit some common CM stuff.
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
-# Inherit device configuration
-$(call inherit-product, device/samsung/T769/device_T769.mk)
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SGH-T769 TARGET_DEVICE=SGH-T769 BUILD_FINGERPRINT="samsung/SGH-T769/SGH-T769:4.1.1/IMM76D/UVLH5:user/release-keys" PRIVATE_BUILD_DESC="SGH-T769-user 4.1.1 IMM76D UVLH5 release-keys"
+
+TARGET_BOOTANIMATION_NAME := 480
 
-## Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := T769
-PRODUCT_NAME := cm_T769
-PRODUCT_BRAND := samsung
-PRODUCT_MODEL := T769
-PRODUCT_MANUFACTURER := samsung
+PRODUCT_NAME := cm_t769
+PRODUCT_DEVICE := t769

device-proprietary-files.txt

@@ -0,0 +1,30 @@
+#
+# This file lists all of the proprietary blobs that need to be
+# extracted from a stock device. The extract-files.sh script
+# parses this file and copies the blobs into the vendor and build
+# trees as needed.
+#
+# File format:
+#   - Comments lines start with a hash (#) character and will be
+#     ignore.
+#   - Blobs should be listed with their path relative to /system
+#     on the device.
+#   - Options for a particular blob are specified in a comment
+#     after the blob path.
+#
+# Blob options:
+#   - needed_for_build: the blob will also be copied into the obj
+#     directory for use in the build of other open source files.
+#   - optional: if the blob is not found, extraction will not abort.
+#     directory for use in the build of other open source files.
+#
+
+# Add device specific blobs here
+# NFC
+lib/hw/nfc.qcom.so
+lib/libpn544_fw.so
+
+# Wi-Fi
+etc/wifi/nvram_net.txt_murata
+etc/wifi/nvram_mfg.txt_murata
+

device_t769.mk

@@ -0,0 +1,73 @@
+#
+# 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)
+
+## The gps config appropriate for this device
+PRODUCT_COPY_FILES += device/common/gps/gps.conf_US_SUPL:system/etc/gps.conf
+
+## (2) Also get non-open-source specific aspects if available
+$(call inherit-product-if-exists, vendor/samsung/t769/t769-vendor.mk)
+
+## misc
+PRODUCT_PROPERTY_OVERRIDES += \
+    dalvik.vm.dexopt-flags=m=v,o=y
+
+## overlays
+DEVICE_PACKAGE_OVERLAYS += device/samsung/t769/overlay
+
+# Device uses high-density artwork where available
+PRODUCT_AAPT_CONFIG := normal hdpi
+PRODUCT_AAPT_PREF_CONFIG := hdpi
+
+# Hardware
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml
+
+# Ramdisk
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/ramdisk/init.qcom.rc:root/init.qcom.rc \
+    $(LOCAL_PATH)/ramdisk/init.qcom.sh:root/init.qcom.sh \
+    $(LOCAL_PATH)/ramdisk/init.qcom.usb.rc:root/init.qcom.usb.rc \
+    $(LOCAL_PATH)/ramdisk/init.qcom.usb.sh:root/init.qcom.usb.sh \
+    $(LOCAL_PATH)/ramdisk/init.target.rc:root/init.target.rc \
+    $(LOCAL_PATH)/ramdisk/ueventd.rc:root/ueventd.rc \
+    $(LOCAL_PATH)/ramdisk/init.emmc.rc:root/init.emmc.rc \
+    $(LOCAL_PATH)/fstab.qcom:root/fstab.qcom \
+	$(LOCAL_PATH)/ramdisk/init.qcom.lpm_boot.sh:root/init.qcom.lpm_boot.sh \
+	$(LOCAL_PATH)/ramdisk/lpm.rc:root/lpm.rc \
+	$(LOCAL_PATH)/recovery/postrecoveryboot.sh:recovery/root/sbin/postrecoveryboot.sh
+
+# BT firmware
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/firmware/bcm4330B1.hcd:system/etc/firmware/bcm4330B1.hcd
+
+# Vold
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/vold.fstab:system/etc/vold.fstab
+
+# QRNGD
+PRODUCT_PACKAGES += qrngd
+
+# common msm8660
+$(call inherit-product, device/samsung/msm8660-common/msm8660.mk)
+
+$(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk)
+
+$(call inherit-product-if-exists, vendor/samsung/t769/t769-vendor.mk)
+
+# NFC
+BOARD_HAVE_NFC := true

extract-files.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# This script is maintained in the common tree
+../msm8660-common/extract-files.sh $*
+

fstab.qcom

@@ -0,0 +1,9 @@
+# Android fstab file.
+#<src>                   <mnt_point>         <type>    <mnt_flags and options>                                      <fs_mgr_flags>
+# 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/mmcblk0p24    /system             ext4      ro,barrier=1                                                 wait
+/dev/block/mmcblk0p26    /cache              ext4      nosuid,nodev,barrier=1                                       wait,check
+/dev/block/mmcblk0p21    /efs                ext4      nosuid,nodev,barrier=1                                       wait.check
+/dev/block/mmcblk0p25    /data               ext4      noatime,nosuid,nodev,barrier=1,noauto_da_alloc               wait,check