CM10 updates

AndroidProducts.mk

@@ -18,4 +18,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/full_shooteru.mk
+    $(LOCAL_DIR)/shooteru.mk

BoardConfig.mk

@@ -24,31 +24,45 @@
 # variant, so that it gets overwritten by the parent (which goes
 # against the traditional rules of inheritance).
 
-# inherit from the proprietary version
--include vendor/htc/shooteru/BoardConfigVendor.mk
-
 # inherit from common msm8660
 -include device/htc/msm8660-common/BoardConfigCommon.mk
 
 # inherit from the proprietary version
 -include vendor/htc/shooteru/BoardConfigVendor.mk
 
-TARGET_SPECIFIC_HEADER_PATH := device/htc/shooteru/include
-
 TARGET_BOOTLOADER_BOARD_NAME := shooteru
 
-BOARD_KERNEL_CMDLINE := console=ttyHSL0 androidboot.hardware=shooteru no_console_suspend=1
-BOARD_KERNEL_BASE := 0x48000000
-BOARD_KERNEL_PAGE_SIZE := 2048 
-
 BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := shooteru
 
-COMMON_GLOBAL_CFLAGS += -DQCOM_ROTATOR_KERNEL_FORMATS
-TARGET_USES_OVERLAY := true
+# 3D Support
+TARGET_HARDWARE_3D := true
+
+# Kernel Details
+TARGET_KERNEL_CONFIG := shooter_u_defconfig
+TARGET_PREBUILT_KERNEL := device/htc/shooteru/prebuilt/zImage
+
+# -DQCOM_TUNNEL_LPA_ENABLED 
+TARGET_USES_QCOM_LPA := true
+COMMON_GLOBAL_CFLAGS += -DQCOM_ICS_LPA_COMPAT
+COMMON_GLOBAL_CFLAGS += -DQCOM_ACDB_ENABLED -DQCOM_VOIP_ENABLED
 
+# Camera
+TARGET_DISABLE_ARM_PIE := true
+BOARD_CAMERA_USE_MM_HEAP := true
 BOARD_HTC_3D_SUPPORT := true
 
-TARGET_HARDWARE_3D := true
+# Bluetooth/Wifi
+-include device/htc/msm8660-common/bcmdhd.mk
+
+# RIL
+BOARD_USES_LEGACY_RIL := true
+
+# Custom LUN File Path
+TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/class/android_usb/android0/f_mass_storage/lun0/file
+
+BOARD_KERNEL_CMDLINE := console=ttyHSL0 androidboot.hardware=shooteru no_console_suspend=1
+BOARD_KERNEL_BASE := 0x48000000
+BOARD_KERNEL_PAGE_SIZE := 2048
 
 # cat /proc/emmc
 #dev:        size     erasesize name
@@ -72,10 +86,6 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 1252770816
 BOARD_BOOTIMAGE_PARTITION_SIZE := 16777216
 BOARD_FLASH_BLOCK_SIZE := 262144
 
-## Kernel Details
-TARGET_KERNEL_CONFIG := shooter_u_defconfig
-TARGET_PREBUILT_KERNEL := device/htc/shooteru/prebuilt/zImage
-
 TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
 TARGET_RECOVERY_UI_LIB := librecovery_ui_shooteru
 TARGET_RECOVERY_INITRC := device/htc/shooteru/recovery/init.rc
@@ -85,69 +95,3 @@ BOARD_SDEXT_DEVICE := /dev/block/mmcblk1p2
 BOARD_USES_MMCUTILS := true
 BOARD_HAS_NO_MISC_PARTITION := true
 BOARD_HAS_NO_SELECT_BUTTON := true
