Pull Request

BoardConfigCommon.mk

@@ -14,136 +14,121 @@
 # limitations under the License.
 #
 
-# CPU
-TARGET_CPU_ABI := armeabi-v7a
-TARGET_CPU_ABI2 := armeabi
+TARGET_SPECIFIC_HEADER_PATH := device/lge/g2-common/include
+
+# Architecture
 TARGET_ARCH := arm
 TARGET_ARCH_VARIANT := armv7-a-neon
+TARGET_BOARD_PLATFORM := msm8974
+TARGET_BOARD_PLATFORM_GPU := qcom-adreno330
+TARGET_CPU_ABI := armeabi-v7a
+TARGET_CPU_ABI2 := armeabi
 TARGET_CPU_VARIANT := krait
-#TARGET_USE_QCOM_BIONIC_OPTIMIZATION := true
-
-TARGET_NO_RADIOIMAGE := true
-TARGET_NO_BOOTLOADER := true
+TARGET_GCC_VERSION_EXP := 4.9
 
 # Assertions
 TARGET_BOARD_INFO_FILE ?= device/lge/g2-common/board-info.txt
 
+# Bootloader
 TARGET_BOOTLOADER_BOARD_NAME := galbi
+TARGET_NO_BOOTLOADER := true
+TARGET_NO_RADIOIMAGE := true
 
-# Platform
-TARGET_BOARD_PLATFORM := msm8974
-TARGET_BOARD_PLATFORM_GPU := qcom-adreno330
-
-# Kernel information
-BOARD_KERNEL_BASE     := 0x00000000
-BOARD_KERNEL_CMDLINE := no_underclock=0 console=none androidboot.hardware=g2 androidboot.bootdevice=msm_sdcc.1 user_debug=31 msm_rtb.filter=0x0 mdss_mdp.panel=1:dsi:0:qcom,mdss_dsi_g2_lgd_cmd
-BOARD_MKBOOTIMG_ARGS  := --ramdisk_offset 0x05000000 --tags_offset 0x04800000
-BOARD_KERNEL_PAGESIZE := 2048
-BOARD_KERNEL_SEPARATED_DT := true
+# Kernel
 BOARD_CUSTOM_BOOTIMG := true
 BOARD_CUSTOM_BOOTIMG_MK := device/lge/g2-common/releasetools/mkbootimg.mk
+BOARD_KERNEL_BASE := 0x00000000
+BOARD_KERNEL_CMDLINE := no_underclock=0 console=ttyHSL0,115200,n8 androidboot.hardware=g2 androidboot.bootdevice=msm_sdcc.1 user_debug=31 msm_rtb.filter=0x0 mdss_mdp.panel=1:dsi:0:qcom,mdss_dsi_g2_lgd_cmd
+BOARD_KERNEL_PAGESIZE := 2048
+BOARD_KERNEL_SEPARATED_DT := true
+BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x05000000 --tags_offset 0x04800000
 TARGET_KERNEL_SOURCE := kernel/lge/msm8974
-TARGET_KERNEL_ARCH := arm
 
 # Audio
-BOARD_USES_ALSA_AUDIO:= true
 AUDIO_FEATURE_LOW_LATENCY_PRIMARY := true
+AUDIO_FEATURE_ENABLED_NEW_SAMPLE_RATE := true
+BOARD_USES_ALSA_AUDIO := true
 
+# Bluetooth
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/lge/g2-common/bluetooth
+BOARD_BLUEDROID_VENDOR_CONF := device/lge/g2-common/bluetooth/vnd_g2.txt
+BOARD_HAVE_BLUETOOTH := true
+BOARD_HAVE_BLUETOOTH_BCM := true
 
