diff --git a/BoardConfig.mk b/BoardConfig.mk index 9f987f2..16d3464 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -52,9 +52,8 @@ WIFI_DRIVER_MODULE_NAME := "bcm4329" BOARD_KERNEL_CMDLINE := no_console_suspend=1 msmsdcc_sdioirq=1 wire.search_count=5 BOARD_USES_GENERIC_AUDIO := false - -BOARD_KERNEL_CMDLINE := no_console_suspend=1 -BOARD_KERNEL_BASE := 0x11800000 +BOARD_KERNEL_BASE := 0x20000000 +BOARD_KERNEL_NEW_PPPOX := true BOARD_HAVE_BLUETOOTH := true BOARD_HAVE_BLUETOOTH_BCM := true @@ -65,27 +64,18 @@ BOARD_VENDOR_USE_AKMD := akm8973 BOARD_EGL_CFG := device/htc/leo/egl.cfg +BOARD_USE_FROYO_LIBCAMERA := true + BOARD_USES_QCOM_LIBS := true BOARD_USES_QCOM_LIBRPC := true +BOARD_USES_QCOM_GPS := true -BOARD_USE_OPENSSL_ENGINE := true - -BOARD_USE_FROYO_LIBCAMERA := true -BOARD_USE_REVERSE_FFC := true - -# to enable the GPS HAL -BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := leo -# AMSS version to use for GPS -BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 1240 - -# Use RGB565 surfaces until userspace drivers are upgraded -BOARD_NO_RGBX_8888 := true +BOARD_HAVE_FM_RADIO := true +BOARD_GLOBAL_CFLAGS += -DHAVE_FM_RADIO # Use Special Leo update TARGET_USES_LEOUPDATE := true -BOARD_HAVE_FM_RADIO := true -BOARD_GLOBAL_CFLAGS += -DHAVE_FM_RADIO # # cat /proc/mtd @@ -106,3 +96,8 @@ BOARD_FLASH_BLOCK_SIZE := 131072 TARGET_RELEASETOOLS_EXTENSIONS := device/htc/common TARGET_PREBUILT_KERNEL := device/htc/leo/kernel + +# to enable the GPS HAL +BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := htcleo +# AMSS version to use for GPS +BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 3200 diff --git a/initrd.gz b/initrd.gz index 5d10d02..ada23c0 100644 Binary files a/initrd.gz and b/initrd.gz differ diff --git a/kernel b/kernel index 117cdc1..ae54410 100755 Binary files a/kernel and b/kernel differ diff --git a/leo.mk b/leo.mk index bd1b8dc..e76d921 100755 --- a/leo.mk +++ b/leo.mk @@ -19,9 +19,6 @@ # not specialized for any geography. # -# The gps config appropriate for this device -PRODUCT_COPY_FILES += \ - device/htc/leo/gps.conf:system/etc/gps.conf ## (1) First, the most specific values, i.e. the aspects that are specific to GSM @@ -50,9 +47,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.telephony.default_network=0 -# For HSDPA low throughput + +# Set default_france.acdb to audio_ctl driver if the ro.cid is HTC__203 PRODUCT_PROPERTY_OVERRIDES += \ - ro.ril.disable.power.collapse = 1 + ro.ril.enable.prl.recognition=1 # AGPS otpions PRODUCT_PROPERTY_OVERRIDES += \ @@ -63,17 +61,12 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.opengles.version=131072 -# For PDP overlap problem -PRODUCT_PROPERTY_OVERRIDES += \ - ro.ril.avoid.pdp.overlap = 1 # we have enough storage space to hold precise GC data PRODUCT_TAGS += dalvik.gc.type-precise -# Set default_france.acdb to audio_ctl driver if the ro.cid is HTC__203 PRODUCT_PROPERTY_OVERRIDES += \ - ro.ril.enable.prl.recognition = 0 - + ro.media.dec.jpeg.memcap=20000000 # This is a high density device with more memory, so larger vm heaps for it. PRODUCT_PROPERTY_OVERRIDES += \ @@ -97,6 +90,7 @@ PRODUCT_COPY_FILES += \ frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ frameworks/base/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \ frameworks/base/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \ + frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \ frameworks/base/data/etc/android.hardware.touchscreen.multitouch.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.xml # media config xml file @@ -111,7 +105,7 @@ PRODUCT_PACKAGES += \ copybit.qsd8k \ lights.leo \ leo-reference-ril \ - gps.leo + gps.htcleo @@ -142,10 +136,11 @@ PRODUCT_COPY_FILES += \ device/htc/leo/modules/cifs.ko:system/lib/modules/cifs.ko \ device/htc/leo/modules/msm_rmnet.ko:system/lib/modules/msm_rmnet.ko \ device/htc/leo/modules/nls_utf8.ko:system/lib/modules/nls_utf8.ko \ - device/htc/leo/modules/tun.ko:system/lib/modules/tun.ko + device/htc/leo/modules/tun.ko:system/lib/modules/tun.ko \ + device/htc/leo/modules/fuse.ko:system/lib/modules/fuse.ko PRODUCT_COPY_FILES += \ - device/htc/leo/zImage:boot/zImage \ + device/htc/leo/kernel:boot/zImage \ device/htc/leo/initrd.gz:boot/initrd.gz \ ifeq ($(TARGET_PREBUILT_KERNEL),) @@ -154,6 +149,9 @@ else LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) endif +# The gps config appropriate for this device +$(call inherit-product, device/common/gps/gps_as_supl.mk) + PRODUCT_COPY_FILES += \ $(LOCAL_KERNEL):kernel diff --git a/liblights/Android.mk b/liblights/Android.mk index 2e9b2ca..09857ad 100644 --- a/liblights/Android.mk +++ b/liblights/Android.mk @@ -18,7 +18,7 @@ ifneq ($(TARGET_SIMULATOR),true) include $(CLEAR_VARS) -LOCAL_MODULE := lights.leo +LOCAL_MODULE := lights.htcleo LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw diff --git a/modules/bcm4329.ko b/modules/bcm4329.ko index 7ada39e..9fab85d 100644 Binary files a/modules/bcm4329.ko and b/modules/bcm4329.ko differ diff --git a/modules/cifs.ko b/modules/cifs.ko index 0f2d511..43bd20d 100644 Binary files a/modules/cifs.ko and b/modules/cifs.ko differ diff --git a/modules/msm_rmnet.ko b/modules/msm_rmnet.ko index cbd6aab..d5fcd62 100644 Binary files a/modules/msm_rmnet.ko and b/modules/msm_rmnet.ko differ diff --git a/modules/nls_utf8.ko b/modules/nls_utf8.ko index abbdc3a..c722719 100644 Binary files a/modules/nls_utf8.ko and b/modules/nls_utf8.ko differ diff --git a/modules/tun.ko b/modules/tun.ko index 8264074..c4b1720 100644 Binary files a/modules/tun.ko and b/modules/tun.ko differ diff --git a/zImage b/zImage deleted file mode 100644 index 91ef8f1..0000000 Binary files a/zImage and /dev/null differ