-
-TARGET_ARCH_VARIANT_CPU := cortex-a9
-
-# Scorpion optimizations
-TARGET_USE_SCORPION_BIONIC_OPTIMIZATION := true
-TARGET_USE_SCORPION_PLD_SET := true
-TARGET_SCORPION_BIONIC_PLDOFFS := 6
-TARGET_SCORPION_BIONIC_PLDSIZE := 128
-
-# Audio
-COMMON_GLOBAL_CFLAGS += -DQCOM_ACDB_ENABLED -DQCOM_VOIP_ENABLED 
-COMMON_GLOBAL_CFLAGS += -DQCOM_HTC_AUDIO
-
-# Camera
-TARGET_DISABLE_ARM_PIE := true
-BOARD_CAMERA_USE_MM_HEAP := true
-COMMON_GLOBAL_CFLAGS += -DHTC_CAMERA
-DYNAMIC_SHARED_LIBV8SO := true
-
-# Graphics / Video
-COMMON_GLOBAL_CFLAGS += -DREFRESH_RATE=60 -DNO_QCOM_MVS -DNO_HW_VSYNC
-
-# -DQCOM_TUNNEL_LPA_ENABLED 
-TARGET_USES_QCOM_LPA := true
-COMMON_GLOBAL_CFLAGS += -DWITH_QCOM_LPA -DQCOM_ICS_LPA_COMPAT
-COMMON_GLOBAL_CFLAGS += -DQCOM_ACDB_ENABLED -DQCOM_VOIP_ENABLED -DQCOM_HTC_AUDIO
-
-# Stagefright
-COMMON_GLOBAL_CFLAGS += -DQCOM_ICS_DECODERS
-
-# Graphics
-TARGET_HAVE_BYPASS := false
-TARGET_USES_OVERLAY := true
-TARGET_QCOM_HDMI_OUT := true
-TARGET_QCOM_HDMI_RESOLUTION_AUTO := true
-
-# Bootanimation
-TARGET_BOOTANIMATION_PRELOAD := true
-
-# Custom LUN File Path
-TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/class/android_usb/android0/f_mass_storage/lun0/file
-
-# Wifi
-WIFI_BAND                        := 802_11_ABG
-WPA_SUPPLICANT_VERSION           := VER_0_8_X
-BOARD_WPA_SUPPLICANT_DRIVER      := WEXT
-BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_wext
-BOARD_HOSTAPD_DRIVER             := WEXT
-BOARD_HOSTAPD_PRIVATE_LIB        := lib_driver_cmd_wext
-BOARD_WLAN_DEVICE                := bcm4329
-WIFI_DRIVER_FW_PATH_STA          := "/vendor/firmware/fw_bcm4329.bin"
-WIFI_DRIVER_FW_PATH_AP           := "/vendor/firmware/fw_bcm4329_apsta.bin"
-WIFI_DRIVER_FW_PATH_PARAM        := "/sys/module/bcm4329/parameters/firmware_path"
-WIFI_DRIVER_MODULE_PATH          := "/system/lib/modules/bcm4329.ko"
-WIFI_DRIVER_MODULE_NAME          := "bcm4329"
-WIFI_DRIVER_MODULE_ARG           := "firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/proc/calibration iface_name=wlan"
-BOARD_WLAN_DEVICE_REV            := bcm4329
-
-# Bootanimation
-TARGET_BOOTANIMATION_PRELOAD := true
-
-# Custom LUN File Path
-TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/class/android_usb/android0/f_mass_storage/lun0/file
-
-TARGET_EXTRA_CFLAGS += $(call cc-option,-mtune=cortex-a9,$(call cc-option,-mtune=cortex-a8)) $(call cc-option,-mcpu=cortex-a9,$(call cc-option,-mcpu=cortex-a8))
-

cm.mk

@@ -1,16 +1,26 @@
-$(call inherit-product, device/htc/shooteru/full_shooteru.mk)
+# Inherit some common CM stuff.
+$(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
 # Inherit some common CM stuff.
 $(call inherit-product, vendor/cm/config/gsm.mk)
 
-# Inherit some common CM stuff.
-$(call inherit-product, vendor/cm/config/common_full_phone.mk)
+# Inherit device configuration
+$(call inherit-product, device/htc/shooter/shooteru.mk)
 
-PRODUCT_RELEASE_NAME := shooteru
+# Device naming
+PRODUCT_DEVICE := shooteru
+PRODUCT_NAME := cm_shooteru
+PRODUCT_BRAND := HTC
+PRODUCT_MANUFACTURER := HTC
+PRODUCT_MODEL := Evo 3D GSM
 
 PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_shooteru BUILD_FINGERPRINT="htc_europe/htc_shooteru/shooteru:4.0.3/IML74K/351412.1:user/release-keys" PRIVATE_BUILD_DESC="3.08.401.1 CL351412 release-keys"
 
+# Bootanimation
 TARGET_BOOTANIMATION_NAME := vertical-540x960
+TARGET_SCREEN_HEIGHT := 960
+TARGET_SCREEN_WIDTH := 540
 
-PRODUCT_NAME := cm_shooteru
-PRODUCT_DEVICE := shooteru
+# Release name
+PRODUCT_RELEASE_NAME := shooteru
+-include vendor/cm/config/common_versions.mk