diff options
author | Praneeth Bajjuri | 2017-01-17 22:33:05 -0600 |
---|---|---|
committer | Praneeth Bajjuri | 2017-01-17 22:33:05 -0600 |
commit | 069060533eed5dc0a80bf1f8f180a9dc70b2378b (patch) | |
tree | 65e23758d278437f6df1500471b76edb52c3ac31 | |
parent | dd9b84a0be46334e1218bbd9a9f8d9664631d1cd (diff) | |
parent | 52dad3e58bb2b1bf823caeb854348d2f0a413e1e (diff) | |
download | device-ti-jacinto6evm-d-nougat-release.tar.gz device-ti-jacinto6evm-d-nougat-release.tar.xz device-ti-jacinto6evm-d-nougat-release.zip |
Merge branch 'd-nougat-release' of git://git.omapzoom.org/device/ti/jacinto6evm into d-nougat-released-nougat-release
* 'd-nougat-release' of git://git.omapzoom.org/device/ti/jacinto6evm:
TEMP: disable bluetooth hardware feature
Revert "jacinto6evm: changes for defining auto platform"
jacinto6evm: add vsync offsets
jacinto6evm: remove extra hardware feature
jacinto6evm: media_codecs.xml: fix alignment value
jacinto6evm: Set product files and packages for APPE based audio
jacinto6evm: Add the 'radio_app' service
jacinto6evm: Start lad_dra7xx with GateMP
jacinto6evm: Set permissions for IPC daemon and device files
jacinto6evm: Set 'media' user for i2c devices
jacinto6evm: update ramdisk offset
jacinto6evm: sepolicy: add rules for cpuset script
jacinto6evm: sepolicy: update pvr module_load permission
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-rw-r--r-- | BoardConfig.mk | 6 | ||||
-rw-r--r-- | audio/Android.mk | 5 | ||||
-rw-r--r-- | device.mk | 20 | ||||
-rw-r--r-- | init.jacinto6evmboard.rc | 14 | ||||
-rw-r--r-- | media_codecs.xml | 8 | ||||
-rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 9 | ||||
-rw-r--r-- | sepolicy/file_contexts | 3 | ||||
-rw-r--r-- | sepolicy/init-cpuset-sh.te | 7 | ||||
-rw-r--r-- | sepolicy/pvr.te | 1 | ||||
-rw-r--r-- | tablet_core_hardware_jacinto6evm.xml | 3 | ||||
-rw-r--r-- | ueventd.jacinto6evmboard.rc | 14 |
11 files changed, 61 insertions, 29 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index c475c49..4170a7d 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk | |||
@@ -40,7 +40,7 @@ TARGET_NO_BOOTLOADER := true | |||
40 | 40 | ||
41 | BOARD_KERNEL_BASE := 0x80000000 | 41 | BOARD_KERNEL_BASE := 0x80000000 |
42 | #BOARD_KERNEL_CMDLINE := console=ttyO2,115200n8 mem=1024M androidboot.console=ttyO2 androidboot.hardware=jacinto6evmboard vram=20M omapfb.vram=0:16M | 42 | #BOARD_KERNEL_CMDLINE := console=ttyO2,115200n8 mem=1024M androidboot.console=ttyO2 androidboot.hardware=jacinto6evmboard vram=20M omapfb.vram=0:16M |
43 | BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x01f00000 | 43 | BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x03000000 |
44 | 44 | ||
45 | TARGET_NO_RADIOIMAGE := true | 45 | TARGET_NO_RADIOIMAGE := true |
46 | TARGET_BOARD_PLATFORM := jacinto6 | 46 | TARGET_BOARD_PLATFORM := jacinto6 |
@@ -79,3 +79,7 @@ BOARD_SEPOLICY_DIRS := device/ti/jacinto6evm/sepolicy | |||
79 | 79 | ||
80 | # lidbrm driver | 80 | # lidbrm driver |
81 | BOARD_GPU_DRIVERS := omapdrm | 81 | BOARD_GPU_DRIVERS := omapdrm |
82 | |||
83 | # DispSync vsync offsets in nanoseconds | ||
84 | VSYNC_EVENT_PHASE_OFFSET_NS := 7500000 | ||
85 | SF_VSYNC_EVENT_PHASE_OFFSET_NS := 5000000 | ||
diff --git a/audio/Android.mk b/audio/Android.mk index 9e14b16..d73e0c1 100644 --- a/audio/Android.mk +++ b/audio/Android.mk | |||
@@ -13,4 +13,9 @@ | |||
13 | # limitations under the License. | 13 | # limitations under the License. |
14 | 14 | ||
15 | LOCAL_PATH := $(call my-dir) | 15 | LOCAL_PATH := $(call my-dir) |
16 | |||
17 | ifeq ($(APPE_AUDIO),true) | ||
18 | include $(LOCAL_PATH)/hdmi/Android.mk | ||
19 | else | ||
16 | include $(call all-makefiles-under,$(LOCAL_PATH)) | 20 | include $(call all-makefiles-under,$(LOCAL_PATH)) |
21 | endif | ||
@@ -14,6 +14,9 @@ | |||
14 | # limitations under the License. | 14 | # limitations under the License. |
15 | # | 15 | # |
16 | 16 | ||
17 | # Audio Post Processing Engine (APPE) | ||
18 | APPE_AUDIO := false | ||
19 | |||
17 | ifeq ($(TARGET_PREBUILT_KERNEL),) | 20 | ifeq ($(TARGET_PREBUILT_KERNEL),) |
18 | LOCAL_KERNEL := device/ti/jacinto6evm/kernel | 21 | LOCAL_KERNEL := device/ti/jacinto6evm/kernel |
19 | else | 22 | else |
@@ -42,13 +45,19 @@ PRODUCT_COPY_FILES := \ | |||
42 | 45 | ||
43 | # These are the hardware-specific features | 46 | # These are the hardware-specific features |
44 | PRODUCT_COPY_FILES += \ | 47 | PRODUCT_COPY_FILES += \ |
45 | frameworks/native/data/etc/android.hardware.camera.xml:system/etc/permissions/android.hardware.camera.xml \ | 48 | frameworks/native/data/etc/android.hardware.camera.xml:system/etc/permissions/android.hardware.camera.xml |
46 | frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \ | ||
47 | 49 | ||
48 | # Audio | 50 | # Audio |
51 | ifeq ($(APPE_AUDIO),true) | ||
52 | PRODUCT_COPY_FILES += \ | ||
53 | hardware/ti/radio/vis_sdk/packages/android/hal/mixer_paths.xml:system/etc/mixer_paths.xml | ||
54 | else | ||
49 | PRODUCT_COPY_FILES += \ | 55 | PRODUCT_COPY_FILES += \ |
50 | device/ti/jacinto6evm/audio/primary/mixer_paths.xml:system/etc/mixer_paths.xml \ | 56 | device/ti/jacinto6evm/audio/primary/mixer_paths.xml:system/etc/mixer_paths.xml \ |
51 | device/ti/jacinto6evm/audio/jamr3/jamr3_mixer_paths.xml:system/etc/jamr3_mixer_paths.xml \ | 57 | device/ti/jacinto6evm/audio/jamr3/jamr3_mixer_paths.xml:system/etc/jamr3_mixer_paths.xml |
58 | endif | ||
59 | |||
60 | PRODUCT_COPY_FILES += \ | ||
52 | device/ti/jacinto6evm/audio/audio_policy.conf:system/etc/audio_policy.conf | 61 | device/ti/jacinto6evm/audio/audio_policy.conf:system/etc/audio_policy.conf |
53 | 62 | ||
54 | # cpuset configuration | 63 | # cpuset configuration |
@@ -103,12 +112,15 @@ PRODUCT_PACKAGES += \ | |||
103 | 112 | ||
104 | # Audio HAL modules | 113 | # Audio HAL modules |
105 | PRODUCT_PACKAGES += audio.primary.jacinto6 | 114 | PRODUCT_PACKAGES += audio.primary.jacinto6 |
106 | PRODUCT_PACKAGES += audio.jamr3.jacinto6 | ||
107 | PRODUCT_PACKAGES += audio.hdmi.jacinto6 | 115 | PRODUCT_PACKAGES += audio.hdmi.jacinto6 |
108 | # BlueDroid a2dp Audio HAL module | 116 | # BlueDroid a2dp Audio HAL module |
109 | PRODUCT_PACKAGES += audio.a2dp.default | 117 | PRODUCT_PACKAGES += audio.a2dp.default |
110 | # Remote submix | 118 | # Remote submix |
111 | PRODUCT_PACKAGES += audio.r_submix.default | 119 | PRODUCT_PACKAGES += audio.r_submix.default |
120 | # JAMR3 Audio HAL module | ||
121 | ifneq ($(APPE_AUDIO),true) | ||
122 | PRODUCT_PACKAGES += audio.jamr3.jacinto6 | ||
123 | endif | ||
112 | 124 | ||
113 | PRODUCT_PACKAGES += \ | 125 | PRODUCT_PACKAGES += \ |
114 | tinymix \ | 126 | tinymix \ |
diff --git a/init.jacinto6evmboard.rc b/init.jacinto6evmboard.rc index 318d6f4..00efc75 100644 --- a/init.jacinto6evmboard.rc +++ b/init.jacinto6evmboard.rc | |||
@@ -15,8 +15,8 @@ on post-fs-data | |||
15 | setprop vold.post_fs_data_done 1 | 15 | setprop vold.post_fs_data_done 1 |
16 | mkdir /data/misc/dhcp 0770 dhcp dhcp | 16 | mkdir /data/misc/dhcp 0770 dhcp dhcp |
17 | chown dhcp dhcp /data/misc/dhcp | 17 | chown dhcp dhcp /data/misc/dhcp |
18 | mkdir /data/lad 0770 system system | 18 | mkdir /data/lad 0770 media system |
19 | mkdir /data/lad/LAD 0770 system system | 19 | mkdir /data/lad/LAD 0770 media system |
20 | 20 | ||
21 | # enabling thermal zone for mpu | 21 | # enabling thermal zone for mpu |
22 | write /sys/class/thermal/thermal_zone0/mode enabled | 22 | write /sys/class/thermal/thermal_zone0/mode enabled |
@@ -136,10 +136,16 @@ service hostapd_bin /system/bin/hostapd -d /data/misc/wifi/hostapd.conf | |||
136 | disabled | 136 | disabled |
137 | oneshot | 137 | oneshot |
138 | 138 | ||
139 | service lad_dra7xx /system/bin/logwrapper /system/bin/lad_dra7xx | 139 | service lad_dra7xx /system/bin/logwrapper /system/bin/lad_dra7xx -g |
140 | class main | 140 | class main |
141 | user system | 141 | user media |
142 | group system | 142 | group system |
143 | oneshot | ||
144 | |||
145 | service radio_app /system/bin/logwrapper /system/bin/RadioApp -h eth | ||
146 | class main | ||
147 | user media | ||
148 | group system inet | ||
143 | disabled | 149 | disabled |
144 | oneshot | 150 | oneshot |
145 | 151 | ||
diff --git a/media_codecs.xml b/media_codecs.xml index 6c34266..3482216 100644 --- a/media_codecs.xml +++ b/media_codecs.xml | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | <Type name="video/avc"> | 28 | <Type name="video/avc"> |
29 | <Limit name="size" min="64x64" max="1920x1088" /> | 29 | <Limit name="size" min="64x64" max="1920x1088" /> |
30 | <Limit name="alignment" value="16x16" /> | 30 | <Limit name="alignment" value="2x2" /> |
31 | <Limit name="block-size" value="16x16" /> | 31 | <Limit name="block-size" value="16x16" /> |
32 | <Limit name="blocks-per-second" min="1" max="489600" /> | 32 | <Limit name="blocks-per-second" min="1" max="489600" /> |
33 | <Limit name="bitrate" range="1-62500000" /> | 33 | <Limit name="bitrate" range="1-62500000" /> |
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | <Type name="video/mp4v-es"> | 37 | <Type name="video/mp4v-es"> |
38 | <Limit name="size" min="64x64" max="1920x1088" /> | 38 | <Limit name="size" min="64x64" max="1920x1088" /> |
39 | <Limit name="alignment" value="16x16" /> | 39 | <Limit name="alignment" value="2x2" /> |
40 | <Limit name="block-size" value="16x16" /> | 40 | <Limit name="block-size" value="16x16" /> |
41 | <Limit name="blocks-per-second" min="1" max="489600" /> | 41 | <Limit name="blocks-per-second" min="1" max="489600" /> |
42 | <Limit name="bitrate" range="1-62500000" /> | 42 | <Limit name="bitrate" range="1-62500000" /> |
@@ -44,7 +44,7 @@ | |||
44 | 44 | ||
45 | <Type name="video/3gpp"> | 45 | <Type name="video/3gpp"> |
46 | <Limit name="size" min="64x64" max="1920x1088" /> | 46 | <Limit name="size" min="64x64" max="1920x1088" /> |
47 | <Limit name="alignment" value="16x16" /> | 47 | <Limit name="alignment" value="2x2" /> |
48 | <Limit name="block-size" value="16x16" /> | 48 | <Limit name="block-size" value="16x16" /> |
49 | <Limit name="blocks-per-second" min="1" max="489600" /> | 49 | <Limit name="blocks-per-second" min="1" max="489600" /> |
50 | <Limit name="bitrate" range="1-62500000" /> | 50 | <Limit name="bitrate" range="1-62500000" /> |
@@ -52,7 +52,7 @@ | |||
52 | 52 | ||
53 | <Type name="video/mpeg2"> | 53 | <Type name="video/mpeg2"> |
54 | <Limit name="size" min="64x64" max="1920x1088" /> | 54 | <Limit name="size" min="64x64" max="1920x1088" /> |
55 | <Limit name="alignment" value="16x16" /> | 55 | <Limit name="alignment" value="2x2" /> |
56 | <Limit name="block-size" value="16x16" /> | 56 | <Limit name="block-size" value="16x16" /> |
57 | <Limit name="blocks-per-second" min="1" max="489600" /> | 57 | <Limit name="blocks-per-second" min="1" max="489600" /> |
58 | <Limit name="bitrate" range="1-62500000" /> | 58 | <Limit name="bitrate" range="1-62500000" /> |
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index efaf79e..009fd1f 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml | |||
@@ -101,13 +101,4 @@ | |||
101 | --> | 101 | --> |
102 | <bool name="config_enableWifiDisplay">true</bool> | 102 | <bool name="config_enableWifiDisplay">true</bool> |
103 | 103 | ||
104 | <!-- Control the default UI mode type to use when there is no other type override | ||
105 | happening. One of the following values (See Configuration.java): | ||
106 | 1 UI_MODE_TYPE_NORMAL | ||
107 | 4 UI_MODE_TYPE_TELEVISION | ||
108 | 5 UI_MODE_TYPE_APPLIANCE | ||
109 | 6 UI_MODE_TYPE_WATCH | ||
110 | Any other values will have surprising consequences. --> | ||
111 | <integer name="config_defaultUiModeType">3</integer> | ||
112 | |||
113 | </resources> | 104 | </resources> |
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 666c7e1..6ac1f73 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts | |||
@@ -22,6 +22,9 @@ | |||
22 | #Real Time Clock | 22 | #Real Time Clock |
23 | /dev/rtc0 u:object_r:rtc:s0 | 23 | /dev/rtc0 u:object_r:rtc:s0 |
24 | 24 | ||
25 | #cpuset script | ||
26 | /system/bin/init.jacinto6evmboard.cpuset.sh u:object_r:init-cpuset-sh_exec:s0 | ||
27 | |||
25 | #Block devices | 28 | #Block devices |
26 | /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/system u:object_r:system_block_device:s0 | 29 | /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/system u:object_r:system_block_device:s0 |
27 | /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/recovery u:object_r:recovery_block_device:s0 | 30 | /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/recovery u:object_r:recovery_block_device:s0 |
diff --git a/sepolicy/init-cpuset-sh.te b/sepolicy/init-cpuset-sh.te new file mode 100644 index 0000000..4547c45 --- /dev/null +++ b/sepolicy/init-cpuset-sh.te | |||
@@ -0,0 +1,7 @@ | |||
1 | type init-cpuset-sh, domain; | ||
2 | type init-cpuset-sh_exec, exec_type, file_type; | ||
3 | |||
4 | init_daemon_domain(init-cpuset-sh) | ||
5 | |||
6 | allow init-cpuset-sh system_file:file execute_no_trans; | ||
7 | allow init-cpuset-sh shell_exec:file read; | ||
diff --git a/sepolicy/pvr.te b/sepolicy/pvr.te index fe4bf37..1e9cfa8 100644 --- a/sepolicy/pvr.te +++ b/sepolicy/pvr.te | |||
@@ -9,3 +9,4 @@ allow pvr gpu_device:chr_file rw_file_perms; | |||
9 | 9 | ||
10 | # allow graphics driver initialization | 10 | # allow graphics driver initialization |
11 | allow pvr self:capability sys_module; | 11 | allow pvr self:capability sys_module; |
12 | allow pvr system_file:system module_load; | ||
diff --git a/tablet_core_hardware_jacinto6evm.xml b/tablet_core_hardware_jacinto6evm.xml index eca9205..eaabd64 100644 --- a/tablet_core_hardware_jacinto6evm.xml +++ b/tablet_core_hardware_jacinto6evm.xml | |||
@@ -27,11 +27,10 @@ | |||
27 | <feature name="android.hardware.faketouch" /> | 27 | <feature name="android.hardware.faketouch" /> |
28 | <feature name="android.hardware.microphone" /> | 28 | <feature name="android.hardware.microphone" /> |
29 | <feature name="android.hardware.screen.landscape" /> | 29 | <feature name="android.hardware.screen.landscape" /> |
30 | <feature name="android.hardware.bluetooth" /> | 30 | <!--<feature name="android.hardware.bluetooth" />--> |
31 | <feature name="android.software.app_widgets" /> | 31 | <feature name="android.software.app_widgets" /> |
32 | <feature name="android.software.home_screen" /> | 32 | <feature name="android.software.home_screen" /> |
33 | <!-- Feature to specify if the device supports adding device admins. --> | 33 | <!-- Feature to specify if the device supports adding device admins. --> |
34 | <feature name="android.software.device_admin" /> | 34 | <feature name="android.software.device_admin" /> |
35 | <feature name="android.software.backup" /> | 35 | <feature name="android.software.backup" /> |
36 | <feature name="android.hardware.type.automotive" /> | ||
37 | </permissions> | 36 | </permissions> |
diff --git a/ueventd.jacinto6evmboard.rc b/ueventd.jacinto6evmboard.rc index d30f01c..9ca382c 100644 --- a/ueventd.jacinto6evmboard.rc +++ b/ueventd.jacinto6evmboard.rc | |||
@@ -18,13 +18,17 @@ | |||
18 | /dev/hci_tty 0666 bluetooth bluetooth | 18 | /dev/hci_tty 0666 bluetooth bluetooth |
19 | 19 | ||
20 | # Radio Tuners | 20 | # Radio Tuners |
21 | /dev/i2c-0 0660 system system | 21 | /dev/i2c-0 0660 media system |
22 | /dev/i2c-1 0660 system system | 22 | /dev/i2c-1 0660 media system |
23 | /dev/i2c-3 0660 system system | 23 | /dev/i2c-3 0660 media system |
24 | /dev/i2c-4 0660 system system | 24 | /dev/i2c-4 0660 media system |
25 | 25 | ||
26 | # cmem | 26 | # cmem |
27 | /dev/cmem 0660 system system | 27 | /dev/cmem 0660 media system |
28 | |||
29 | # ipc | ||
30 | /dev/uio0 0660 media system | ||
31 | /dev/hwspinlock 0660 media system | ||
28 | 32 | ||
29 | # for GNSS | 33 | # for GNSS |
30 | /dev/tigps 0666 root root | 34 | /dev/tigps 0666 root root |