diff options
| author | Vishal Mahaveer <vishalm@ti.com> | 2014-11-12 13:41:19 -0600 |
|---|---|---|
| committer | Vishal Mahaveer <vishalm@ti.com> | 2014-11-12 13:41:19 -0600 |
| commit | fcce88ae05feca16b73780b479b56fc4b982ba68 (patch) | |
| tree | df641bd7c12bdc044e19e8e5d2888f5b119474cc | |
| parent | 88c190b824fdf57ebcb4a76c1ddb9f1363927617 (diff) | |
| parent | 310ace1ca5b0e8c705d13120fb26b0b3ce1feab0 (diff) | |
| download | jacinto6evm-fcce88ae05feca16b73780b479b56fc4b982ba68.tar.gz | |
Merge remote-tracking branch 'omap-mirror/d-kitkat-mr2.1-release-k3.14' into sync
| -rw-r--r-- | audio/legacy/audio_hw.c | 1 | ||||
| -rw-r--r-- | device.mk | 3 | ||||
| -rwxr-xr-x | fastboot.sh | 10 | ||||
| -rw-r--r-- | fstab.jacinto6evmboard | 4 |
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 { static const char *supported_cards[] = { "dra7evm", "VayuEVM", + "DRA7xxEVM", }; #define SUPPORTED_IN_DEVICES (AUDIO_DEVICE_IN_BUILTIN_MIC | \ @@ -83,7 +83,8 @@ PRODUCT_PACKAGES += \ ion_tiler_test \ iontest \ ion_ti_test2 \ - vpetest + vpetest \ + libdrm # Audio HAL modules PRODUCT_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 # Based on cpu, decide the dtb to flash, default fall back to J6 if [ ${cpu} = "J6ECO" ]; then - environment="${PRODUCT_OUT}dra72-evm.dtb" + environment="${PRODUCT_OUT}dra72-evm-lcd10.dtb" else - environment="${PRODUCT_OUT}dra7-evm.dtb" + environment="${PRODUCT_OUT}dra7-evm-lcd10.dtb" fi -# Special case to flash dtb for 10" panel board -if [ "$1" = "--revg" ] && [ ${cpu} = "J6" ]; then - environment="${PRODUCT_OUT}dra7-evm-g.dtb" -fi - - # Create the filename bootimg="${PRODUCT_OUT}boot.img" uboot="${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 @@ /dev/block/mmcblk0p7 /recovery emmc defaults defaults /dev/block/mmcblk0p4 /misc emmc defaults defaults -/devices/44000000.ocp/488c0000.omap_dwc3/488d0000.dwc3 /storage/usb0 vfat defaults voldmanaged=usb0:auto -/devices/44000000.ocp/48880000.omap_dwc3/48890000.dwc3 /storage/usb1 vfat defaults voldmanaged=usb1:auto +/devices/44000000.ocp/488c0000.omap_dwc3_2/488d0000.usb /storage/usb0 vfat defaults voldmanaged=usb0:auto +/devices/44000000.ocp/48880000.omap_dwc3_1/48890000.usb /storage/usb1 vfat defaults voldmanaged=usb1:auto /devices/44000000.ocp/4809c000.mmc/mmc_host/mmc0 /storage/sdcard1 vfat defaults voldmanaged=sdcard1:auto |