From 4ce9f01eea7f65ffde42186faf35bd10a7793ce0 Mon Sep 17 00:00:00 2001 From: Frank Livingston Date: Wed, 30 Aug 2017 17:56:09 -0500 Subject: [PATCH] PASDK-376:Update ARM&DSP CCS projects Update DSP build configurations - Remove Rx Alpha simulation build configuraiton - Update Release build configuration Remove DSP&ARM app_pkgs.cmd - DSP CCS project: add command file pre-processing & linker symbols definitions. Control linker symbols using build configuration. - ARM CCS project: move library search paths to ARM CCS project. No simple way to preprocess GNU linker commmand file. Moving library search paths to ARM CCS project allows search paths to be defined using other symbols (e.g. PASDK root path) in CCS project). Update ARM&DSP CCS project build configurations - Rename Debug build configuration to Debug_DTSX - Rename Release build configuration to Release_DTSX - Rename Debug_pkgs build configuration to Debug_DTSX_IPPkgs - Update build scripts to use these updated build configuration names. --- pasdk/test_arm/.cproject | 65 ++--- pasdk/test_arm/application/app.cmd | 33 +-- pasdk/test_arm/application/app_pkgs.cmd | 89 ------- pasdk/test_dsp/.cproject | 307 +++++------------------- pasdk/test_dsp/application/app.cmd | 58 ++--- pasdk/test_dsp/application/app_pkgs.cmd | 128 ---------- scripts/build_ccs_projects.bat | 12 +- 7 files changed, 139 insertions(+), 553 deletions(-) delete mode 100644 pasdk/test_arm/application/app_pkgs.cmd delete mode 100644 pasdk/test_dsp/application/app_pkgs.cmd diff --git a/pasdk/test_arm/.cproject b/pasdk/test_arm/.cproject index 3d19f81a..ea39c30f 100644 --- a/pasdk/test_arm/.cproject +++ b/pasdk/test_arm/.cproject @@ -2,7 +2,7 @@ - + @@ -11,8 +11,8 @@ - + @@ -28,13 +28,13 @@ - - - + - + + + @@ -48,7 +48,7 @@ - + @@ -137,6 +134,17 @@ - + @@ -209,8 +217,8 @@ - + @@ -226,13 +234,13 @@ - - - + - + + + @@ -246,7 +254,7 @@ - + - + @@ -338,8 +346,8 @@ - + @@ -355,13 +363,13 @@ - - - + - + + + @@ -375,7 +383,7 @@ - + - + diff --git a/pasdk/test_arm/application/app.cmd b/pasdk/test_arm/application/app.cmd index 6039d6e5..d409bae0 100644 --- a/pasdk/test_arm/application/app.cmd +++ b/pasdk/test_arm/application/app.cmd @@ -31,29 +31,22 @@ All rights reserved. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-3d\misc\build\a15\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-base\misc\build\a15\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\common-flib\misc\build\a15\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbr\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbrdec\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\parma-dec\misc\build\a15\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dtshd-c-decoder\misc\build\a15\lib\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\la-strm-reconstruction\misc\build\a15\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\alg\misc\build\a15\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\pasdk\paf\pa\build\a15\release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\dolby_ip\intrinsics\Dolby_Intrinsics_Imp\lib_float_A15 ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\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_05\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_05\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_05\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_05\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_05\pasdk\paf\pa\util\da10x_misc\a15\release ) + +/* SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\pasdk\paf\pa\build\a15\release ) */ +/* SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\pasdk\paf\pa\util\da10x_misc\a15\release ) */ +/* SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-3d\misc\build\a15\Release ) */ +/* SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-base\misc\build\a15\Release ) */ +/* SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\common-flib\misc\build\a15\Release ) */ +/* SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbr\Release ) */ +/* SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbrdec\Release ) */ +/* SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\parma-dec\misc\build\a15\Release ) */ +/* SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dtshd-c-decoder\misc\build\a15\lib\Release ) */ +/* SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\la-strm-reconstruction\misc\build\a15\Release ) */ +/* SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\alg\misc\build\a15\Release ) */ +/* SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\dtsx-ip\build\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 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 ) */ INPUT ( misc_elf.lib ) INPUT ( dts-3d.lib dts-base.lib dts-flib.lib dts-lbr.lib dts-lbr-dec.lib dts-parma-dec.lib dtsx-c-decoder.lib la-strm-reconstruction.lib dts-alg.lib ) diff --git a/pasdk/test_arm/application/app_pkgs.cmd b/pasdk/test_arm/application/app_pkgs.cmd deleted file mode 100644 index 4e0da938..00000000 --- a/pasdk/test_arm/application/app_pkgs.cmd +++ /dev/null @@ -1,89 +0,0 @@ -/* -Copyright (c) 2017, Texas Instruments Incorporated - http://www.ti.com/ -All rights reserved. - -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions -* are met: -* -* Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* -* Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the -* distribution. -* -* Neither the name of Texas Instruments Incorporated nor the names of -* its contributors may be used to endorse or promote products derived -* from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -*/ - -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\pasdk\paf\pa\build\a15\release ) -/* -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\dolby_ip\intrinsics\Dolby_Intrinsics_Imp\lib_float_A15 ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\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_05\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_05\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_05\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_05\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_05\dolby_ip\dh-ip\build\a15\release ) -*/ -/* -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-3d\misc\build\a15\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-base\misc\build\a15\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\common-flib\misc\build\a15\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbr\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbrdec\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\parma-dec\misc\build\a15\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dtshd-c-decoder\misc\build\a15\lib\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\la-strm-reconstruction\misc\build\a15\Release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\alg\misc\build\a15\Release ) -*/ -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\3p-ip-dts\dtsx-ip\build\a15\release ) -SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_05\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 statusop_common_elf.lib ) -INPUT ( misc_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 ) */ -INPUT ( dts-3d.lib dts-base.lib dts-flib.lib dts-lbr.lib dts-lbr-dec.lib dts-parma-dec.lib dtsx-c-decoder.lib la-strm-reconstruction.lib dts-alg.lib ) - -SECTIONS -{ - .globalSection : - { - *(.commonSectionPafAsdtConfig) - } > HOST_DDR3 - - .commonSection : - { - *(.commonSectionPafAstConfig) - *(.commonSectionAcpStdBetaTable) - *(.commonSectionAcpCusBetaTable) - *(.commonSectionAcpCusPhiTable) - *(.commonSectionAcpCusSigmaTable) - } > COMMON_DDR3 - - .capBufSection (NOLOAD): - { - *(.gCapIbBufPcm) - *(.gCapIbBuf) - *(.gCapAfBuf) - } > DDR3 -} diff --git a/pasdk/test_dsp/.cproject b/pasdk/test_dsp/.cproject index a45d2c7f..760f06ec 100644 --- a/pasdk/test_dsp/.cproject +++ b/pasdk/test_dsp/.cproject @@ -2,7 +2,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -138,20 +138,6 @@ - - - - - - - - - - - - - - @@ -168,6 +154,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -497,7 +308,7 @@ - + @@ -588,24 +399,10 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + - + - + @@ -739,7 +562,7 @@ - + @@ -761,6 +584,7 @@