Merge updates for PASDK-69
authorFrank Livingston <frank-livingston@ti.com>
Tue, 10 Jan 2017 20:02:18 +0000 (14:02 -0600)
committerFrank Livingston <frank-livingston@ti.com>
Tue, 10 Jan 2017 20:02:18 +0000 (14:02 -0600)
12 files changed:
1  2 
dolby_ip/ddp
dolby_ip/mat-thd
pasdk/paf
pasdk/test_arm/.cproject
pasdk/test_arm/application/app.cfg
pasdk/test_arm/application/app.cmd
pasdk/test_arm/framework/audioStreamDecodeProc.c
pasdk/test_dsp/.cproject
pasdk/test_dsp/application/app.cfg
pasdk/test_dsp/application/app.cmd
pasdk/test_dsp/application/itopo/evmk2g/atboot.c
scripts/build_paf_libs.bat

diff --cc dolby_ip/ddp
index 70376528948e4d05dcbf2f274972f563b0b3d12d,c9d649f1a289186f6f563f5c8b04637e16b31133..7ae29e7df461a84a584a559d51b32f46db65fc32
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 70376528948e4d05dcbf2f274972f563b0b3d12d
 -Subproject commit c9d649f1a289186f6f563f5c8b04637e16b31133
++Subproject commit 7ae29e7df461a84a584a559d51b32f46db65fc32
index e35b8c514bf48b0f5d5f2d4d100cbdc8716b4031,0d9c15e430d061ac11d85497188c358fef449f43..76a32aa15446a90ec2791715d4e9ff10fbf43625
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit e35b8c514bf48b0f5d5f2d4d100cbdc8716b4031
 -Subproject commit 0d9c15e430d061ac11d85497188c358fef449f43
++Subproject commit 76a32aa15446a90ec2791715d4e9ff10fbf43625
diff --cc pasdk/paf
index a1b662cd5f5852a2cf7074ad10c0e277e46e2d5a,6ce656414313f24af79b01ea66ddb94c53e18d9b..40523acd27ba7a374e0d8f2599a1be289ce371d5
+++ b/pasdk/paf
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit a1b662cd5f5852a2cf7074ad10c0e277e46e2d5a
 -Subproject commit 6ce656414313f24af79b01ea66ddb94c53e18d9b
++Subproject commit 40523acd27ba7a374e0d8f2599a1be289ce371d5
index bcb0a8a7b55b384a13484ee20d9ef0be6068983f,9e43c5486cbd2eadc346c284ec13014549e42aa1..2b5ef73c447e795ac224236e4fed05b11bb91d13
@@@ -94,7 -95,7 +95,8 @@@
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/f/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/f/alpha&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/util/c67x_cintrins&quot;"/>
 +                                                                      <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/util/da10x_misc&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/util/statusop_common&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/common&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/shared&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/test_arm/framework&quot;"/>
index 6ec83cee94f0e9947454624704cb0c971bfe0232,b3eda96fbc28cef0e7102e3aa7b0aaac7d44fc3c..3a989b1f0bfe044b801f014c015bd1f5c117ed91
@@@ -76,8 -76,9 +76,9 @@@ xdc.useModule('ti.sdo.utils.MultiProc')
  xdc.global.SR0_cacheEnable = true;
  xdc.global.SrMsmcMem_cacheEnable = true;
  xdc.global.SrDDr3Mem_cacheEnable = true;
+ xdc.global.SrDDr3_2Mem_cacheEnable = false;
  xdc.global.procName = "HOST";
 -var ipc_cfg = xdc.loadCapsule("C:/ti/processor_audio_sdk_1_00_00_00/pasdk/shared/ipc.cfg.xs");
 +var ipc_cfg = xdc.loadCapsule("C:/ti/processor_audio_sdk_1_00_00_01/pasdk/shared/ipc.cfg.xs");
  
  /* select ipc libraries */
  var Build = xdc.useModule('ti.sdo.ipc.Build');
