From d563a9a93a1f3111605b3d621ae2bcd7e24e214d Mon Sep 17 00:00:00 2001 From: Frank Livingston Date: Mon, 5 Mar 2018 14:52:19 -0600 Subject: [PATCH] PASDK-585:Update build scripts Allow different XDC Tools, SYSBIOS, and ARM/DSP CGT for PASDK & IP. Provided BMDA overrides for XDC Tools & SYSBIOS. --- build_all.bat | 2 +- scripts/build_dh_libs.bat | 60 +++++++++++++++++------------ scripts/build_dtsx_libs.bat | 40 ++++++++++---------- scripts/build_parma_libs.bat | 40 ++++++++++---------- scripts/setup_env.bat | 73 +++++++++++++++++++++++++++--------- 5 files changed, 133 insertions(+), 82 deletions(-) diff --git a/build_all.bat b/build_all.bat index 9124d0de..439aacc1 100644 --- a/build_all.bat +++ b/build_all.bat @@ -139,7 +139,7 @@ if defined TRUE ( @call build_dtsxip_pkgs %DTSXIP_PKG_DIR% @popd - rem Install DH-IP packages + rem Install DTSX-IP packages @pushd scripts @call install_dtsxip_pkgs %DTSXIP_PKG_DIR% @popd diff --git a/scripts/build_dh_libs.bat b/scripts/build_dh_libs.bat index 4aa91f3d..a7048e75 100644 --- a/scripts/build_dh_libs.bat +++ b/scripts/build_dh_libs.bat @@ -24,8 +24,18 @@ set DOLBY_IP_LROOT=%PASDK_ROOT_DIR%\dolby_ip set PASDK_ROOT_DIR_FS=%PASDK_ROOT_DIR:\=/% set DOLBY_IP_LROOT_FS=%DOLBY_IP_LROOT:\=/% -set ARM_CGT_INSTALL_DIR_FS=%ARM_CGT_INSTALL_DIR:\=/% -set C6X_CGT_INSTALL_DIR_FS=%C6X_CGT_INSTALL_DIR:\=/% +set ARM_CGT_INSTALL_DIR_DH_DEC_FS=%ARM_CGT_INSTALL_DIR_DH_DEC:\=/% +set C6X_CGT_INSTALL_DIR_DH_ASP_FS=%C6X_CGT_INSTALL_DIR_DH_ASP:\=/% + +:: +:: Set XDC tools & SYSBIOS install directory overrides. +:: For DH 1.1 certified components: +:: - this information is hard-coded in make files for all DH components but BMDA +:: - BMDA make file obtains this information from pa/build/tools.mk. +:: +:: Here override information in tools.mk +set XDC_INSTALL_DIR_DH_FS=%XDC_INSTALL_DIR_DH:\=/% +set BIOS_INSTALL_DIR_DH_FS=%BIOS_INSTALL_DIR_DH:\=/% :: @@ -45,8 +55,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake DOLBY_IP_ROOT=%DOLBY_IP_LROOT_FS% A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% -gmake DOLBY_IP_ROOT=%DOLBY_IP_LROOT_FS% A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% +echo gmake DOLBY_IP_ROOT=%DOLBY_IP_LROOT_FS% A15TOOLS=%ARM_CGT_INSTALL_DIR_DH_DEC_FS% +gmake DOLBY_IP_ROOT=%DOLBY_IP_LROOT_FS% A15TOOLS=%ARM_CGT_INSTALL_DIR_DH_DEC_FS% popd rem DDP Dec wrapper library pushd %DOLBY_IP_LROOT%\ddp\Dolby_Digital_Plus_Decoder_Imp\Source_Code\make\ddp_udc_wrapper\a15 @@ -56,8 +66,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% -gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% +echo gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% A15TOOLS=%ARM_CGT_INSTALL_DIR_DH_DEC_FS% +gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% A15TOOLS=%ARM_CGT_INSTALL_DIR_DH_DEC_FS% popd :: THD Dec core library @@ -68,8 +78,8 @@ echo gmake clean_lib gmake clean_lib echo. echo %cd% -echo gmake DOLBY_IP_ROOT=%DOLBY_IP_LROOT% A15TOOLS=%ARM_CGT_INSTALL_DIR% -gmake DOLBY_IP_ROOT=%DOLBY_IP_LROOT% A15TOOLS=%ARM_CGT_INSTALL_DIR% +echo gmake DOLBY_IP_ROOT=%DOLBY_IP_LROOT% A15TOOLS=%ARM_CGT_INSTALL_DIR_DH_DEC% +gmake DOLBY_IP_ROOT=%DOLBY_IP_LROOT% A15TOOLS=%ARM_CGT_INSTALL_DIR_DH_DEC% popd :: MAT Dec core library pushd %DOLBY_IP_LROOT%\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\mat_dec_lib\a15 @@ -79,8 +89,8 @@ echo gmake clean_lib gmake clean_lib echo. echo %cd% -echo gmake DOLBY_IP_ROOT=%DOLBY_IP_LROOT% A15TOOLS=%ARM_CGT_INSTALL_DIR% -gmake DOLBY_IP_ROOT=%DOLBY_IP_LROOT% A15TOOLS=%ARM_CGT_INSTALL_DIR% +echo gmake DOLBY_IP_ROOT=%DOLBY_IP_LROOT% A15TOOLS=%ARM_CGT_INSTALL_DIR_DH_DEC% +gmake DOLBY_IP_ROOT=%DOLBY_IP_LROOT% A15TOOLS=%ARM_CGT_INSTALL_DIR_DH_DEC% popd :: MAT-THD Dec wrapper library pushd %DOLBY_IP_LROOT%\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\thd_alg_lib\a15 @@ -90,8 +100,8 @@ echo gmake clean_lib gmake clean_lib echo. echo %cd% -echo gmake PASDK_ROOT=%PASDK_ROOT_DIR% A15TOOLS=%ARM_CGT_INSTALL_DIR% -gmake PASDK_ROOT=%PASDK_ROOT_DIR% A15TOOLS=%ARM_CGT_INSTALL_DIR% +echo gmake PASDK_ROOT=%PASDK_ROOT_DIR% A15TOOLS=%ARM_CGT_INSTALL_DIR_DH_DEC% +gmake PASDK_ROOT=%PASDK_ROOT_DIR% A15TOOLS=%ARM_CGT_INSTALL_DIR_DH_DEC% popd @@ -107,8 +117,8 @@ echo gmake cleanself gmake cleanself echo. echo %cd% -echo gmake DOLBY_IP_ROOT=%DOLBY_IP_LROOT_FS% C66TOOLS=%C6X_CGT_INSTALL_DIR_FS% -gmake DOLBY_IP_ROOT=%DOLBY_IP_LROOT_FS% C66TOOLS=%C6X_CGT_INSTALL_DIR_FS% +echo gmake DOLBY_IP_ROOT=%DOLBY_IP_LROOT_FS% C66TOOLS=%C6X_CGT_INSTALL_DIR_DH_ASP_FS% +gmake DOLBY_IP_ROOT=%DOLBY_IP_LROOT_FS% C66TOOLS=%C6X_CGT_INSTALL_DIR_DH_ASP_FS% popd :: CAR wrapper library pushd %DOLBY_IP_LROOT%\car\Source_Code\car\make\alg_car\tisim_eabi_c66_ccs @@ -118,8 +128,8 @@ echo gmake cleanself PASDK_ROOT=%PASDK_ROOT_DIR_FS% gmake cleanself PASDK_ROOT=%PASDK_ROOT_DIR_FS% echo. echo %cd% -echo gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% C66TOOLS=%C6X_CGT_INSTALL_DIR_FS% -gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% C66TOOLS=%C6X_CGT_INSTALL_DIR_FS% +echo gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% C66TOOLS=%C6X_CGT_INSTALL_DIR_DH_ASP_FS% +gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% C66TOOLS=%C6X_CGT_INSTALL_DIR_DH_ASP_FS% popd :: @@ -135,20 +145,20 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% C66TOOLS=%C6X_CGT_INSTALL_DIR_FS% -gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% C66TOOLS=%C6X_CGT_INSTALL_DIR_FS% +echo gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% C66TOOLS=%C6X_CGT_INSTALL_DIR_DH_ASP_FS% +gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% C66TOOLS=%C6X_CGT_INSTALL_DIR_DH_ASP_FS% popd :: BMDA combined core+wrapper library pushd %DOLBY_IP_LROOT%\bmda\Source_Code\make echo. echo %cd% -echo gmake clean PASDK_ROOT=%PASDK_ROOT_DIR_FS% ARCH=c66x -gmake clean PASDK_ROOT=%PASDK_ROOT_DIR_FS% ARCH=c66x +echo gmake clean PASDK_ROOT=%PASDK_ROOT_DIR_FS% ARCH=c66x XDCROOT=%XDC_INSTALL_DIR_DH_FS% BIOSROOT=%BIOS_INSTALL_DIR_DH_FS% +gmake clean PASDK_ROOT=%PASDK_ROOT_DIR_FS% ARCH=c66x XDCROOT=%XDC_INSTALL_DIR_DH_FS% BIOSROOT=%BIOS_INSTALL_DIR_DH_FS% echo. echo %cd% -echo gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% ARCH=c66x CG_TOOLS=%C6X_CGT_INSTALL_DIR_FS% -gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% ARCH=c66x CG_TOOLS=%C6X_CGT_INSTALL_DIR_FS% +echo gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% ARCH=c66x CG_TOOLS=%C6X_CGT_INSTALL_DIR_DH_ASP_FS% XDCROOT=%XDC_INSTALL_DIR_DH_FS% BIOSROOT=%BIOS_INSTALL_DIR_DH_FS% +gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% ARCH=c66x CG_TOOLS=%C6X_CGT_INSTALL_DIR_DH_ASP_FS% XDCROOT=%XDC_INSTALL_DIR_DH_FS% BIOSROOT=%BIOS_INSTALL_DIR_DH_FS% popd @@ -159,8 +169,10 @@ set PAF_ROOT_DIR= set DOLBY_IP_LROOT= set PASDK_ROOT_DIR_FS= set DOLBY_IP_LROOT_FS= -set ARM_CGT_INSTALL_DIR_FS= -set C6X_CGT_INSTALL_DIR_FS= +set ARM_CGT_INSTALL_DIR_DH_DEC_FS= +set C6X_CGT_INSTALL_DIR_DH_ASP_FS= +set XDC_INSTALL_DIR_DH_FS= +set BIOS_INSTALL_DIR_DH_FS= :end diff --git a/scripts/build_dtsx_libs.bat b/scripts/build_dtsx_libs.bat index c9550512..b438f4cd 100644 --- a/scripts/build_dtsx_libs.bat +++ b/scripts/build_dtsx_libs.bat @@ -13,7 +13,7 @@ if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0.. set PASDK_ROOT_DIR_FS=%PASDK_ROOT_DIR:\=/% -set ARM_CGT_INSTALL_DIR_FS=%ARM_CGT_INSTALL_DIR:\=/% +set ARM_CGT_INSTALL_DIR_DTSX_DEC_FS=%ARM_CGT_INSTALL_DIR_DTSX_DEC:\=/% :: Save path @@ -30,8 +30,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% -gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% +echo gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% +gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% popd pushd %DTSX_SOURCE_PATH%\la-strm-reconstruction\misc\build\a15\Release @@ -41,8 +41,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% -gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% +echo gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% +gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% popd pushd %DTSX_SOURCE_PATH%\lbr\misc\build\a15\lbr\Release @@ -52,8 +52,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% -gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% +echo gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% +gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% popd pushd %DTSX_SOURCE_PATH%\lbr\misc\build\a15\lbrdec\Release @@ -63,8 +63,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% -gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% +echo gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% +gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% popd pushd %DTSX_SOURCE_PATH%\dts-3d\misc\build\a15\Release @@ -74,8 +74,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% -gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% +echo gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% +gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% popd pushd %DTSX_SOURCE_PATH%\dts-base\misc\build\a15\Release @@ -85,8 +85,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% -gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% +echo gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% +gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% popd pushd %DTSX_SOURCE_PATH%\common-flib\misc\build\a15\Release @@ -96,8 +96,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% -gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% +echo gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% +gmake A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% popd pushd %DTSX_SOURCE_PATH%\dtshd-c-decoder\misc\build\a15\lib\Release @@ -107,8 +107,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo PASDK_ROOT=%PASDK_ROOT_DIR_FS% A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% -gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% +echo PASDK_ROOT=%PASDK_ROOT_DIR_FS% A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% +gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% popd pushd %DTSX_SOURCE_PATH%\alg\misc\build\a15\Release @@ -118,13 +118,13 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% -gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% A15TOOLS=%ARM_CGT_INSTALL_DIR_FS% +echo gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% +gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% A15TOOLS=%ARM_CGT_INSTALL_DIR_DTSX_DEC_FS% popd set path=%PATH_ORG% set PASDK_ROOT_DIR_FS= -set ARM_CGT_INSTALL_DIR_FS= +set ARM_CGT_INSTALL_DIR_DTSX_DEC_FS= set PATH_ORG= set DTSX_SOURCE_PATH= diff --git a/scripts/build_parma_libs.bat b/scripts/build_parma_libs.bat index d63add82..0af2574d 100644 --- a/scripts/build_parma_libs.bat +++ b/scripts/build_parma_libs.bat @@ -13,7 +13,7 @@ if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0.. set PASDK_ROOT_DIR_FS=%PASDK_ROOT_DIR:\=/% -set C6X_CGT_INSTALL_DIR_PARMA_FS=%C6X_CGT_INSTALL_DIR_PARMA:\=/% +set C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA:\=/% SET DTSX_SOURCE_PATH=..\3p-ip-dts\Source_Code\PARMA @@ -24,8 +24,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% -gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% +echo gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% +gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% popd pushd %DTSX_SOURCE_PATH%\la-strm-reconstruction\misc\build\c66x\Release @@ -35,8 +35,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% -gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% +echo gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% +gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% popd pushd %DTSX_SOURCE_PATH%\lbr\misc\build\c66x\lbr\Release @@ -46,8 +46,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% -gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% +echo gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% +gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% popd pushd %DTSX_SOURCE_PATH%\lbr\misc\build\c66x\lbrdec\Release @@ -57,8 +57,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% -gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% +echo gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% +gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% popd pushd %DTSX_SOURCE_PATH%\dts-3d\misc\build\c66x\Release @@ -68,8 +68,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% -gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% +echo gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% +gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% popd pushd %DTSX_SOURCE_PATH%\dts-base\misc\build\c66x\Release @@ -79,8 +79,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% -gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% +echo gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% +gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% popd pushd %DTSX_SOURCE_PATH%\common-flib\misc\build\c66x\Release @@ -90,8 +90,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% -gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% +echo gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% +gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% popd pushd %DTSX_SOURCE_PATH%\dtshd-c-decoder\misc\build\c66x\lib\Release @@ -101,8 +101,8 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% -gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% +echo gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% +gmake C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% popd pushd %DTSX_SOURCE_PATH%\alg\misc\build\c66x\Release @@ -112,11 +112,11 @@ echo gmake clean gmake clean echo. echo %cd% -echo gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% -gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% C66TOOLS=%C6X_CGT_INSTALL_DIR_PARMA_FS% +echo gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% +gmake PASDK_ROOT=%PASDK_ROOT_DIR_FS% C66TOOLS=%C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS% popd set PASDK_ROOT_DIR_FS= -set C6X_CGT_INSTALL_DIR_PARMA_FS= +set C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA_FS= set DTSX_SOURCE_PATH= diff --git a/scripts/setup_env.bat b/scripts/setup_env.bat index f7f9b650..58581ca5 100644 --- a/scripts/setup_env.bat +++ b/scripts/setup_env.bat @@ -27,7 +27,9 @@ rem %PASDK_DRIVE% :: ************************************************************************* :: *** Specify tool versions :: ************************************************************************* -rem ProcSDK 2.0.2.11 component versions +:: +:: ProcSDK 2.0.2.11 component versions +:: rem set BIOS_VERSION=6_45_01_29 rem set XDC_VERSION=3_32_00_06_core rem set IPC_VERSION=3_42_00_02 @@ -40,7 +42,10 @@ rem set PYTHON_VER=27 rem set PKZIP_VER_DOT=9.20 :: Custom IPC version rem set IPC_VERSION=3_43_00_00_eng + +:: :: PrSDK 4.0.0.4 component versions +:: rem set BIOS_VERSION=6_46_05_55 rem set XDC_VERSION=3_32_01_22_core rem set IPC_VERSION=ipc_3_46_00_02 @@ -55,19 +60,47 @@ rem set C6X_CGT_VER_DOT_PARMA=7.4.4 rem set SED_VER_DOT=4.2.1 rem set PYTHON_VER=27 rem set PKZIP_VER_DOT=9.20 + +:: :: PrSDK 4.03.00.02 Build #1182 component versions -set BIOS_VERSION=6_52_00_12 +:: +:: XDC tools version for PASDK set XDC_VERSION=3_50_03_33_core +:: XDC tools version for DH components +set XDC_VERSION_DH=3_32_01_22_core +:: XDC tools version for DTSX components +set XDC_VERSION_DTSX=3_32_01_22_core +:: SYSBIOS version for PASDK +set BIOS_VERSION=6_52_00_12 +:: SYSBIOS version for DH components +set BIOS_VERSION_DH=6_46_05_55 +:: SYSBIOS version for DTSX components +set BIOS_VERSION_DTSX=6_46_05_55 +:: IPC version set IPC_VERSION=ipc_3_47_01_00 +:: XDAIS version set XDAIS_VERSION=7_24_00_04 +:: CCS version set CCS_VER=7 -set CCS_VER_CGT=6 -set C6X_CGT_VER_DOT=8.1.0 -set ARM_CGT_VERSION=6-2017-q1-update -set C6X_CGT_VER_DOT_PARMA=7.4.4 +:: SED version set SED_VER_DOT=4.2.1 +:: Python version set PYTHON_VER=27 -set PKZIP_VER_DOT=9.20 +:: Pkzip version +::set PKZIP_VER_DOT=9.20 +:: Codegen tools +:: ARM CGT for PASDK +set ARM_CGT_VERSION=6-2017-q1-update +:: ARM CGT for DH (decoder) components +set ARM_CGT_VERSION_DH_DEC=4_8-2014q3 +:: ARM CGT for DTS:X (decoder) components +set ARM_CGT_VERSION_DTSX_DEC=4_8-2014q3 +:: C6X CGT for PASDK +set C6X_CGT_VER_DOT=8.2.2 +:: C6X CGT for DH (ASP) components +set C6X_CGT_VER_DOT_DH_ASP=8.1.0 +:: C6X CGT for DTS:X (ASP, PARMA) components +set C6X_CGT_VER_DOT_DTSX_ASP_PARMA=7.4.4 :: ************************************************************************* @@ -77,9 +110,12 @@ rem rem NOTE: These installation locations aren't currently tied into the build rem set CCS_INSTALL_DIR=%TI_TOOLS_DIR%\ccsv%CCS_VER% -set CCS_INSTALL_DIR_CGT=%TI_TOOLS_DIR%\ccsv%CCS_VER_CGT% -set BIOS_INSTALL_DIR=%TI_TOOLS_DIR%\bios_%BIOS_VERSION% +set XDC_INSTALL_DIR_DH=%TI_TOOLS_DIR%\xdctools_%XDC_VERSION_DH% +set XDC_INSTALL_DIR_DTSX=%TI_TOOLS_DIR%\xdctools_%XDC_VERSION_DTSX% set XDC_INSTALL_DIR=%TI_TOOLS_DIR%\xdctools_%XDC_VERSION% +set BIOS_INSTALL_DIR_DH=%TI_TOOLS_DIR%\bios_%BIOS_VERSION_DH% +set BIOS_INSTALL_DIR_DTSX=%TI_TOOLS_DIR%\bios_%BIOS_VERSION_DTSX% +set BIOS_INSTALL_DIR=%TI_TOOLS_DIR%\bios_%BIOS_VERSION% set IPC_INSTALL_DIR=%TI_TOOLS_DIR%\ipc_%IPC_VERSION% set XDAIS_INSTALL_DIR=%TI_TOOLS_DIR%\xdais_%XDAIS_VERSION% set SED_INSTALL_DIR=%PA_TOOLS_DIR%\GnuWin32 @@ -87,13 +123,12 @@ set PYTHON_INSTALL_DIR=%PA_TOOLS_DIR%\Python%PYTHON_VER% set ZIP_INSTALL_DIR=%PA_TOOLS_DIR% set CYGWIN_INSTALL_DIR=%TOOLS_DRIVE%\cygwin\bin :: Codegen tools -rem set C6X_CGT_INSTALL_DIR=%CCS_INSTALL_DIR_CGT%\tools\compiler\ti-cgt-c6000_%C6X_CGT_VER_DOT% -rem set ARM_CGT_INSTALL_DIR=%CCS_INSTALL_DIR_CGT%\tools\compiler\gcc-arm-none-eabi-%ARM_CGT_VERSION% -set C6X_CGT_INSTALL_DIR=%TI_TOOLS_DIR%\ti-cgt-c6000_%C6X_CGT_VER_DOT% set ARM_CGT_INSTALL_DIR=%TI_TOOLS_DIR%\gcc-arm-none-eabi-%ARM_CGT_VERSION% -rem set C6X_CGT_INSTALL_DIR=%TI_TOOLS_DIR%\ti-cgt-c6000_%C6X_CGT_VER_DOT% -rem set ARM_CGT_INSTALL_DIR=%TI_TOOLS_DIR%\gcc-arm-none-eabi-%ARM_CGT_VERSION% -set C6X_CGT_INSTALL_DIR_PARMA=%TI_TOOLS_DIR%\ti-cgt-c6000_%C6X_CGT_VER_DOT_PARMA% +set ARM_CGT_INSTALL_DIR_DH_DEC=%TI_TOOLS_DIR%\gcc-arm-none-eabi-%ARM_CGT_VERSION_DH_DEC% +set ARM_CGT_INSTALL_DIR_DTSX_DEC=%TI_TOOLS_DIR%\gcc-arm-none-eabi-%ARM_CGT_VERSION_DTSX_DEC% +set C6X_CGT_INSTALL_DIR=%TI_TOOLS_DIR%\ti-cgt-c6000_%C6X_CGT_VER_DOT% +set C6X_CGT_INSTALL_DIR_DH_ASP=%TI_TOOLS_DIR%\ti-cgt-c6000_%C6X_CGT_VER_DOT_DH_ASP% +set C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA=%TI_TOOLS_DIR%\ti-cgt-c6000_%C6X_CGT_VER_DOT_DTSX_ASP_PARMA% rem @echo ####################################################################### @@ -129,15 +164,19 @@ set XDCPATH=%XDC_INSTALL_DIR%/packages :: ************************************************************************* :: ** Clean Up :: ************************************************************************* -set BIOS_VERSION= set XDC_VERSION= +set XDC_VERSION_DH= +set XDC_VERSION_DTSX= +set BIOS_VERSION= +set BIOS_VERSION_DH= +set BIOS_VERSION_DTSX= set IPC_VERSION= set XDAIS_VERSION= set CCS_VER= set CCS_VER_CGT= set SED_VER_DOT= set PYTHON_VER= -set PKZIP_VER_DOT= +::set PKZIP_VER_DOT= set C6X_CGT_VER_DOT= set ARM_CGT_VERSION= set C6X_CGT_VER_DOT_PARMA= -- 2.39.2