-# Wi-Fi
-BOARD_WPA_SUPPLICANT_DRIVER := NL80211
-WPA_SUPPLICANT_VERSION      := VER_0_8_X
-BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd
-BOARD_HOSTAPD_DRIVER        := NL80211
-BOARD_HOSTAPD_PRIVATE_LIB   := lib_driver_cmd_bcmdhd
-BOARD_WLAN_DEVICE           := bcmdhd
-WIFI_DRIVER_FW_PATH_PARAM   := "/sys/module/bcmdhd/parameters/firmware_path"
-WIFI_DRIVER_FW_PATH_STA     := "/system/etc/firmware/fw_bcmdhd.bin"
-WIFI_DRIVER_FW_PATH_AP      := "/system/etc/firmware/fw_bcmdhd_apsta.bin"
+# Camera
+COMMON_GLOBAL_CFLAGS += -DLG_CAMERA_HARDWARE
+USE_DEVICE_SPECIFIC_CAMERA := true
+
+# Charger
+BOARD_CHARGER_ENABLE_SUSPEND := true
+COMMON_GLOBAL_CFLAGS += \
+    -DBOARD_CHARGING_CMDLINE_NAME='"androidboot.mode"' \
+    -DBOARD_CHARGING_CMDLINE_VALUE='"chargerlogo"'
+
+# CMHW
+BOARD_HARDWARE_CLASS := device/lge/g2-common/cmhw/
 
 # Display
-USE_OPENGL_RENDERER := true
-TARGET_USES_ION := true
-#TARGET_USES_OVERLAY := true
-TARGET_USES_C2D_COMPOSITION := true
 HAVE_ADRENO_SOURCE := false
-OVERRIDE_RS_DRIVER := libRSDriver_adreno.so
-NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
-
-# EGL
 MAX_EGL_CACHE_KEY_SIZE := 12*1024
 MAX_EGL_CACHE_SIZE := 2048*1024
+NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
+OVERRIDE_RS_DRIVER := libRSDriver_adreno.so
+TARGET_USES_ION := true
+USE_OPENGL_RENDERER := true
 
-# Qualcomm HALs
-BOARD_USES_QCOM_HARDWARE := true
-
-# QCOM PowerHAL
-TARGET_POWERHAL_VARIANT := g2
+# Fonts
+EXTENDED_FONT_FOOTPRINT := true
 
 # Lights
 TARGET_PROVIDES_LIBLIGHT := true
 
-# Camera
-USE_DEVICE_SPECIFIC_CAMERA := true
-COMMON_GLOBAL_CFLAGS += -DLG_CAMERA_HARDWARE
-#COMMON_GLOBAL_CFLAGS += -DLPA_DEFAULT_BUFFER_SIZE=512
-
-# Flags
-#TARGET_RELEASE_CPPFLAGS += -DNEEDS_VECTORIMPL_SYMBOLS
-COMMON_GLOBAL_CFLAGS += -DNO_SECURE_DISCARD
-
-RECOVERY_FSTAB_VERSION = 2
-TARGET_RECOVERY_FSTAB = device/lge/g2-common/rootdir/etc/fstab.g2
-BOARD_USE_CUSTOM_RECOVERY_FONT := \"roboto_23x41.h\"
-TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
-BOARD_HAS_NO_SELECT_BUTTON := true
-COMMON_GLOBAL_CFLAGS += -DNO_SECURE_DISCARD
-
-TARGET_USERIMAGES_USE_EXT4 := true
-TARGET_USERIMAGES_USE_F2FS := true
+# Partitions
+BOARD_FLASH_BLOCK_SIZE := 131072
 BOARD_BOOTIMAGE_PARTITION_SIZE := 23068672 # 22M
+BOARD_CACHEIMAGE_PARTITION_SIZE := 734003200 #700M
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 23068672 # 22M
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560 # 2.5G (actually 2.75, but leave room for model variation)
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 13725837312 # 12.8G (its much larger, but this is enough for now)
-BOARD_CACHEIMAGE_PARTITION_SIZE := 734003200 #700M
-BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_FLASH_BLOCK_SIZE := 131072 # (BOARD_KERNEL_PAGESIZE * 64)
 
-# Bluetooth
-BOARD_HAVE_BLUETOOTH := true
-BOARD_HAVE_BLUETOOTH_BCM := true
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/lge/g2-common/bluetooth
-BOARD_BLUEDROID_VENDOR_CONF := device/lge/g2-common/bluetooth/vnd_g2.txt
+# Power
+TARGET_POWERHAL_VARIANT := g2
 
-# Fonts
-EXTENDED_FONT_FOOTPRINT := true
+# Qualcomm support
+BOARD_USES_QCOM_HARDWARE := true
+BOARD_USES_QC_TIME_SERVICES := true
 
