From 69474ecd22e673f037554c90e003d0f6eafe42ff Mon Sep 17 00:00:00 2001 From: Praneeth Bajjuri Date: Wed, 8 Nov 2017 15:25:36 -0600 Subject: am57xevm: make modules builtin make driver modules builtin till early mount and driver modularization is investigated and fixed accordingly. Change-Id: I4bd353b9cd544fc1a9df2b033dceaa822f65376c Signed-off-by: Praneeth Bajjuri --- BoardConfig.mk | 4 ++-- init.am57xevmboard.rc | 4 ++-- init.recovery.am57xevmboard.rc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index c0b8186..cbce6c1 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -90,7 +90,7 @@ 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/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 \ @@ -114,7 +114,7 @@ BOARD_VENDOR_KERNEL_MODULES := \ # $(KERNELDIR)/drivers/net/wireless/ti/wlcore/wlcore_sdio.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 \ diff --git a/init.am57xevmboard.rc b/init.am57xevmboard.rc index 5de8cd2..212e937 100644 --- a/init.am57xevmboard.rc +++ b/init.am57xevmboard.rc @@ -31,9 +31,9 @@ on boot on fs mount_all /fstab.am57xevmboard -on late-init +# on late-init # Load modules - exec u:r:modprobe:s0 -- /vendor/bin/modprobe -a -d \ +# 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 \ ti-fpd3-serdes.ko \ diff --git a/init.recovery.am57xevmboard.rc b/init.recovery.am57xevmboard.rc index 34e089c..f47200c 100644 --- a/init.recovery.am57xevmboard.rc +++ b/init.recovery.am57xevmboard.rc @@ -1,6 +1,6 @@ -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 \ connector-hdmi.ko \ -- cgit v1.2.3-54-g00ecf From a35e0aa406c88cbb3c1b28cef1d4118881eaaf2e Mon Sep 17 00:00:00 2001 From: Vishal Mahaveer Date: Mon, 27 Jun 2016 22:25:19 -0400 Subject: am57xevm: fastboot: fix board_rev handling Update script to use only first character of board rev. Some boards (IDK) have revision set as "1.3A pr 1.3B" Change-Id: Ifb189deb41f8cd24297ef3979a11b46350f2fa6c Signed-off-by: Vishal Mahaveer Signed-off-by: Praneeth Bajjuri --- fastboot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastboot.sh b/fastboot.sh index 0d7776a..d25ac0c 100755 --- a/fastboot.sh +++ b/fastboot.sh @@ -63,7 +63,7 @@ fi #product=`${FASTBOOT} getvar product 2>&1 | grep product | awk '{print$2}'` cpu=`${FASTBOOT} getvar cpu 2>&1 | grep cpu | awk '{print$2}'` cputype=`${FASTBOOT} getvar secure 2>&1 | grep secure | awk '{print$2}'` -boardrev=`${FASTBOOT} getvar board_rev 2>&1 | grep board_rev | awk '{print$2}'` +boardrev=`${FASTBOOT} getvar board_rev 2>&1 | grep board_rev | awk '{print$2}' | cut -b 1` # Make EMU = HS -- cgit v1.2.3-54-g00ecf From 24ce7cdbd5bfcfa0113e5c26351cef0936cd09cd Mon Sep 17 00:00:00 2001 From: Vishal Mahaveer Date: Tue, 14 Jun 2016 15:14:38 -0400 Subject: am57xevm: update fastboot script for latest u-boot dra7xx_hs_evm_config/am57x_hs_evm_config in 2016.05 u-boot generates images with different name. Update fastboot script to reflect the same. Change-Id: Ie9a98189163449497cf4bad15030437d5eb2a16b Signed-off-by: Vishal Mahaveer Signed-off-by: Praneeth Bajjuri --- fastboot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastboot.sh b/fastboot.sh index d25ac0c..3b71e9f 100755 --- a/fastboot.sh +++ b/fastboot.sh @@ -69,7 +69,7 @@ boardrev=`${FASTBOOT} getvar board_rev 2>&1 | grep board_rev | awk '{print$2}' # Make EMU = HS if [ ${cputype} = "EMU" ] || [ ${cputype} = "HS" ]; then cputype="HS" - xloader="${PRODUCT_OUT}${cputype}_QSPI_MLO" + xloader="${PRODUCT_OUT}u-boot-spl_HS_X-LOADER" uboot="${PRODUCT_OUT}${cputype}_u-boot.img" # If fastboot does not support getvar default to GP elif [ ${cputype} = "" ] || [ ${cputype} = "GP" ]; then -- cgit v1.2.3-54-g00ecf From 4a9d33d0c18c1a92480dfeac3fedece042378c9f Mon Sep 17 00:00:00 2001 From: Praneeth Bajjuri Date: Tue, 28 Nov 2017 14:35:11 -0600 Subject: am57xevm: fastboot.sh: update script based on new device names device names has been changed in u-boot code now. This patch also introduces DRA76 device tree flashing capability Change-Id: I19bd427f6392a5f16231a360ca00cc5328955e29 Signed-off-by: Praneeth Bajjuri --- fastboot.sh | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/fastboot.sh b/fastboot.sh index 3b71e9f..f5a834f 100755 --- a/fastboot.sh +++ b/fastboot.sh @@ -79,30 +79,35 @@ elif [ ${cputype} = "" ] || [ ${cputype} = "GP" ]; then fi # Based on cpu, decide the dtb to flash, default fall back to J6 and LCD 10 -if [ ${cpu} = "J6ECO" ]; then + +if [ ${cpu} = "DRA722" ]; then if [ ${boardrev} = "C" ]; then - environment="${PRODUCT_OUT}dra72-evm-lcd-osd.dtb" + environment="${PRODUCT_OUT}dra72-evm-revc-lcd-osd101t2045.dtb" + elif [ ${boardrev} = "A" ]; then + environment="${PRODUCT_OUT}dra71-evm-lcd-auo-g101evn01.0.dtb" elif [ ${boardrev} = "1.3A" ] || [ ${boardrev} = "1.3B" ]; then environment="${PRODUCT_OUT}am571x-idk-lcd-osd101t2587.dtb" else - environment="${PRODUCT_OUT}dra72-evm-lcd10.dtb" + environment="${PRODUCT_OUT}dra72-evm-lcd-lg.dtb" fi -else +elif [ ${cpu} = "DRA752" ]; then if [ ${boardrev} = "H" ]; then environment="${PRODUCT_OUT}dra7-evm-lcd-osd.dtb" - else + elif [ ${boardrev} = "A.30" ]; then environment="${PRODUCT_OUT}am57xx-evm-reva3.dtb" + else + environment="${PRODUCT_OUT}dra7-evm-lcd-lg.dtb" fi -fi - -if [ ${cpu} = "J6" ]; then - if [ ${boardrev} = "A.30" ]; then - environment="${PRODUCT_OUT}am57xx-evm-reva3.dtb" - elif [ ${boardrev} = "1.3A" ] || [ ${boardrev} = "1.3B" ]; then - environment="${PRODUCT_OUT}am572x-idk-lcd-osd101t2587.dtb" - elif [ ${boardrev} = "B.10" ]; then - environment="${PRODUCT_OUT}am57xx-beagle-x15-revb1.dtb" +elif [ ${cpu} = "DRA762" ]; then + if [ ${boardrev} = "1.3A" ] || [ ${boardrev} = "1.3B" ]; then + environment="${PRODUCT_OUT}am574x-idk-lcd-osd101t2587.dtb" + else + environment="${PRODUCT_OUT}dra76-evm.dtb" fi +else + echo "CPU not detected, no matching dtb file found" + echo "flashing default dtb, Review and Reflash correct dtb" + environment="${PRODUCT_OUT}dra7-evm-lcd-osd.dtb" fi # Create the filename -- cgit v1.2.3-54-g00ecf From 65488d981f7d879f5a37e1131bc295c6a67c003d Mon Sep 17 00:00:00 2001 From: Praneeth Bajjuri Date: Tue, 28 Nov 2017 14:45:08 -0600 Subject: am57xevm: fastboot.sh: update script to pick right dtb update script to pick up correct dtb and default setting Change-Id: I175d651287cee5757c67b5c545cfe8e78f24bc93 Signed-off-by: Praneeth Bajjuri --- fastboot.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fastboot.sh b/fastboot.sh index f5a834f..f8e4534 100755 --- a/fastboot.sh +++ b/fastboot.sh @@ -88,21 +88,21 @@ if [ ${cpu} = "DRA722" ]; then elif [ ${boardrev} = "1.3A" ] || [ ${boardrev} = "1.3B" ]; then environment="${PRODUCT_OUT}am571x-idk-lcd-osd101t2587.dtb" else - environment="${PRODUCT_OUT}dra72-evm-lcd-lg.dtb" + environment="${PRODUCT_OUT}am571x-idk-lcd-osd101t2587.dtb" fi elif [ ${cpu} = "DRA752" ]; then if [ ${boardrev} = "H" ]; then environment="${PRODUCT_OUT}dra7-evm-lcd-osd.dtb" - elif [ ${boardrev} = "A.30" ]; then + elif [ ${boardrev} = "A" ]; then environment="${PRODUCT_OUT}am57xx-evm-reva3.dtb" else - environment="${PRODUCT_OUT}dra7-evm-lcd-lg.dtb" + environment="${PRODUCT_OUT}am57xx-evm-reva3.dtb" fi elif [ ${cpu} = "DRA762" ]; then if [ ${boardrev} = "1.3A" ] || [ ${boardrev} = "1.3B" ]; then environment="${PRODUCT_OUT}am574x-idk-lcd-osd101t2587.dtb" else - environment="${PRODUCT_OUT}dra76-evm.dtb" + environment="${PRODUCT_OUT}am574-idk.dtb" fi else echo "CPU not detected, no matching dtb file found" -- cgit v1.2.3-54-g00ecf From d278a85d36a08bf527a3990d1a6baedacf156c7b Mon Sep 17 00:00:00 2001 From: Misael Lopez Cruz Date: Thu, 19 Oct 2017 01:52:02 -0500 Subject: audio: Combine the JAMR3 HAL into the primary HAL JAMR3 line-in audio support was provided through a separate audio HAL which caused significant code duplication. Line-in audio support is now combined into the primary HAL. Change-Id: Ibd1d481954f1ebb71bb543c5a9d8dbd3ba61b002 Signed-off-by: Misael Lopez Cruz Signed-off-by: Praneeth Bajjuri Conflicts: audio/primary/jamr3_mixer_paths.xml device.mk --- audio/Android.mk | 5 ++++ audio/primary/audio_hw.c | 38 +++++++++++++++++++++++++--- audio/primary/audio_policy_configuration.xml | 22 +++++++++------- device.mk | 4 +++ 4 files changed, 56 insertions(+), 13 deletions(-) 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 @@ # limitations under the License. LOCAL_PATH := $(call my-dir) + +ifeq ($(APPE_AUDIO),true) +include $(LOCAL_PATH)/hdmi/Android.mk +else include $(call all-makefiles-under,$(LOCAL_PATH)) +endif diff --git a/audio/primary/audio_hw.c b/audio/primary/audio_hw.c index 0ae1f54..13dca21 100644 --- a/audio/primary/audio_hw.c +++ b/audio/primary/audio_hw.c @@ -94,6 +94,7 @@ struct j6_audio_device { struct j6_stream_out *out; struct j6_voice voice; struct audio_route *route; + struct audio_route *jamr_route; audio_devices_t in_device; audio_devices_t out_device; pthread_mutex_t lock; @@ -102,6 +103,8 @@ struct j6_audio_device { unsigned int out_port; unsigned int bt_card; unsigned int bt_port; + unsigned int jamr_card; + unsigned int jamr_port; bool mic_mute; bool in_call; audio_mode_t mode; @@ -120,6 +123,8 @@ struct j6_stream_in { size_t hw_frame_size; unsigned int requested_rate; unsigned int requested_channels; + unsigned int card; + unsigned int port; int read_status; pthread_mutex_t lock; bool standby; @@ -147,10 +152,15 @@ static const char *supported_bt_cards[] = { "DRA7xxWiLink", }; +static const char *supported_jamr_cards[] = { + "DRA7xx-JAMR3", +}; + #define MAX_CARD_COUNT 10 #define SUPPORTED_IN_DEVICES (AUDIO_DEVICE_IN_BUILTIN_MIC | \ AUDIO_DEVICE_IN_WIRED_HEADSET | \ + AUDIO_DEVICE_IN_LINE | \ AUDIO_DEVICE_IN_DEFAULT) #define SUPPORTED_OUT_DEVICES (AUDIO_DEVICE_OUT_SPEAKER | \ AUDIO_DEVICE_OUT_WIRED_HEADSET | \ @@ -173,6 +183,7 @@ static const char *supported_bt_cards[] = { #define BT_BUFFER_SIZE (BT_PERIOD_SIZE * BT_PERIOD_COUNT) #define MIXER_XML_PATH "/vendor/etc/mixer_paths.xml" +#define JAMR_MIXER_XML_PATH "/vendor/etc/jamr3_mixer_paths.xml" struct pcm_config pcm_config_capture = { .channels = 2, @@ -1295,8 +1306,8 @@ static ssize_t in_read(struct audio_stream_in *stream, void* buffer, if (in->standby) { select_input_device(adev); - ALOGI("in_read() open card %u port %u", adev->card, adev->in_port); - in->pcm = pcm_open(adev->card, adev->in_port, + ALOGI("in_read() open card %u port %u", in->card, in->port); + in->pcm = pcm_open(in->card, in->port, PCM_IN | PCM_MONOTONIC, &in->config); if (!pcm_is_ready(in->pcm)) { @@ -1624,6 +1635,8 @@ static int adev_open_input_stream(struct audio_hw_device *dev, in->remix = NULL; in->resampler = NULL; in->buffer = NULL; + in->card = (devices == AUDIO_DEVICE_IN_LINE) ? adev->jamr_card : adev->card; + in->port = 0; adev->in = in; /* in-place stereo-to-mono remix since capture stream is stereo */ @@ -1721,6 +1734,7 @@ static int adev_close(hw_device_t *device) ALOGI("adev_close()"); audio_route_free(adev->route); + audio_route_free(adev->jamr_route); free(device); return 0; @@ -1778,6 +1792,11 @@ static int adev_open(const hw_module_t* module, const char* name, adev->bt_port = 0; ALOGI("Bluetooth SCO card is hw:%d\n", adev->bt_card); + adev->jamr_card = find_card_index(supported_jamr_cards, + ARRAY_SIZE(supported_jamr_cards)); + adev->jamr_port = 0; + ALOGI("JAMR card is hw:%d\n", adev->jamr_card); + adev->mic_mute = false; adev->in_call = false; adev->mode = AUDIO_MODE_NORMAL; @@ -1785,13 +1804,24 @@ static int adev_open(const hw_module_t* module, const char* name, adev->route = audio_route_init(adev->card, MIXER_XML_PATH); if (!adev->route) { ALOGE("Unable to initialize audio routes"); - free(adev); - return -EINVAL; + goto err1; + } + + adev->jamr_route = audio_route_init(adev->jamr_card, JAMR_MIXER_XML_PATH); + if (!adev->jamr_route) { + ALOGE("Unable to initialize JAMR audio routes"); + goto err2; } *device = &adev->device.common; return 0; + + err2: + audio_route_free(adev->route); + err1: + free(adev); + return -ENODEV; } static struct hw_module_methods_t hal_module_methods = { diff --git a/audio/primary/audio_policy_configuration.xml b/audio/primary/audio_policy_configuration.xml index f13d1bb..c5fb06e 100644 --- a/audio/primary/audio_policy_configuration.xml +++ b/audio/primary/audio_policy_configuration.xml @@ -4,6 +4,7 @@ Speaker Built-In Mic + Line In Speaker @@ -19,7 +20,11 @@ channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/> - + + + @@ -30,18 +35,17 @@ + + - - - + + + - + + diff --git a/device.mk b/device.mk index d7d78ef..87b3501 100644 --- a/device.mk +++ b/device.mk @@ -14,6 +14,9 @@ # limitations under the License. # +# Audio Post Processing Engine (APPE) +APPE_AUDIO := false + ifeq ($(TARGET_PREBUILT_KERNEL),) LOCAL_KERNEL := $(KERNELDIR)/arch/arm/boot/zImage else @@ -84,6 +87,7 @@ PRODUCT_COPY_FILES += \ 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 + # cpuset configuration PRODUCT_COPY_FILES += \ device/ti/am57xevm/init.am57xevmboard.cpuset.sh:system/bin/init.am57xevmboard.cpuset.sh -- cgit v1.2.3-54-g00ecf From b5b54aa588a07dccab6943aee14a07c07be78d8b Mon Sep 17 00:00:00 2001 From: Vishal Mahaveer Date: Wed, 8 Nov 2017 17:36:05 -0600 Subject: am57xevm: include dalvik definitions Fixes: 736085b ("jacinto6evm: initial O changes") In initial Oreo bring up commit, this line was commented by mistake. Change-Id: If10291688471c3687fbe24c3d284205b03623997 Signed-off-by: Vishal Mahaveer Signed-off-by: Praneeth Bajjuri Conflicts: device.mk --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 87b3501..ad3b337 100644 --- a/device.mk +++ b/device.mk @@ -173,7 +173,7 @@ PRODUCT_PACKAGES += Launcher3 \ PRODUCT_PROPERTY_OVERRIDES += \ media.aac_51_output_enabled=true -#$(call inherit-product, frameworks/native/build/tablet-7in-hdpi-1024-dalvik-heap.mk) +$(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) $(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ti-jacinto6-vendor.mk) -- cgit v1.2.3-54-g00ecf 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 From e638ff68b8ef236d90879e79eb943edd6fec7a8d Mon Sep 17 00:00:00 2001 From: Praneeth Bajjuri Date: Wed, 29 Nov 2017 11:16:20 -0600 Subject: am57xevm: change display density to fit small screen AM57xevm has a smaller screen, hence changing the density to fit appropriately Change-Id: I49eb87999fbdface17008ffd74dad97ae23d2d44 Signed-off-by: Praneeth Bajjuri --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 3877003..0975307 100644 --- a/device.mk +++ b/device.mk @@ -129,7 +129,7 @@ PRODUCT_PACKAGES += \ com.android.future.usb.accessory PRODUCT_PROPERTY_OVERRIDES += \ - ro.sf.lcd_density=240 + ro.sf.lcd_density=120 # WI-Fi PRODUCT_PACKAGES += \ -- cgit v1.2.3-54-g00ecf From ca95ab60d789a85f2ea4aea6ed3cca79aef6fd1e Mon Sep 17 00:00:00 2001 From: Jason Reeder Date: Fri, 7 Apr 2017 10:53:37 -0500 Subject: am57xevm: Enable PRU Ethernet on IDK boards Enable PRU Ethernet on IDK boards. Change-Id: I28290af5b6eb7ffa37c0a9c430226b14d087db6c Signed-off-by: Jason Reeder --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 0975307..045a9ba 100644 --- a/device.mk +++ b/device.mk @@ -201,3 +201,4 @@ $(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ti-jacinto $(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) $(call inherit-product-if-exists, device/ti/proprietary-open/wl12xx/wpan/wl12xx-wpan-fw-products.mk) +$(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/prueth-full_am57xevm.mk) -- cgit v1.2.3-54-g00ecf From 3db7b4937e9f62a50bc14eaa5e7ed93807414794 Mon Sep 17 00:00:00 2001 From: Jason Reeder Date: Thu, 4 May 2017 16:51:56 -0500 Subject: am57xevm: Enable general purpose PRU firmwares Enable general purpose PRU firmwares on the AM57xx devices. Change-Id: I2aa9e55d87994fe660ef3456b8b94c485200f668 Signed-off-by: Jason Reeder --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 045a9ba..0134c80 100644 --- a/device.mk +++ b/device.mk @@ -202,3 +202,4 @@ $(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ducati-ful $(call inherit-product-if-exists, device/ti/proprietary-open/wl12xx/wlan/wl12xx-wlan-fw-products.mk) $(call inherit-product-if-exists, device/ti/proprietary-open/wl12xx/wpan/wl12xx-wpan-fw-products.mk) $(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/prueth-full_am57xevm.mk) +$(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/pru-icss-full_am57xevm.mk) -- cgit v1.2.3-54-g00ecf From 6d5ce3d0a53c4ebfec08405caf47586689891a1d Mon Sep 17 00:00:00 2001 From: Praneeth Bajjuri Date: Wed, 29 Nov 2017 12:15:35 -0600 Subject: am57xevm: Install pru modules Install PRU modules in vendor partitions Change-Id: I70c7a8b693a736f478973213f84e8d6cccfe7633 Signed-off-by: Praneeth Bajjuri --- BoardConfig.mk | 9 ++++++++- init.am57xevmboard.rc | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 3a30498..46b6d38 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -118,7 +118,14 @@ BOARD_VENDOR_KERNEL_MODULES := \ $(KERNELDIR)/drivers/gpio/gpio-pca953x.ko \ $(KERNELDIR)/drivers/media/i2c/ov1063x.ko \ $(KERNELDIR)/drivers/media/i2c/ov490.ko \ - $(KERNELDIR)/drivers/media/i2c/tvp5158.ko + $(KERNELDIR)/drivers/media/i2c/tvp5158.ko \ + $(KERNELDIR)/drivers/remoteproc/pruss_intc.ko \ + $(KERNELDIR)/drivers/remoteproc/pruss.ko \ + $(KERNELDIR)/drivers/rpmsg/rpmsg_pru.ko \ + $(KERNELDIR)/drivers/remoteproc/pru_rproc.ko \ + $(KERNELDIR)/drivers/net/ethernet/ti/prueth.ko + + BOARD_RECOVERY_KERNEL_MODULES := \ $(KERNELDIR)/drivers/scsi/scsi_mod.ko \ diff --git a/init.am57xevmboard.rc b/init.am57xevmboard.rc index d106471..57942d6 100644 --- a/init.am57xevmboard.rc +++ b/init.am57xevmboard.rc @@ -42,7 +42,8 @@ on late-init 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 + snd-soc-tlv320aic3x.ko \ + pruss_intc.ko pruss.ko rpmsg_pru.ko pru_rproc.ko prueth.ko service pvrsrvinit /vendor/bin/pvrsrvinit class core -- cgit v1.2.3-54-g00ecf From 07c58d221ebef458cc3ee6102e8dd0bc939fd9a7 Mon Sep 17 00:00:00 2001 From: Praneeth Bajjuri Date: Wed, 29 Nov 2017 16:31:09 -0600 Subject: am57xevm: fastboot.sh: IDK: update script for picking correct dtb After the patch : commit a35e0aa406c88cbb3c1b28cef1d4118881eaaf2e "am57xevm: fastboot: fix board_rev handling " Only the first character of the boardrev is used to detect and flash dtb. This patch fixes script to pick correct dtb for IDK. Change-Id: Id3ec94e6f170c18bbc8bf5d091cbb0bd7089612b Signed-off-by: Praneeth Bajjuri --- fastboot.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fastboot.sh b/fastboot.sh index f8e4534..b2bd25a 100755 --- a/fastboot.sh +++ b/fastboot.sh @@ -85,7 +85,7 @@ if [ ${cpu} = "DRA722" ]; then environment="${PRODUCT_OUT}dra72-evm-revc-lcd-osd101t2045.dtb" elif [ ${boardrev} = "A" ]; then environment="${PRODUCT_OUT}dra71-evm-lcd-auo-g101evn01.0.dtb" - elif [ ${boardrev} = "1.3A" ] || [ ${boardrev} = "1.3B" ]; then + elif [ ${boardrev} = "1" ]; then environment="${PRODUCT_OUT}am571x-idk-lcd-osd101t2587.dtb" else environment="${PRODUCT_OUT}am571x-idk-lcd-osd101t2587.dtb" @@ -99,7 +99,7 @@ elif [ ${cpu} = "DRA752" ]; then environment="${PRODUCT_OUT}am57xx-evm-reva3.dtb" fi elif [ ${cpu} = "DRA762" ]; then - if [ ${boardrev} = "1.3A" ] || [ ${boardrev} = "1.3B" ]; then + if [ ${boardrev} = "1" ]; then environment="${PRODUCT_OUT}am574x-idk-lcd-osd101t2587.dtb" else environment="${PRODUCT_OUT}am574-idk.dtb" @@ -164,7 +164,7 @@ fi echo "Create GPT partition table" ${FASTBOOT} oem format -if [ ${boardrev} = "1.3A" ] || [ ${boardrev} = "1.3B" ]; then +if [ ${boardrev} = "1" ]; then echo "Setting target for bootloader to spi" ${FASTBOOT} oem spi else -- cgit v1.2.3-54-g00ecf