From 18fa15a9b5263c6a708578decb3b12aed4eef15b Mon Sep 17 00:00:00 2001 From: Praneeth Bajjuri Date: Wed, 29 Nov 2017 11:12:49 -0600 Subject: am57xevm: sync with device/ti/jacinto6evm This patch is to sync am57xevm device project with jacinto6evm -- Retain everything from jactinto6evm (Including auto changes) -- Append am57xevm specific configuration This helps in cleanly cherry-picking patches across device projects. Next TBD: Remove auto only services and configurations Change-Id: I0396d55fa9515b71d0faf241ddb55accf21b2b46 Signed-off-by: Praneeth Bajjuri --- BoardConfig.mk | 26 +- EP05120M09.idc | 25 + LDC_3001_TouchScreen_Controller.idc | 25 + audio/primary/jamr3_mixer_paths.xml | 52 ++ device.mk | 85 ++- fstab.am57xevmboard | 2 - full_am57xevm.mk | 1 + init.am57xevmboard.rc | 48 +- init.recovery.am57xevmboard.rc | 5 +- media_profiles.xml | 664 --------------------- media_profiles_V1_0.xml | 597 ++++++++++++++++++ .../frameworks/base/core/res/res/values/config.xml | 5 + sepolicy/device.te | 3 + sepolicy/file_contexts | 17 +- sepolicy/lad_dra7xx.te | 21 + sepolicy/mediaserver.te | 8 + sepolicy/netd.te | 4 + sepolicy/vis.te | 20 + system.prop | 2 - 19 files changed, 882 insertions(+), 728 deletions(-) create mode 100644 EP05120M09.idc create mode 100644 LDC_3001_TouchScreen_Controller.idc create mode 100644 audio/primary/jamr3_mixer_paths.xml delete mode 100644 media_profiles.xml create mode 100644 media_profiles_V1_0.xml create mode 100644 sepolicy/lad_dra7xx.te create mode 100644 sepolicy/vis.te delete mode 100644 system.prop diff --git a/BoardConfig.mk b/BoardConfig.mk index cbce6c1..3a30498 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -66,7 +66,7 @@ TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" TARGET_RELEASETOOLS_EXTENSIONS := device/ti/am57xevm # Connectivity - Wi-Fi -USES_TI_MAC80211 := false +USES_TI_MAC80211 := true ifeq ($(USES_TI_MAC80211),true) BOARD_WPA_SUPPLICANT_DRIVER := NL80211 WPA_SUPPLICANT_VERSION := VER_0_8_X @@ -80,7 +80,10 @@ BOARD_SOFTAP_DEVICE := wl12xx_mac80211 endif BOARD_SEPOLICY_DIRS += \ - device/ti/am57xevm/sepolicy \ + device/ti/jacinto6evm/sepolicy \ + packages/services/Car/car_product/sepolicy + +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true # lidbrm driver BOARD_GPU_DRIVERS := omapdrm @@ -90,12 +93,14 @@ VSYNC_EVENT_PHASE_OFFSET_NS := 7500000 SF_VSYNC_EVENT_PHASE_OFFSET_NS := 5000000 BOARD_VENDOR_KERNEL_MODULES := \ -# $(KERNELDIR)/drivers/scsi/scsi_mod.ko \ + $(KERNELDIR)/drivers/net/wireless/ti/wl18xx/wl18xx.ko \ + $(KERNELDIR)/drivers/net/wireless/ti/wlcore/wlcore.ko \ + $(KERNELDIR)/drivers/net/wireless/ti/wlcore/wlcore_sdio.ko\ + $(KERNELDIR)/drivers/scsi/scsi_mod.ko \ $(KERNELDIR)/drivers/scsi/sd_mod.ko \ $(KERNELDIR)/drivers/usb/storage/usb-storage.ko \ $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/connector-hdmi.ko \ $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/dra7-evm-encoder-tpd12s015.ko \ - $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-sii9022.ko \ $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-tc358768.ko \ $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.ko \ $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/panel-dpi.ko \ @@ -108,13 +113,15 @@ BOARD_VENDOR_KERNEL_MODULES := \ $(KERNELDIR)/drivers/input/touchscreen/edt-ft5x06.ko \ $(KERNELDIR)/drivers/input/touchscreen/goodix.ko \ $(KERNELDIR)/drivers/input/touchscreen/ldc3001_ts.ko \ - $(KERNELDIR)/drivers/input/touchscreen/pixcir_i2c_ts.ko -# $(KERNELDIR)/drivers/net/wireless/ti/wl18xx/wl18xx.ko \ -# $(KERNELDIR)/drivers/net/wireless/ti/wlcore/wlcore.ko \ -# $(KERNELDIR)/drivers/net/wireless/ti/wlcore/wlcore_sdio.ko + $(KERNELDIR)/drivers/input/touchscreen/pixcir_i2c_ts.ko \ + $(KERNELDIR)/sound/soc/codecs/snd-soc-tlv320aic3x.ko \ + $(KERNELDIR)/drivers/gpio/gpio-pca953x.ko \ + $(KERNELDIR)/drivers/media/i2c/ov1063x.ko \ + $(KERNELDIR)/drivers/media/i2c/ov490.ko \ + $(KERNELDIR)/drivers/media/i2c/tvp5158.ko BOARD_RECOVERY_KERNEL_MODULES := \ -# $(KERNELDIR)/drivers/scsi/scsi_mod.ko \ + $(KERNELDIR)/drivers/scsi/scsi_mod.ko \ $(KERNELDIR)/drivers/scsi/sd_mod.ko \ $(KERNELDIR)/drivers/usb/storage/usb-storage.ko \ $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/connector-hdmi.ko \ @@ -122,6 +129,7 @@ BOARD_RECOVERY_KERNEL_MODULES := \ $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-tc358768.ko \ $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.ko \ $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/panel-dpi.ko \ + $(KERNELDIR)/drivers/video/serdes/ti-fpd3-serdes.ko \ $(KERNELDIR)/drivers/leds/leds-tlc591xx.ko \ $(KERNELDIR)/drivers/video/backlight/gpio_backlight.ko \ $(KERNELDIR)/drivers/video/backlight/led_bl.ko \ diff --git a/EP05120M09.idc b/EP05120M09.idc new file mode 100644 index 0000000..2d4c26a --- /dev/null +++ b/EP05120M09.idc @@ -0,0 +1,25 @@ +# Copyright (C) 2010 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# Input Device Configuration File for the Atmel Maxtouch touch screen. +# +# These calibration values are derived from empirical measurements +# and may not be appropriate for use with other touch screens. +# Refer to the input device configuration documentation for more details. +# + +# Basic Parameters +touch.deviceType = touchScreen +touch.orientationAware = 1 diff --git a/LDC_3001_TouchScreen_Controller.idc b/LDC_3001_TouchScreen_Controller.idc new file mode 100644 index 0000000..2d4c26a --- /dev/null +++ b/LDC_3001_TouchScreen_Controller.idc @@ -0,0 +1,25 @@ +# Copyright (C) 2010 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# Input Device Configuration File for the Atmel Maxtouch touch screen. +# +# These calibration values are derived from empirical measurements +# and may not be appropriate for use with other touch screens. +# Refer to the input device configuration documentation for more details. +# + +# Basic Parameters +touch.deviceType = touchScreen +touch.orientationAware = 1 diff --git a/audio/primary/jamr3_mixer_paths.xml b/audio/primary/jamr3_mixer_paths.xml new file mode 100644 index 0000000..1277a32 --- /dev/null +++ b/audio/primary/jamr3_mixer_paths.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/device.mk b/device.mk index ad3b337..3877003 100644 --- a/device.mk +++ b/device.mk @@ -26,6 +26,7 @@ endif USE_XML_AUDIO_POLICY_CONF := 1 PRODUCT_PACKAGES += \ + vehicle.default \ android.hardware.wifi@1.0-service \ android.hardware.graphics.allocator@2.0-impl \ android.hardware.graphics.allocator@2.0-service \ @@ -45,24 +46,27 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES := \ $(LOCAL_KERNEL):kernel \ - device/ti/am57xevm/tablet_core_hardware_am57xevm.xml:system/etc/permissions/tablet_core_hardware_am57xevm.xml \ - device/ti/am57xevm/manifest.xml:vendor/manifest.xml \ - device/ti/am57xevm/init.am57xevmboard.rc:root/init.am57xevmboard.rc \ - device/ti/am57xevm/init.am57xevmboard.usb.rc:root/init.am57xevmboard.usb.rc \ - device/ti/am57xevm/ueventd.am57xevmboard.rc:root/ueventd.am57xevmboard.rc \ - device/ti/am57xevm/fstab.am57xevmboard:root/fstab.am57xevmboard \ - device/ti/am57xevm/media_profiles.xml:system/etc/media_profiles.xml \ - device/ti/am57xevm/media_codecs.xml:system/etc/media_codecs.xml \ - device/ti/am57xevm/media_codecs_performance.xml:system/etc/media_codecs_performance.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ - frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ - frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \ - frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \ - frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \ - frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \ - frameworks/native/data/etc/android.software.freeform_window_management.xml:system/etc/permissions/android.software.freeform_window_management.xml \ - device/ti/am57xevm/pixcir_tangoc.idc:system/usr/idc/pixcir_tangoc.idc \ + device/ti/am57xevm/tablet_core_hardware_am57xevm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware_am57xevm.xml \ + device/ti/am57xevm/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \ + device/ti/am57xevm/init.am57xevmboard.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.am57xevmboard.rc \ + device/ti/am57xevm/init.am57xevmboard.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.am57xevmboard.usb.rc \ + device/ti/am57xevm/ueventd.am57xevmboard.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ + device/ti/am57xevm/fstab.am57xevmboard:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.am57xevmboard \ + device/ti/am57xevm/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \ + device/ti/am57xevm/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ + device/ti/am57xevm/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \ + frameworks/native/data/etc/android.hardware.type.automotive.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.type.automotive.xml \ + frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \ + frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \ + frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \ + frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml \ + frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \ + frameworks/native/data/etc/android.software.freeform_window_management.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.freeform_window_management.xml \ + device/ti/am57xevm/pixcir_tangoc.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/pixcir_tangoc.idc \ + device/ti/am57xevm/EP05120M09.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/EP05120M09.idc \ + device/ti/am57xevm/LDC_3001_TouchScreen_Controller.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/LDC_3001_TouchScreen_Controller.idc \ # init.rc for recovery image PRODUCT_COPY_FILES += \ @@ -74,27 +78,38 @@ PRODUCT_PACKAGES += \ # These are the hardware-specific features PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.camera.xml:system/etc/permissions/android.hardware.camera.xml + frameworks/native/data/etc/android.hardware.camera.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.xml # Audio PRODUCT_COPY_FILES += \ - frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:system/etc/a2dp_audio_policy_configuration.xml \ - frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:system/etc/usb_audio_policy_configuration.xml \ - frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:system/etc/r_submix_audio_policy_configuration.xml \ - frameworks/av/services/audiopolicy/config/default_volume_tables.xml:system/etc/default_volume_tables.xml \ - frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:system/etc/audio_policy_volumes.xml \ - device/ti/am57xevm/audio/primary/mixer_paths.xml:system/etc/mixer_paths.xml \ - device/ti/am57xevm/audio/primary/audio_policy_configuration.xml:system/etc/primary_audio_policy_configuration.xml \ - device/ti/am57xevm/audio/audio_policy_configuration.xml:system/etc/audio_policy_configuration.xml + frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ + frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml +ifeq ($(APPE_AUDIO),true) +PRODUCT_COPY_FILES += \ + hardware/ti/radio/vis_sdk/packages/android/hal/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ + hardware/ti/radio/vis_sdk/packages/android/hal/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \ + hardware/ti/radio/vis_sdk/packages/android/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml + +else +PRODUCT_COPY_FILES += \ + device/ti/am57xevm/audio/primary/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ + device/ti/am57xevm/audio/primary/jamr3_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/jamr3_mixer_paths.xml \ + device/ti/am57xevm/audio/primary/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \ + device/ti/am57xevm/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml +endif # cpuset configuration PRODUCT_COPY_FILES += \ - device/ti/am57xevm/init.am57xevmboard.cpuset.sh:system/bin/init.am57xevmboard.cpuset.sh + device/ti/am57xevm/init.am57xevmboard.cpuset.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.am57xevmboard.cpuset.sh PRODUCT_PROPERTY_OVERRIDES := \ - hwui.render_dirty_regions=false + hwui.render_dirty_regions=false \ + wifi.interface=wlan0 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ persist.sys.usb.config=mtp @@ -114,10 +129,10 @@ PRODUCT_PACKAGES += \ com.android.future.usb.accessory PRODUCT_PROPERTY_OVERRIDES += \ - ro.sf.lcd_density=120 + ro.sf.lcd_density=240 # WI-Fi -# PRODUCT_PACKAGES += \ +PRODUCT_PACKAGES += \ wificond \ wpa_supplicant \ wpa_supplicant.conf \ @@ -156,7 +171,7 @@ PRODUCT_PACKAGES += \ tinycap # Radio -# PRODUCT_PACKAGES += \ +PRODUCT_PACKAGES += \ RadioApp \ lad_dra7xx \ libtiipc \ @@ -173,6 +188,12 @@ PRODUCT_PACKAGES += Launcher3 \ PRODUCT_PROPERTY_OVERRIDES += \ media.aac_51_output_enabled=true +PRODUCT_PROPERTY_OVERRIDES += \ + android.car.drawer.unlimited=true \ + android.car.hvac.demo=true \ + com.android.car.radio.demo=true \ + com.android.car.radio.demo.dual=true + $(call inherit-product, frameworks/native/build/tablet-7in-hdpi-1024-dalvik-heap.mk) $(call inherit-product-if-exists, hardware/ti/dra7xx/am57x.mk) #$(call inherit-product-if-exists, hardware/ti/wpan/ti-wpan-products.mk) diff --git a/fstab.am57xevmboard b/fstab.am57xevmboard index 120e007..d157407 100644 --- a/fstab.am57xevmboard +++ b/fstab.am57xevmboard @@ -3,8 +3,6 @@ # The filesystem that contains the filesystem checker binary (typically /system) cannot # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK -/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/system /system ext4 ro wait -/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/vendor /vendor ext4 ro wait /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/cache /cache ext4 noatime,nosuid,nodev wait,check /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/userdata /data ext4 noatime,nosuid,nodev wait,check /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/recovery /recovery emmc defaults defaults diff --git a/full_am57xevm.mk b/full_am57xevm.mk index e8f44a9..96e851c 100644 --- a/full_am57xevm.mk +++ b/full_am57xevm.mk @@ -24,6 +24,7 @@ # Inherit from those products. Most specific first. $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) +$(call inherit-product, packages/services/Car/car_product/build/car.mk) $(call inherit-product, device/ti/am57xevm/device.mk) PRODUCT_NAME := full_am57xevm diff --git a/init.am57xevmboard.rc b/init.am57xevmboard.rc index 212e937..d106471 100644 --- a/init.am57xevmboard.rc +++ b/init.am57xevmboard.rc @@ -1,13 +1,8 @@ -import /init.am57xevmboard.usb.rc +import /vendor/etc/init/hw/init.am57xevmboard.usb.rc on early-init mount debugfs /sys/kernel/debug /sys/kernel/debug mode=755 -on init - # Support legacy paths - symlink /sdcard /mnt/sdcard - symlink /sdcard /storage/sdcard0 - on post-fs-data mkdir /data/media 0770 media_rw media_rw @@ -18,28 +13,36 @@ on post-fs-data mkdir /data/lad 0770 system media mkdir /data/lad/LAD 0770 system media -# enabling thermal zone for mpu + #enabling thermal zone for mpu write /sys/class/thermal/thermal_zone0/mode enabled on boot + # execute script to set cpuset configuration - exec - root root system -- /system/bin/init.am57xevmboard.cpuset.sh + exec - root root system -- /vendor/bin/init.am57xevmboard.cpuset.sh + + # CMEM for Radio + insmod /vendor/lib/modules/cmemk.ko phys_start=0x95400000 phys_end=0x95800000 pools=1x147456,2x131072,25x65536,40x4096 allowOverlap=1 # 2d blitter insmod /system/lib/modules/galcore.ko physSize=0xc0000000 on fs - mount_all /fstab.am57xevmboard - -# on late-init -# Load modules -# exec u:r:modprobe:s0 -- /vendor/bin/modprobe -a -d \ - /vendor/lib/modules scsi_mod.ko usb-storage.ko sd_mod.ko \ - dra7-evm-encoder-tpd12s015.ko encoder-sii9022.ko encoder-tc358768.ko encoder-tpd12s015.ko \ + mount_all /vendor/etc/fstab.am57xevmboard + +on late-init + # Load modules + exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d \ + /vendor/lib/modules wl18xx.ko wlcore.ko wlcore_sdio.ko \ + scsi_mod.ko usb-storage.ko sd_mod.ko \ + dra7-evm-encoder-tpd12s015.ko encoder-tc358768.ko encoder-tpd12s015.ko \ ti-fpd3-serdes.ko \ connector-hdmi.ko \ panel-dpi.ko leds-tlc591xx.ko gpio_backlight.ko led_bl.ko pwm_bl.ko \ - edt-ft5x06.ko goodix.ko input-polldev.ko ldc3001_ts.ko pixcir_i2c_ts.ko + edt-ft5x06.ko goodix.ko input-polldev.ko ldc3001_ts.ko pixcir_i2c_ts.ko \ + ov1063x.ko ov490.ko tvp5158.ko \ + gpio-pca953x.ko \ + snd-soc-tlv320aic3x.ko service pvrsrvinit /vendor/bin/pvrsrvinit class core @@ -96,3 +99,16 @@ service dhcpcd_eth1 /system/bin/dhcpcd -ABDKL class main disabled oneshot + +service lad_dra7xx /vendor/bin/lad_dra7xx -g + class main + user system + group media + oneshot + +service vis /vendor/bin/RadioApp -h eth + class main + user system + group media inet + disabled + oneshot diff --git a/init.recovery.am57xevmboard.rc b/init.recovery.am57xevmboard.rc index f47200c..2cec302 100644 --- a/init.recovery.am57xevmboard.rc +++ b/init.recovery.am57xevmboard.rc @@ -1,7 +1,8 @@ -#on late-init +on late-init # Load modules -# exec u:r:modprobe:s0 -- /sbin/modprobe -a -d \ + exec u:r:modprobe:s0 -- /sbin/modprobe -a -d \ /lib/modules scsi_mod.ko usb-storage.ko sd_mod.ko \ dra7-evm-encoder-tpd12s015.ko encoder-sii9022.ko encoder-tc358768.ko encoder-tpd12s015.ko \ + ti-fpd3-serdes.ko \ connector-hdmi.ko \ panel-dpi.ko leds-tlc591xx.ko gpio_backlight.ko led_bl.ko pwm_bl.ko diff --git a/media_profiles.xml b/media_profiles.xml deleted file mode 100644 index 244476d..0000000 --- a/media_profiles.xml +++ /dev/null @@ -1,664 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media_profiles_V1_0.xml b/media_profiles_V1_0.xml new file mode 100644 index 0000000..aa7abaa --- /dev/null +++ b/media_profiles_V1_0.xml @@ -0,0 +1,597 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 6e728a7..da0285a 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -26,6 +26,11 @@ 8 + + 3 + + true + false diff --git a/sepolicy/device.te b/sepolicy/device.te index 1489b07..6fb408e 100644 --- a/sepolicy/device.te +++ b/sepolicy/device.te @@ -1,2 +1,5 @@ type bluetooth_control, dev_type; type rtc, dev_type; +type hwspinlock_dev, dev_type; +type uio_dev, dev_type; +type cmem_dev, dev_type; diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index c46e517..25ab3d4 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -23,7 +23,22 @@ /dev/rtc0 u:object_r:rtc:s0 #cpuset script -/system/bin/init.am57xevmboard.cpuset.sh u:object_r:init-cpuset-sh_exec:s0 +/vendor/bin/init.am57xevmboard.cpuset.sh u:object_r:init-cpuset-sh_exec:s0 + +#lad_dra7xx +/vendor/bin/lad_dra7xx u:object_r:lad_dra7xx_exec:s0 +/data/lad(/.*)? u:object_r:lad_data_file:s0 + +#hwspinlock and uio +/dev/hwspinlock u:object_r:hwspinlock_dev:s0 +/dev/uio0 u:object_r:uio_dev:s0 + +#VIS (RadioApp) +/vendor/bin/RadioApp u:object_r:vis_exec:s0 + +#CMEM +/dev/cmem u:object_r:cmem_dev:s0 + #Block devices /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/system u:object_r:system_block_device:s0 /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/recovery u:object_r:recovery_block_device:s0 diff --git a/sepolicy/lad_dra7xx.te b/sepolicy/lad_dra7xx.te new file mode 100644 index 0000000..3b31bf2 --- /dev/null +++ b/sepolicy/lad_dra7xx.te @@ -0,0 +1,21 @@ +type lad_dra7xx, domain; +type lad_dra7xx_exec, exec_type, file_type; +type lad_data_file, file_type, data_file_type; + +# Started by init +init_daemon_domain(lad_dra7xx) + +# Allow access to /data/lad +allow lad_dra7xx devpts:chr_file {read write ioctl getattr }; +allow lad_dra7xx lad_data_file:dir { create_dir_perms }; +allow lad_dra7xx lad_data_file:fifo_file { create_file_perms }; +allow lad_dra7xx self:socket { create_socket_perms_no_ioctl }; + +# Allow access to hwspinlock and uio device +allow lad_dra7xx hwspinlock_dev:chr_file { rw_file_perms }; +allow lad_dra7xx uio_dev:chr_file { rw_file_perms }; +allow lad_dra7xx sysfs:file { r_file_perms }; + +# Allow signull operation from known client processes +allow lad_dra7xx mediaserver:process signull; +allow lad_dra7xx vis:process signull; diff --git a/sepolicy/mediaserver.te b/sepolicy/mediaserver.te index 2e9e366..c8e811e 100644 --- a/sepolicy/mediaserver.te +++ b/sepolicy/mediaserver.te @@ -2,3 +2,11 @@ allow mediaserver system_server:unix_stream_socket { read write }; #Camera allow mediaserver device:dir { read open }; + +#APPE +allow mediaserver lad_data_file:fifo_file { create_file_perms }; +allow mediaserver hwspinlock_dev:chr_file { rw_file_perms }; +allow mediaserver cmem_dev:chr_file { rw_file_perms }; +allow mediaserver self:socket { create_socket_perms_no_ioctl }; +allow mediaserver self:tcp_socket { create_stream_socket_perms }; +allow mediaserver ctl_default_prop:property_service set; diff --git a/sepolicy/netd.te b/sepolicy/netd.te index 6c8303c..143cc61 100644 --- a/sepolicy/netd.te +++ b/sepolicy/netd.te @@ -2,3 +2,7 @@ # Ignore them dontaudit netd self:capability sys_module; dontaudit netd kernel:system module_request; + +# VIS +allow netd vis:fd use; +allow netd vis:tcp_socket { rw_socket_perms }; diff --git a/sepolicy/vis.te b/sepolicy/vis.te new file mode 100644 index 0000000..101cf39 --- /dev/null +++ b/sepolicy/vis.te @@ -0,0 +1,20 @@ +type vis, domain; +type vis_exec, exec_type, file_type; + +# Started by init +init_daemon_domain(vis) + +# Allow access to IPC related resources +allow vis devpts:chr_file { read write ioctl getattr }; +allow vis fwmarkd_socket:sock_file write; +allow vis self:socket { create_socket_perms_no_ioctl }; +allow vis self:tcp_socket { create_stream_socket_perms }; +allow vis netd:unix_stream_socket connectto; +allow vis node:tcp_socket node_bind; +allow vis port:tcp_socket name_bind; +allow vis lad_data_file:fifo_file { rw_file_perms }; +allow vis cmem_dev:chr_file { rw_file_perms }; +allow vis hwspinlock_dev:chr_file { rw_file_perms }; + +# Allow access to I2C for audio codec configuration +allow vis i2c_device:chr_file { rw_file_perms }; diff --git a/system.prop b/system.prop deleted file mode 100644 index 8e0db0d..0000000 --- a/system.prop +++ /dev/null @@ -1,2 +0,0 @@ -# wifi.interface=wlan0 -persist.hwc.primary.tv=1 -- cgit v1.2.3-54-g00ecf