summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c09465a)
raw | patch | inline | side by side (parent: c09465a)
author | Frank Livingston <frank-livingston@ti.com> | |
Fri, 22 Jun 2018 18:31:49 +0000 (13:31 -0500) | ||
committer | Frank Livingston <frank-livingston@ti.com> | |
Fri, 22 Jun 2018 18:31:49 +0000 (13:31 -0500) |
- Update PAF build script to take correct CGT install directory.
- Update env setup script to set PAF related build env vars.
- Update env setup script to set PAF related build env vars.
pasdk/paf | patch | blob | history | |
scripts/build_paf_libs.bat | patch | blob | history | |
scripts/setup_env.bat | patch | blob | history |
diff --git a/pasdk/paf b/pasdk/paf
index a9e416fc03127930c18b4e27fa0b87a54cd926ec..3b2e70e89f2b87721fbb54bfe3aa509c7654af7e 160000 (submodule)
--- a/pasdk/paf
+++ b/pasdk/paf
-Subproject commit a9e416fc03127930c18b4e27fa0b87a54cd926ec
+Subproject commit 3b2e70e89f2b87721fbb54bfe3aa509c7654af7e
index f267f0fd723e23f11a4f2f3d019d27b079ca4137..6242b111ebfbff8a9176e1b8c3ab6f7d4207bf72 100644 (file)
set ARCH=c66x
pushd %PAF_ROOT_DIR%\pa\asp\com
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%C6X_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\dec\pcm1
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%C6X_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\dec\com
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%C6X_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\asp\std
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%C6X_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\sio\acp1
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%C6X_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\enc\pce2
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%C6X_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\sio\paf
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%C6X_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\sio\dcs7
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%C6X_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\util\statusop_common
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%C6X_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\asp\ae0
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%C6X_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\asp\ml0
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%C6X_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\asp\fil
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%C6X_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\asp\src4
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%C6X_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\asp\del3
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%C6X_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%C6X_CGT_INSTALL_DIR%
popd
if "%1"=="DSP" goto end
set ARCH=a15
pushd %PAF_ROOT_DIR%\pa\asp\com
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%ARM_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%ARM_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%ARM_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\dec\pcm1
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%ARM_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%ARM_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%ARM_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\dec\com
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%ARM_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%ARM_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%ARM_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\asp\std
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%ARM_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%ARM_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%ARM_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\sio\acp1
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%ARM_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%ARM_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%ARM_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\util\c67x_cintrins
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%ARM_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%ARM_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%ARM_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\util\simulate_dma
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%ARM_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%ARM_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%ARM_CGT_INSTALL_DIR%
popd
pushd %PAF_ROOT_DIR%\pa\util\statusop_common
+@echo gmake clean ARCH=%ARCH%
gmake clean ARCH=%ARCH%
-gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS=%ARM_CGT_INSTALL_DIR%
+@echo gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%ARM_CGT_INSTALL_DIR%
+gmake install ROOTDIR=%PAF_ROOT_DIR% ARCH=%ARCH% CG_TOOLS_%ARCH%=%ARM_CGT_INSTALL_DIR%
popd
diff --git a/scripts/setup_env.bat b/scripts/setup_env.bat
index e10bc2d7333750cb96dfaed0cacc7d5bb1b4f3fe..e2bc1da47f49d1ab81eea3b018be0e3bb4537175 100644 (file)
--- a/scripts/setup_env.bat
+++ b/scripts/setup_env.bat
:: *************************************************************************
:: *** Specify tool 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
-rem set XDAIS_VERSION=7_24_00_04
-rem set CCS_VER=6
-rem set C6X_CGT_VER_DOT=8.1.0
-rem set ARM_CGT_VERSION=4_8-2014q3
-rem set SED_VER_DOT=4.2.1
-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
-rem set XDAIS_VERSION=7_24_00_04
-rem set CCS_VER=7
-rem set CCS_VER_CGT=6
-rem set C6X_CGT_VER_DOT=8.1.0
-rem set ARM_CGT_VERSION=4_8-2014q3
-rem rem set C6X_CGT_VER_DOT=8.1.3
-rem rem set ARM_CGT_VERSION=4_9-2015q3
-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.05 component versions
::
set BIOS_VERSION_DH=6_46_05_55
:: SYSBIOS version for DTSX components
set BIOS_VERSION_DTSX=6_46_05_55
+:: UIA version
+set UIA_VERSION=2_21_02_07
:: IPC version
set IPC_VERSION=3_47_01_00
+:: PDK version
+set PDK_VERSION=1_0_9
+:: EDMA3 LLD version
+set EDMA3_VERSION=2_12_05_30C
:: XDAIS version
set XDAIS_VERSION=7_24_00_04
+:: DSPLIB version
+set DSPLIB_VERSION=3_4_0_0
:: CCS version
set CCS_VER=7
:: SED version
set PYTHON_VER=27
:: Pkzip version
::set PKZIP_VER_DOT=9.20
+
:: Codegen tools
:: ARM CGT for PASDK
set ARM_CGT_VERSION=6-2017-q1-update
:: *************************************************************************
:: *** Specify install locations
:: *************************************************************************
-rem
-rem NOTE: These installation locations aren't currently tied into the build
-rem
+
+::
+:: PASDK install locations
+::
set CCS_INSTALL_DIR=%TI_TOOLS_DIR%\ccsv%CCS_VER%
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 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 UIA_INSTALL_DIR=%TI_TOOLS_DIR%\uia_%UIA_VERSION%
set IPC_INSTALL_DIR=%TI_TOOLS_DIR%\ipc_%IPC_VERSION%
+set PDK_INSTALL_DIR=%TI_TOOLS_DIR%\pdk_k2g_%PDK_VERSION%
+set EDMA3_INSTALL_DIR=%TI_TOOLS_DIR%\edma3_lld_%EDMA3_VERSION%
set XDAIS_INSTALL_DIR=%TI_TOOLS_DIR%\xdais_%XDAIS_VERSION%
set SED_INSTALL_DIR=%PA_TOOLS_DIR%\GnuWin32
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 install locations
::
-:: Codegen tools
-:: NOTE: These installation locations are tied into the build
set ARM_CGT_INSTALL_DIR=%TI_TOOLS_DIR%\gcc-arm-none-eabi-%ARM_CGT_VERSION%
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%
+
::
-:: PASDK
+:: PASDK install location
::
if "%PASDK_ROOT%" NEQ "" (
set PASDK_ROOT=%PASDK_ROOT_DIR%
set PASDK_ROOT=%~dp0..
)
+::
+:: PAF install locations
+::
+set CG_TOOLS_a15=%ARM_CGT_INSTALL_DIR%
+set CG_TOOLS_c66x=%C6X_CGT_INSTALL_DIR%
+set BIOSROOT=%TI_TOOLS_DIR%\bios_%BIOS_VERSION%
+set XDCROOT=%TI_TOOLS_DIR%\xdctools_%XDC_VERSION%
+set IPCROOT=%TI_TOOLS_DIR%\ipc_%IPC_VERSION%
+set PDKROOT=%TI_TOOLS_DIR%\pdk_k2g_%PDK_VERSION%
+set EDMA3LLDROOT=%TI_TOOLS_DIR%\edma3_lld_%EDMA3_VERSION%
+set XDAISROOT=%TI_TOOLS_DIR%\xdais_%XDAIS_VERSION%
+set DSPLIBROOT=%TI_TOOLS_DIR%\dsplib_c66x_%DSPLIB_VERSION%
+set ROOTDIR=%PASDK_ROOT%\pasdk\paf
+
+
rem @echo #######################################################################
rem @echo ## All Required Tools Installed