-# Offmode Charging
-BOARD_CHARGER_ENABLE_SUSPEND := true
-COMMON_GLOBAL_CFLAGS += \
-    -DBOARD_CHARGING_CMDLINE_NAME='"androidboot.mode"' \
-    -DBOARD_CHARGING_CMDLINE_VALUE='"chargerlogo"'
+# Recovery
+COMMON_GLOBAL_CFLAGS += -DNO_SECURE_DISCARD
+TARGET_RECOVERY_FSTAB = device/lge/g2-common/rootdir/etc/fstab.g2
+TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
+TARGET_RECOVERY_UPDATER_LIBS := librecovery_updater_g2
+TARGET_USERIMAGES_USE_EXT4 := true
+TARGET_USERIMAGES_USE_F2FS := true
 
-# CM Hardware
-BOARD_HARDWARE_CLASS := device/lge/g2-common/cmhw/
+# Releasetools
+TARGET_RELEASETOOLS_EXTENSIONS := device/lge/g2-common/releasetools
+
+# RIL
+BOARD_RIL_CLASS := ../../../device/lge/g2-common/ril/
+TARGET_RELEASE_CPPFLAGS += -DNEEDS_LGE_RIL_SYMBOLS
 
 # SELinux policies
-# QCOM sepolicy
 include device/qcom/sepolicy/sepolicy.mk
 
 BOARD_SEPOLICY_DIRS += \
     device/lge/g2-common/sepolicy
 
-# RIL
-BOARD_RIL_CLASS := ../../../device/lge/g2-common/ril/
-TARGET_RELEASE_CPPFLAGS += -DNEEDS_LGE_RIL_SYMBOLS
-
-# Releasetools
-TARGET_RECOVERY_UPDATER_LIBS := librecovery_updater_g2
-TARGET_RELEASETOOLS_EXTENSIONS := device/lge/g2-common/releasetools
-
-# Qualcomm time
-BOARD_USES_QC_TIME_SERVICES := true
+BOARD_SEPOLICY_UNION += \
+    thermanager.te
 
-# Device headers
-TARGET_SPECIFIC_HEADER_PATH := device/lge/g2-common/include
+# Wi-Fi
+BOARD_WPA_SUPPLICANT_DRIVER := NL80211
+WPA_SUPPLICANT_VERSION      := VER_0_8_X
+BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd
+BOARD_HOSTAPD_DRIVER        := NL80211
+BOARD_HOSTAPD_PRIVATE_LIB   := lib_driver_cmd_bcmdhd
+BOARD_WLAN_DEVICE           := bcmdhd
+WIFI_DRIVER_FW_PATH_PARAM   := "/sys/module/bcmdhd/parameters/firmware_path"
+WIFI_DRIVER_FW_PATH_STA     := "/system/etc/firmware/fw_bcmdhd.bin"
+WIFI_DRIVER_FW_PATH_AP      := "/system/etc/firmware/fw_bcmdhd_apsta.bin"

bluetooth/vnd_g2.txt

@@ -1,13 +1,10 @@
 BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyHS99"
 FW_PATCHFILE_LOCATION = "/vendor/firmware/"
 FW_PRE_PATCH="/vendor/firmware/bcm4335_prepatch.hcd"
+FW_PATCH_SETTLEMENT_DELAY_MS = 100
 UART_TARGET_BAUD_RATE = 3000000
 LPM_IDLE_TIMEOUT_MULTIPLE = 5
 BT_WAKE_VIA_PROC = TRUE
-SCO_USE_I2S_INTERFACE = FALSE
 SCO_I2SPCM_IF_ROLE = 0
-BTVND_DBG = FALSE
-BTHW_DBG = FALSE
-VNDUSERIAL_DBG = FALSE
-UPIO_DBG = FALSE
+USE_AXI_BRIDGE_LOCK = TRUE
 UART_FORCE_TWO_STOPBITS = TRUE

configs/audio_effects.conf

@@ -278,30 +278,3 @@ effects {
 #
 # TODO: add default audio pre processor configurations after debug and tuning phase
 #
-
-# Audio output session configurations.
-# New for L, similar to above but for playback streams
-# Enables FX settings for a given stream type. Valid stream types are:
-# "default", "voice_call", "system", "ring", "music", "alarm", "notification",
-# "bluetooth_sco", "enforced_audible", "dtmf", "tts"
-
-output_session_processing {
-    music {
-        music_helper { }
-    }
-    ring {
-        ring_helper { }
-    }
-    alarm {
-        ring_helper { }
-    }
-    voice_call {
-        voice_helper { }
-    }
-    tts {
-        tts_helper { }
-    }
-    notification {
-        notification_helper { }
-    }
-}