Merge branch 'dev_pasdk_pp_pasdk69ArmDspCom' into 'dev_pasdk_pp_pasdk114matthdissue'
authorChitresh Gupta <chitresh.g@pathpartnertech.com>
Tue, 3 Jan 2017 10:37:10 +0000 (16:07 +0530)
committerChitresh Gupta <chitresh.g@pathpartnertech.com>
Tue, 3 Jan 2017 10:37:10 +0000 (16:07 +0530)
Conflicts:
build_paf_libs.bat
pasdk/test_arm/.cproject
pasdk/test_dsp/.cproject
pasdk/test_dsp/application/app.cmd
tools/alpha/thd_a.h
tools/alpha/thd_a.hdM

1  2 
pasdk/test_arm/application/app.cfg
pasdk/test_arm/application/app.cmd
pasdk/test_arm/framework/audioStreamDecodeProc.c
pasdk/test_dsp/application/app.cfg
pasdk/test_dsp/application/itopo/evmk2g/atboot.c

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 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');