Changed master Makefile and added setup scripts to make sure out-of-box example can...

diff --git a/installer_builder/rtsc/Makefile b/installer_builder/rtsc/Makefile
index 2b17594777a1811383714d0f2d400d4241bf163d..cf460c42b3d1a07081681c0a5a45c4126ae406fe 100644 (file)
--- a/installer_builder/rtsc/Makefile
+++ b/installer_builder/rtsc/Makefile
@@ -58,7 +58,7 @@ XDC=$(XDCROOT)/xdc
 XS=$(XDCROOT)/xs\r
 XDCPKG=$(XDCROOT)/bin/xdcpkg\r
 \r
-COMPONENT_NAME = performance_audio\r
+COMPONENT_NAME = performance-audio\r
 VERSION = 1_3_0_00\r
 \r
 ifeq ($(TARGET),SOC_K2G)\r
@@ -99,11 +99,17 @@ all: package
        \r
 package: .lib .exports \r
        @echo "copying files ..."       \r
-       @cp -R $(PASDK_BASE_DIR)/pasdk/* exports/$(PACKAGE_NAME)/src\r
-       @cp -R $(PASDK_BASE_DIR)/tools exports/$(PACKAGE_NAME)\r
+       @cp -R $(PASDK_BASE_DIR)/pasdk exports/$(PACKAGE_NAME)/src\r
+       @rm -f -r exports/$(PACKAGE_NAME)/src/pasdk/paf/.git*\r
+       @cp -R $(PASDK_BASE_DIR)/tools/alpha exports/$(PACKAGE_NAME)/tools\r
+       @cp -R $(PASDK_BASE_DIR)/tools/bin exports/$(PACKAGE_NAME)/tools\r
+       @cp -R $(PASDK_BASE_DIR)/tools/pyalpha exports/$(PACKAGE_NAME)/tools\r
+       @cp -R $(PASDK_BASE_DIR)/tools/config.ini exports/$(PACKAGE_NAME)/tools\r
+       @cp -R $(PASDK_BASE_DIR)/tools/setup.bat exports/$(PACKAGE_NAME)/tools\r
+       @cp -R $(PASDK_BASE_DIR)/setup_build_env exports/$(PACKAGE_NAME)/src\r
        @cp -R $(PASDK_BASE_DIR)/install/pasdk/debug/* exports/$(PACKAGE_NAME)/prebuilt-binaries\r
-       @cp -R $(PASDK_BASE_DIR)/Makefile_demo exports/$(PACKAGE_NAME)/Makefile\r
-       @cp -R $(PASDK_BASE_DIR)/products.mak exports/$(PACKAGE_NAME)\r
+       @cp -R $(PASDK_BASE_DIR)/Makefile exports/$(PACKAGE_NAME)/src\r
+       @cp -R $(PASDK_BASE_DIR)/products.mak exports/$(PACKAGE_NAME)/src\r
        @echo "archive files to tar ball ..."\r
        @cd exports; zip -q -r $(PACKAGE_NAME).zip $(PACKAGE_NAME)\r
 \r

diff --git a/setup_build_env/setup_env.bat b/setup_build_env/setup_env.bat
new file mode 100644 (file)
index 0000000..e02d75b
--- /dev/null
+++ b/setup_build_env/setup_env.bat
@@ -0,0 +1,205 @@
+@echo off\r
+:: *************************************************************************\r
+::  FILE           : setup_env.bat\r
+::  DESCRIPTION    :\r
+::\r
+::     Setup tools environment.\r
+::\r
+:: *************************************************************************\r
+\r
+@echo Executing:  %~fn0\r
+\r
+\r
+:: *************************************************************************\r
+:: *** Specify install locations\r
+:: *************************************************************************\r
+:: Tools location\r
+set TOOLS_DRIVE=C:\r
+set TI_TOOLS_DIR=%TOOLS_DRIVE%\ti\r
+set PA_TOOLS_DIR=%TOOLS_DRIVE%\PA_Tools\r
+rem :: PASDK location\r
+rem set PASDK_DRIVE=T:\r
+rem set PASDK_INSTALL_DIR=%~dp0..\r
+rem subst %PASDK_DRIVE% /d\r
+rem subst %PASDK_DRIVE% %PASDK_INSTALL_DIR%\r
+rem %PASDK_DRIVE%\r
+\r
+:: *************************************************************************\r
+:: *** Specify tool versions\r
+:: *************************************************************************\r
+::\r
+:: PrSDK 4.03.00.05 component versions\r
+::\r
+:: XDC tools version for PASDK\r
+set XDC_VERSION=3_50_03_33_core\r
+:: XDC tools version for DH components\r
+set XDC_VERSION_DH=3_32_01_22_core\r
+:: XDC tools version for DTSX components\r
+set XDC_VERSION_DTSX=3_32_01_22_core\r
+:: SYSBIOS version for PASDK\r
+set BIOS_VERSION=6_52_00_12\r
+:: SYSBIOS version for DH components\r
+set BIOS_VERSION_DH=6_46_05_55\r
+:: SYSBIOS version for DTSX components\r
+set BIOS_VERSION_DTSX=6_46_05_55\r
+:: UIA version\r
+set UIA_VERSION=2_21_02_07\r
+:: IPC version\r
+set IPC_VERSION=3_47_01_00\r
+:: PDK version\r
+set PDK_VERSION=1_0_9\r
+:: EDMA3 LLD version\r
+set EDMA3_VERSION=2_12_05_30C\r
+:: XDAIS version\r
+set XDAIS_VERSION=7_24_00_04\r
+:: DSPLIB version\r
+set DSPLIB_VERSION=3_4_0_0\r
+:: CCS version\r
+set CCS_VER=7\r
+:: SED version\r
+set SED_VER_DOT=4.2.1\r
+:: Python version\r
+set PYTHON_VER=27\r
+:: Pkzip version\r
+::set PKZIP_VER_DOT=9.20\r
+\r
+:: Codegen tools\r
+:: ARM CGT for PASDK\r
+set ARM_CGT_VERSION=6-2017-q1-update\r
+:: ARM CGT for DH (decoder) components\r
+set ARM_CGT_VERSION_DH_DEC=4_8-2014q3\r
+:: ARM CGT for DTS:X (decoder) components\r
+set ARM_CGT_VERSION_DTSX_DEC=4_8-2014q3\r
+:: C6X CGT for PASDK\r
+set C6X_CGT_VER_DOT=8.2.2\r
+:: C6X CGT for DH (ASP) components\r
+set C6X_CGT_VER_DOT_DH_ASP=8.1.0\r
+:: C6X CGT for DTS:X (ASP, PARMA) components\r
+set C6X_CGT_VER_DOT_DTSX_ASP_PARMA=7.4.4\r
+\r
+\r
+:: *************************************************************************\r
+:: *** Specify install locations\r
+:: *************************************************************************\r
+\r
+::\r
+:: PASDK install locations\r
+::\r
+set CCS_INSTALL_DIR=%TI_TOOLS_DIR%\ccsv%CCS_VER%\r
+set XDC_INSTALL_DIR_DH=%TI_TOOLS_DIR%\xdctools_%XDC_VERSION_DH%\r
+set XDC_INSTALL_DIR_DTSX=%TI_TOOLS_DIR%\xdctools_%XDC_VERSION_DTSX%\r
+set XDC_INSTALL_DIR=%TI_TOOLS_DIR%\xdctools_%XDC_VERSION%\r
+set BIOS_INSTALL_DIR_DH=%TI_TOOLS_DIR%\bios_%BIOS_VERSION_DH%\r
+set BIOS_INSTALL_DIR_DTSX=%TI_TOOLS_DIR%\bios_%BIOS_VERSION_DTSX%\r
+set BIOS_INSTALL_DIR=%TI_TOOLS_DIR%\bios_%BIOS_VERSION%\r
+set UIA_INSTALL_DIR=%TI_TOOLS_DIR%\uia_%UIA_VERSION%\r
+set IPC_INSTALL_DIR=%TI_TOOLS_DIR%\ipc_%IPC_VERSION%\r
+set PDK_INSTALL_DIR=%TI_TOOLS_DIR%\pdk_k2g_%PDK_VERSION%\r
+set EDMA3_INSTALL_DIR=%TI_TOOLS_DIR%\edma3_lld_%EDMA3_VERSION%\r
+set XDAIS_INSTALL_DIR=%TI_TOOLS_DIR%\xdais_%XDAIS_VERSION%\r
+set SED_INSTALL_DIR=%PA_TOOLS_DIR%\GnuWin32\r
+set PYTHON_INSTALL_DIR=%PA_TOOLS_DIR%\Python%PYTHON_VER%\r
+set ZIP_INSTALL_DIR=%PA_TOOLS_DIR%\r
+set CYGWIN_INSTALL_DIR=%TOOLS_DRIVE%\cygwin\bin\r
+\r
+::\r
+:: Codegen tools install locations\r
+::\r
+set ARM_CGT_INSTALL_DIR=%TI_TOOLS_DIR%\gcc-arm-none-eabi-%ARM_CGT_VERSION%\r
+set ARM_CGT_INSTALL_DIR_DH_DEC=%TI_TOOLS_DIR%\gcc-arm-none-eabi-%ARM_CGT_VERSION_DH_DEC%\r
+set ARM_CGT_INSTALL_DIR_DTSX_DEC=%TI_TOOLS_DIR%\gcc-arm-none-eabi-%ARM_CGT_VERSION_DTSX_DEC%\r
+set C6X_CGT_INSTALL_DIR=%TI_TOOLS_DIR%\ti-cgt-c6000_%C6X_CGT_VER_DOT%\r
+set C6X_CGT_INSTALL_DIR_DH_ASP=%TI_TOOLS_DIR%\ti-cgt-c6000_%C6X_CGT_VER_DOT_DH_ASP%\r
+set C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA=%TI_TOOLS_DIR%\ti-cgt-c6000_%C6X_CGT_VER_DOT_DTSX_ASP_PARMA%\r
+\r
+::\r
+:: PASDK install location\r
+::\r
+if "%PASDK_ROOT%" NEQ "" (\r
+    set PASDK_ROOT=%PASDK_ROOT_DIR%\r
+) else (\r
+    set PASDK_ROOT=%~dp0..\r
+)\r
+\r
+:: \r
+:: PAF install locations\r
+:: \r
+set CG_TOOLS_a15=%ARM_CGT_INSTALL_DIR%\r
+set CG_TOOLS_c66x=%C6X_CGT_INSTALL_DIR%\r
+set BIOSROOT=%TI_TOOLS_DIR%\bios_%BIOS_VERSION%\r
+set XDCROOT=%TI_TOOLS_DIR%\xdctools_%XDC_VERSION%\r
+set IPCROOT=%TI_TOOLS_DIR%\ipc_%IPC_VERSION%\r
+set PDKROOT=%TI_TOOLS_DIR%\pdk_k2g_%PDK_VERSION%\r
+set EDMA3LLDROOT=%TI_TOOLS_DIR%\edma3_lld_%EDMA3_VERSION%\r
+set XDAISROOT=%TI_TOOLS_DIR%\xdais_%XDAIS_VERSION%\r
+set DSPLIBROOT=%TI_TOOLS_DIR%\dsplib_c66x_%DSPLIB_VERSION%\r
+set ROOTDIR=%PASDK_ROOT%\pasdk\paf\r
+\r
+\r
+\r
+rem @echo #######################################################################\r
+rem @echo ##  All Required Tools Installed\r
+rem @echo #######################################################################\r
+rem @echo.\r
+\r
+\r
+:: *************************************************************************\r
+:: ** Set the PATH\r
+:: *************************************************************************\r
+for %%i in (git.exe) do set GIT_PATH=%TOOLS_DRIVE%%%~sp$PATH:i\r
+set PATH=%SystemRoot%;%SystemRoot%\system32;%SystemRoot%\system32\Wbem\r
+set PATH=%XDC_INSTALL_DIR%;%PATH%\r
+set PATH=%XDC_INSTALL_DIR%\jre\bin;%PATH%\r
+set PATH=%PATH%;%CCS_INSTALL_DIR%\eclipse\r
+set PATH=%PATH%;%SED_INSTALL_DIR%\bin\r
+set PATH=%PATH%;%PYTHON_INSTALL_DIR%;%PYTHON_INSTALL_DIR%\Scripts\r
+set PATH=%PATH%;%GIT_PATH%\r
+set PATH=%PATH%;%ZIP_INSTALL_DIR%\7-Zip\r
+set GIT_PATH=\r
+\r
+\r
+:: *************************************************************************\r
+:: ** Create XDC environment variables\r
+:: *************************************************************************\r
+set xdc=%XDC_INSTALL_DIR%\xdc.exe $*\r
+::set XDCPATH=%CCS_INSTALL_DIR%/ccsv%CCS_VER%/packages\r
+::set XDCPATH=%XDCPATH%;%XDC_INSTALL_DIR%/packages\r
+set XDCPATH=%XDC_INSTALL_DIR%/packages\r
+\r
+\r
+:: *************************************************************************\r
+:: ** Clean Up\r
+:: *************************************************************************\r
+set XDC_VERSION=\r
+set XDC_VERSION_DH=\r
+set XDC_VERSION_DTSX=\r
+set BIOS_VERSION=\r
+set BIOS_VERSION_DH=\r
+set BIOS_VERSION_DTSX=\r
+set IPC_VERSION=\r
+set XDAIS_VERSION=\r
+set CCS_VER=\r
+set CCS_VER_CGT=\r
+set SED_VER_DOT=\r
+set PYTHON_VER=\r
+::set PKZIP_VER_DOT=\r
+set C6X_CGT_VER_DOT=\r
+set ARM_CGT_VERSION=\r
+set C6X_CGT_VER_DOT_PARMA=\r
+\r
+\r
+:: *************************************************************************\r
+:: ** Show the build environment\r
+:: *************************************************************************\r
+@echo.\r
+@echo #######################################################################\r
+@echo ##  Build Environment Variables (Start)\r
+@echo #######################################################################\r
+@set\r
+@echo #######################################################################\r
+@echo ##  Build Environment Variables (Stop)\r
+@echo #######################################################################\r
+@echo.\r
+\r
+\r
+:end\r

diff --git a/setup_build_env/setup_env.sh b/setup_build_env/setup_env.sh
new file mode 100755 (executable)
index 0000000..4bbc7e2
--- /dev/null
+++ b/setup_build_env/setup_env.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Set the following two variables to TI tools and performance-audio installation paths
+#ti_tools_path=<TI Tools Installation Path>
+#performance_audio_path=<TI Performance-Adio Installation Path>
+
+# Environment variables for PA demo make files
+export gnu_targets_arm_A15F="${ti_tools_path}/gcc-arm-none-eabi-6-2017-q1-update"
+export ti_targets_elf_C66="${ti_tools_path}/ti-cgt-c6000_8.2.2"
+export BIOS_INSTALL_DIR="${ti_tools_path}/bios_6_52_00_12"
+export XDC_INSTALL_DIR="${ti_tools_path}/xdctools_3_50_03_33_core"
+export UIA_INSTALL_DIR="${ti_tools_path}/uia_2_21_02_07"
+export IPC_INSTALL_DIR="${ti_tools_path}/ipc_3_47_01_00"
+export PDK_INSTALL_DIR="${ti_tools_path}/pdk_k2g_1_0_9"
+export EDMA3_INSTALL_DIR="${ti_tools_path}/edma3_lld_2_12_05_30C"
+export XDAIS_INSTALL_DIR="${ti_tools_path}/xdais_7_24_00_04"
+export DSPLIB_INSTALL_DIR="${ti_tools_path}/dsplib_c66x_3_4_0_0"
+export PASDK_ROOT="${performance_audio_path}/src"
+
+# Environment variables for PAF library make files
+export CG_TOOLS_c66x="${ti_tools_path}/ti-cgt-c6000_8.2.2"
+export CG_TOOLS_a15="${ti_tools_path}/gcc-arm-none-eabi-6-2017-q1-update"
+export BIOSROOT="${ti_tools_path}/bios_6_52_00_12"
+export XDCROOT="${ti_tools_path}/xdctools_3_50_03_33_core"
+export IPCROOT="${ti_tools_path}/ipc_3_47_01_00"
+export PDKROOT="${ti_tools_path}/pdk_k2g_1_0_9"
+export EDMA3LLDROOT="${ti_tools_path}/edma3_lld_2_12_05_30C"
+export XDAISROOT="${ti_tools_path}/xdais_7_24_00_04"
+export DSPLIBROOT="${ti_tools_path}/dsplib_c66x_3_4_0_0"
+export ROOTDIR="${performance_audio_path}/src/pasdk/paf"
+
+export PATH=${XDCROOT}:$PATH

diff --git a/setup_build_env/setup_paf.bat b/setup_build_env/setup_paf.bat
new file mode 100644 (file)
index 0000000..fb5789d
--- /dev/null
+++ b/setup_build_env/setup_paf.bat
@@ -0,0 +1,26 @@
+@echo off\r
+:: *************************************************************************\r
+::  FILE           : setup_paf.bat\r
+::  DESCRIPTION    :\r
+::\r
+::     Setup build environment for PAF libraries\r
+::\r
+:: *************************************************************************\r
+\r
+@echo Executing:  %~fn0\r
+\r
+set PAF_ROOT_DIR=%PASDK_ROOT%\pasdk\paf\r
+\r
+rem\r
+rem Temporary  \r
+rem Copy Windows based make files to "working" make files.\r
+rem This is a workaround until PAF library make files are improved to detect OS.\r
+rem\r
+pushd %PAF_ROOT_DIR%\pa\build\r
+copy /y rules_a15_windows.mk rules_a15.mk \r
+copy /y rules_windows.mk rules.mk \r
+copy /y target_windows.mk target.mk \r
+copy /y tools_windows.mk tools.mk \r
+popd\r
+\r
+:end\r