diff options
| author | Praneeth Bajjuri <praneeth@ti.com> | 2016-07-18 22:19:12 -0500 |
|---|---|---|
| committer | Praneeth Bajjuri <praneeth@ti.com> | 2016-07-18 22:19:12 -0500 |
| commit | 4b3e49526997eef1c271ce86d62a5daab6b09ced (patch) | |
| tree | 62579deb1d7a76d2f460f20bfde69ab66330125d /device.mk | |
| parent | c1df3749380adff283fa4d0c232bd8c76c80111e (diff) | |
| parent | 7c4e82eafb1a019dfa4e03b16d7818f93aa51420 (diff) | |
| download | jacinto6evm-4b3e49526997eef1c271ce86d62a5daab6b09ced.tar.gz | |
Merge branch 'd-marshmallow-mr2-release' of git://git.omapzoom.org/device/ti/jacinto6evm into d-marshmallow-released-marshmallow-release
* 'd-marshmallow-mr2-release' of git://git.omapzoom.org/device/ti/jacinto6evm:
jacinto6evm: update fastboot script for J6 ECO Rev C
jacinto6evm: add modetest to product packages
media_codecs.xml: Publish AdaptivePlayback feature for AVC decoder
jacinto6evm: correct typo in usb rc file
jacinto6evm: fastboot: fix board_rev handling
jacinto6evm: fastboot: enable qspi flashing
jacinto6evm: add BOARD_GPU_DRIVERS
jacinto6evm: sepolicy: update crda rule for kernel4.4
jacinto6evm: sepolicy: updates for configFS
jacinto6evm: enable configFS based adb
jacinto6evm: media_codecs.xml: Define Limits for each mime type
jacinto6evm: update fastboot script for latest u-boot
jacinto6evm: remove dummy wake_lock
jacinto6evm: sepolicy: update block device names
jacinto6evm: fstab: update for Kernel 4.4
jacinto6evm: media_codecs: Add attributes for HW Codecs
jacinto6evm: update fastboot script for Kernel 4.4
TEMP: jacinto6evm: disable bluetooth
jacinto6evm: configure cpusets for J6 and J6 Eco
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Diffstat (limited to 'device.mk')
| -rw-r--r-- | device.mk | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -51,6 +51,10 @@ PRODUCT_COPY_FILES += \ device/ti/jacinto6evm/audio/jamr3/jamr3_mixer_paths.xml:system/etc/jamr3_mixer_paths.xml \ device/ti/jacinto6evm/audio/audio_policy.conf:system/etc/audio_policy.conf +# cpuset configuration +PRODUCT_COPY_FILES += \ + device/ti/jacinto6evm/init.jacinto6evmboard.cpuset.sh:system/bin/init.jacinto6evmboard.cpuset.sh + PRODUCT_PROPERTY_OVERRIDES := \ hwui.render_dirty_regions=false @@ -94,6 +98,7 @@ PRODUCT_PACKAGES += \ iontest \ ion_ti_test2 \ vpetest \ + modetest \ libdrm # Audio HAL modules @@ -127,7 +132,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ $(call inherit-product, frameworks/native/build/tablet-7in-hdpi-1024-dalvik-heap.mk) $(call inherit-product-if-exists, hardware/ti/dra7xx/jacinto6.mk) -$(call inherit-product-if-exists, hardware/ti/wpan/ti-wpan-products.mk) +#$(call inherit-product-if-exists, hardware/ti/wpan/ti-wpan-products.mk) $(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ti-jacinto6-vendor.mk) $(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ducati-full_jacinto6evm.mk) $(call inherit-product-if-exists, device/ti/proprietary-open/wl12xx/wlan/wl12xx-wlan-fw-products.mk) |