index a2088a83d557d7c93055f8e94b32bf3bba3b73bf,17311c47413364dbefbfe07e4f4ec1f9bb4d3a7c..6baaaf3588cb27a0f9a6e39f71eec3b457cf3db5
@@@ -32,17 -32,16 +32,17 @@@ All rights reserved
  *
  */
  
 -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_00\pasdk\paf\pa\build\a15\release )
 -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_00\dolby_ip\intrinsics\Dolby_Intrinsics_Imp\lib_float_A15 )
 -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_00\dolby_ip\ddp\Dolby_Digital_Plus_Decoder_Imp\Source_Code\make\ddp_udc_lib\a15 )
 -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_00\dolby_ip\ddp\Dolby_Digital_Plus_Decoder_Imp\Source_Code\make\ddp_udc_wrapper\a15 )
 -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_00\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\dthd_dec_lib\a15 )
 -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_00\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\mat_dec_lib\a15 )
 -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_00\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\thd_alg_lib\a15 )
 +SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_01\pasdk\paf\pa\build\a15\release )
 +SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_01\dolby_ip\intrinsics\Dolby_Intrinsics_Imp\lib_float_A15 )
 +SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_01\dolby_ip\ddp\Dolby_Digital_Plus_Decoder_Imp\Source_Code\make\ddp_udc_lib\a15 )
 +SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_01\dolby_ip\ddp\Dolby_Digital_Plus_Decoder_Imp\Source_Code\make\ddp_udc_wrapper\a15 )
 +SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_01\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\dthd_dec_lib\a15 )
 +SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_01\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\mat_dec_lib\a15 )
 +SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_01\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\thd_alg_lib\a15 )
 +SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_01\pasdk\paf\pa\util\da10x_misc\a15\release )
  
  INPUT ( c67x_cintrins_elf.lib simulate_dma_elf.lib )
- INPUT ( acp_elf.lib asp_std_elf.lib com_asp_elf.lib com_dec_elf.lib pcm1_elf.lib  )
+ INPUT ( acp_elf.lib asp_std_elf.lib com_asp_elf.lib com_dec_elf.lib pcm1_elf.lib statusop_common_elf.lib )
  INPUT ( dlb_intrinsics_generic_float32_release.a )
  INPUT ( ddp_dec_lib_generic_wrapper_release.a ddp_dec_lib_generic_float32_release.a )
  INPUT ( mat_dec_lib_generic_float32_release.lib thd_alg_lib_generic_float32_release.lib dthd_dec_lib_generic_float32_release.lib )
index 82f26fe9465f59d6b13f354fd7892f54e80ad116,cd0dc1259f244c00b31c1a4f320a0e179a5d62f3..51fe09bfa062f13e036bebcfe50ff9d02f07e422
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/f/s3&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/f/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/f/alpha&quot;"/>
 +                                                                      <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/util/da10x_misc&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/util/statusop_common&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/test_dsp/framework&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/test_dsp/application/itopo/evmk2g/alpha&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/test_dsp/sio&quot;"/>
index 043240eb99c0014c0bc4c5d62e1c172ba6f06d51,3e933dd39c24b52dc732d4e1a7720ec7224a9a43..b497d362ba3d1b2ebcf5963d40740dc53eece833
@@@ -81,8 -82,9 +82,9 @@@ xdc.useModule('ti.sdo.utils.MultiProc')
  xdc.global.SR0_cacheEnable = true;
  xdc.global.SrMsmcMem_cacheEnable = true;
  xdc.global.SrDDr3Mem_cacheEnable = true;
+ xdc.global.SrDDr3_2Mem_cacheEnable = false;
  xdc.global.procName = "CORE0";
 -var ipc_cfg = xdc.loadCapsule("C:/ti/processor_audio_sdk_1_00_00_00/pasdk/shared/ipc.cfg.xs");
 +var ipc_cfg = xdc.loadCapsule("C:/ti/processor_audio_sdk_1_00_00_01/pasdk/shared/ipc.cfg.xs");
  
  /* select ipc libraries */
  var Build = xdc.useModule('ti.sdo.ipc.Build');
index 7a3f402dfa075fee7068d09c426c63462a524c31,617499336f1459f71641aad37ab04c95ed9afe53..450d6a97668e2247276b435d03972413a147ea9a
@@@ -52,7 -50,7 +52,8 @@@ All rights reserved
  -l"pce2_elf.lib"
  -l"pcm1_elf.lib"
  -l"dcs7_elf.lib"
 +-l"misc_elf.lib"
+ -l"statusop_common_elf.lib"
  
  -l"dolby_oar_lib.lib"
  -l"libcar_c66_float_release.lib"
