summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishal Mahaveer2014-11-12 13:41:19 -0600
committerVishal Mahaveer2014-11-12 13:41:19 -0600
commitfcce88ae05feca16b73780b479b56fc4b982ba68 (patch)
treedf641bd7c12bdc044e19e8e5d2888f5b119474cc
parent88c190b824fdf57ebcb4a76c1ddb9f1363927617 (diff)
parent310ace1ca5b0e8c705d13120fb26b0b3ce1feab0 (diff)
downloaddevice-ti-jacinto6evm-fcce88ae05feca16b73780b479b56fc4b982ba68.tar.gz
device-ti-jacinto6evm-fcce88ae05feca16b73780b479b56fc4b982ba68.tar.xz
device-ti-jacinto6evm-fcce88ae05feca16b73780b479b56fc4b982ba68.zip
Merge remote-tracking branch 'omap-mirror/d-kitkat-mr2.1-release-k3.14' into sync
-rw-r--r--audio/legacy/audio_hw.c1
-rw-r--r--device.mk3
-rwxr-xr-xfastboot.sh10
-rw-r--r--fstab.jacinto6evmboard4
4 files changed, 7 insertions, 11 deletions
diff --git a/audio/legacy/audio_hw.c b/audio/legacy/audio_hw.c
index 772f17b..3979441 100644
--- a/audio/legacy/audio_hw.c
+++ b/audio/legacy/audio_hw.c
@@ -136,6 +136,7 @@ struct j6_stream_out {
136static const char *supported_cards[] = { 136static const char *supported_cards[] = {
137 "dra7evm", 137 "dra7evm",
138 "VayuEVM", 138 "VayuEVM",
139 "DRA7xxEVM",
139}; 140};
140 141
141#define SUPPORTED_IN_DEVICES (AUDIO_DEVICE_IN_BUILTIN_MIC | \ 142#define SUPPORTED_IN_DEVICES (AUDIO_DEVICE_IN_BUILTIN_MIC | \
diff --git a/device.mk b/device.mk
index 9da24d5..2e8e236 100644
--- a/device.mk
+++ b/device.mk
@@ -83,7 +83,8 @@ PRODUCT_PACKAGES += \
83 ion_tiler_test \ 83 ion_tiler_test \
84 iontest \ 84 iontest \
85 ion_ti_test2 \ 85 ion_ti_test2 \
86 vpetest 86 vpetest \
87 libdrm
87 88
88# Audio HAL modules 89# Audio HAL modules
89PRODUCT_PACKAGES += audio.primary.jacinto6 90PRODUCT_PACKAGES += audio.primary.jacinto6
diff --git a/fastboot.sh b/fastboot.sh
index 598212c..967901d 100755
--- a/fastboot.sh
+++ b/fastboot.sh
@@ -79,17 +79,11 @@ fi
79 79
80# Based on cpu, decide the dtb to flash, default fall back to J6 80# Based on cpu, decide the dtb to flash, default fall back to J6
81if [ ${cpu} = "J6ECO" ]; then 81if [ ${cpu} = "J6ECO" ]; then
82 environment="${PRODUCT_OUT}dra72-evm.dtb" 82 environment="${PRODUCT_OUT}dra72-evm-lcd10.dtb"
83else 83else
84 environment="${PRODUCT_OUT}dra7-evm.dtb" 84 environment="${PRODUCT_OUT}dra7-evm-lcd10.dtb"
85fi 85fi
86 86
87# Special case to flash dtb for 10" panel board
88if [ "$1" = "--revg" ] && [ ${cpu} = "J6" ]; then
89 environment="${PRODUCT_OUT}dra7-evm-g.dtb"
90fi
91
92
93# Create the filename 87# Create the filename
94bootimg="${PRODUCT_OUT}boot.img" 88bootimg="${PRODUCT_OUT}boot.img"
95uboot="${PRODUCT_OUT}u-boot.img" 89uboot="${PRODUCT_OUT}u-boot.img"
diff --git a/fstab.jacinto6evmboard b/fstab.jacinto6evmboard
index 1637a46..5ea42f2 100644
--- a/fstab.jacinto6evmboard
+++ b/fstab.jacinto6evmboard
@@ -10,6 +10,6 @@
10/dev/block/mmcblk0p7 /recovery emmc defaults defaults 10/dev/block/mmcblk0p7 /recovery emmc defaults defaults
11/dev/block/mmcblk0p4 /misc emmc defaults defaults 11/dev/block/mmcblk0p4 /misc emmc defaults defaults
12 12
13/devices/44000000.ocp/488c0000.omap_dwc3/488d0000.dwc3 /storage/usb0 vfat defaults voldmanaged=usb0:auto 13/devices/44000000.ocp/488c0000.omap_dwc3_2/488d0000.usb /storage/usb0 vfat defaults voldmanaged=usb0:auto
14/devices/44000000.ocp/48880000.omap_dwc3/48890000.dwc3 /storage/usb1 vfat defaults voldmanaged=usb1:auto 14/devices/44000000.ocp/48880000.omap_dwc3_1/48890000.usb /storage/usb1 vfat defaults voldmanaged=usb1:auto
15/devices/44000000.ocp/4809c000.mmc/mmc_host/mmc0 /storage/sdcard1 vfat defaults voldmanaged=sdcard1:auto 15/devices/44000000.ocp/4809c000.mmc/mmc_host/mmc0 /storage/sdcard1 vfat defaults voldmanaged=sdcard1:auto