index a50b59564337a638d769c46224c8b0ceedf5eb20,0000000000000000000000000000000000000000..8712e9df61e9eb6230f0d88d206fed7384487d62
mode 100644,000000..100644
--- /dev/null
@@@ -1,137 -1,0 +1,146 @@@
 +@echo off
 +:: *************************************************************************
 +::  FILE           : build_paf_libs.bat
 +::  DESCRIPTION    :
 +::
 +::     Builds ARM/DSP PAF libraries.
 +::     Assumes setup_env.bat has been called.
 +::
 +:: *************************************************************************
 +
 +:: %1:
 +::  <none>: Build PAF libraries for ARM & DSP
 +::    DSP : Build PAF libraries for DSP
 +::    ARM : Build PAF libraries for ARM
 +@echo Executing:  %~fn0 %1
 +
 +if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
 +
 +:: Set PASDK local root directory
 +set PASDK_LROOT_DIR=%PASDK_ROOT_DIR%pasdk
 +:: Set PAF root directory
 +set PAF_ROOT_DIR=%PASDK_LROOT_DIR%\paf
 +
 +if "%1"=="ARM" goto arm_libs
 +
 +rem
 +rem DSP libraries
 +rem
 +
 +:dsp_libs
 +pushd %PAF_ROOT_DIR%\pa\build
 +sed -i -e "s/export ARCH   = a15/export ARCH   = c66x/g" target.mk
 +popd
 +
 +pushd %PAF_ROOT_DIR%\pa\asp\com
 +gmake clean
 +gmake install
 +popd
 +
 +pushd %PAF_ROOT_DIR%\pa\dec\pcm1
 +gmake clean
 +gmake install
 +popd
 +
 +pushd %PAF_ROOT_DIR%\pa\dec\com
 +gmake clean
 +gmake install
 +popd
 +
 +pushd %PAF_ROOT_DIR%\pa\asp\std
 +gmake clean
 +gmake install
 +popd
 +
 +pushd %PAF_ROOT_DIR%\pa\sio\acp1
 +gmake clean
 +gmake install
 +popd
 +
 +pushd %PAF_ROOT_DIR%\pa\enc\pce2
 +gmake clean
 +gmake install
 +popd
 +
 +pushd %PAF_ROOT_DIR%\pa\sio\paf
 +gmake clean
 +gmake install
 +popd
 +
 +pushd %PAF_ROOT_DIR%\pa\sio\dcs7
 +gmake clean
 +gmake install
 +popd
 +
 +pushd %PAF_ROOT_DIR%\pa\asp\ae0
 +gmake clean
 +gmake install
 +popd
 +
++pushd %PAF_ROOT_DIR%\pa\util\statusop_common
++gmake clean
++gmake install
++popd
++
 +if "%1"=="DSP" goto cleanupenv
 +
 +
 +rem
 +rem ARM libraries
 +rem
 +
 +:arm_libs
 +pushd %PAF_ROOT_DIR%\pa\build
 +sed -i -e "s/export ARCH   = c66x/export ARCH   = a15/g" target.mk
 +popd
 +
 +pushd %PAF_ROOT_DIR%\pa\asp\com
 +gmake clean
 +gmake install
 +popd
 +
 +pushd %PAF_ROOT_DIR%\pa\dec\pcm1
 +gmake clean
 +gmake install
 +popd
 +
 +pushd %PAF_ROOT_DIR%\pa\dec\com
 +gmake clean
 +gmake install
 +popd
 +
 +pushd %PAF_ROOT_DIR%\pa\asp\std
 +gmake clean
 +gmake install
 +popd
 +
 +pushd %PAF_ROOT_DIR%\pa\sio\acp1
 +gmake clean
 +gmake install
 +popd
 +
 +pushd %PAF_ROOT_DIR%\pa\util\c67x_cintrins
 +gmake clean
 +gmake install
 +popd
 +
 +pushd %PAF_ROOT_DIR%\pa\util\simulate_dma
 +gmake clean
 +gmake install
 +popd
 +
++pushd %PAF_ROOT_DIR%\pa\util\statusop_common
++gmake clean
++gmake install
++popd
 +
 +:cleanupenv
 +pushd %PAF_ROOT_DIR%\pa\build
 +sed -i -e "s/export ARCH   = a15/export ARCH   = c66x/g" target.mk
 +popd
 +
 +set PASDK_LROOT_DIR=
 +set PAF_ROOT_DIR=
 +
 +
 +:end