Cleaning up makefiel and scripts.

diff --git a/installer_builder/rtsc/Makefile b/installer_builder/rtsc/Makefile
index 0471ba893b56e5448abe8fda214f364aa5ef39f2..3c04c3a0c90c1ab6276c6875ae18b466370665e2 100644 (file)
--- a/installer_builder/rtsc/Makefile
+++ b/installer_builder/rtsc/Makefile
@@ -43,12 +43,12 @@ ifeq ($(XDCROOT),)
 $(call error,ERROR - XDCROOT NOT DEFINED)\r
 endif\r
 \r
-ifeq ($(PASDK_BASE_DIR),)\r
-PASDK_BASE_DIR := $(shell pwd)\r
+ifeq ($(PA_BASE_DIR),)\r
+PA_BASE_DIR := $(shell pwd)\r
 endif\r
 \r
 ifeq ($(SRC_PATH),)\r
-SRC_PATH = $(PASDK_BASE_DIR)/pasrc\r
+SRC_PATH = $(PA_BASE_DIR)/pasrc\r
 endif\r
 \r
 \r
@@ -79,9 +79,9 @@ all: package
 \r
 .eclipse: .exports\r
        @echo creating product plugin\r
-       $(XDC) clean -P $(PASDK_BASE_DIR)/installer_builder/rtsc/eclipse\r
-       $(XDC) -P $(PASDK_BASE_DIR)/installer_builder/rtsc/eclipse\r
-       $(XS) --xdcpath "$(XDCPATH);$(PASDK_BASE_DIR)/installer_builder/rtsc" xdc.tools.product.plugingen -p exports/$(PACKAGE_NAME) -m eclipse.Product\r
+       $(XDC) clean -P $(PA_BASE_DIR)/installer_builder/rtsc/eclipse\r
+       $(XDC) -P $(PA_BASE_DIR)/installer_builder/rtsc/eclipse\r
+       $(XS) --xdcpath "$(XDCPATH);$(PA_BASE_DIR)/installer_builder/rtsc" xdc.tools.product.plugingen -p exports/$(PACKAGE_NAME) -m eclipse.Product\r
 \r
 .exports:\r
        @echo "making product directories ..."\r
@@ -99,17 +99,17 @@ all: package
        \r
 package: .lib .exports \r
        @echo "copying files ..."       \r
-       @cp -R $(PASDK_BASE_DIR)/pasrc exports/$(PACKAGE_NAME)/src\r
+       @cp -R $(PA_BASE_DIR)/pasrc exports/$(PACKAGE_NAME)/src\r
        @rm -f -r exports/$(PACKAGE_NAME)/src/pasrc/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/pasrc/debug/* exports/$(PACKAGE_NAME)/prebuilt-binaries\r
-       @cp -R $(PASDK_BASE_DIR)/Makefile exports/$(PACKAGE_NAME)/src\r
-       @cp -R $(PASDK_BASE_DIR)/products.mak exports/$(PACKAGE_NAME)/src\r
+       @cp -R $(PA_BASE_DIR)/tools/alpha exports/$(PACKAGE_NAME)/tools\r
+       @cp -R $(PA_BASE_DIR)/tools/bin exports/$(PACKAGE_NAME)/tools\r
+       @cp -R $(PA_BASE_DIR)/tools/pyalpha exports/$(PACKAGE_NAME)/tools\r
+       @cp -R $(PA_BASE_DIR)/tools/config.ini exports/$(PACKAGE_NAME)/tools\r
+       @cp -R $(PA_BASE_DIR)/tools/setup.bat exports/$(PACKAGE_NAME)/tools\r
+       @cp -R $(PA_BASE_DIR)/setup_build_env exports/$(PACKAGE_NAME)/src\r
+       @cp -R $(PA_BASE_DIR)/install/pasrc/debug/* exports/$(PACKAGE_NAME)/prebuilt-binaries\r
+       @cp -R $(PA_BASE_DIR)/Makefile exports/$(PACKAGE_NAME)/src\r
+       @cp -R $(PA_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
index ffe21b01b3442938ccad45e5f80b4f1a19c7d0ff..8e8310cc0e2378f4bf4c9bf57baccfffd847082f 100644 (file)
--- a/setup_build_env/setup_env.bat
+++ b/setup_build_env/setup_env.bat
@@ -17,37 +17,23 @@
 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
+:: PRSDK component versions\r
 ::\r
-:: XDC tools version for PASDK\r
+:: XDC tools version for PA\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
+:: SYSBIOS version for PA\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
+set IPC_VERSION=3_47_02_00\r
 :: PDK version\r
-set PDK_VERSION=1_0_9\r
+set PDK_VERSION=1_0_10\r
 :: EDMA3 LLD version\r
 set EDMA3_VERSION=2_12_05_30C\r
 :: XDAIS version\r
@@ -64,33 +50,20 @@ set PYTHON_VER=27
 ::set PKZIP_VER_DOT=9.20\r
 \r
 :: Codegen tools\r
-:: ARM CGT for PASDK\r
+:: ARM CGT for PA\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
+:: C6X CGT for PA\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
+:: PA dependency 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
@@ -106,14 +79,10 @@ set CYGWIN_INSTALL_DIR=%TOOLS_DRIVE%\cygwin\bin
 :: 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
+:: PA install location\r
 ::\r
 if "%PAROOT%" NEQ "" (\r
     set PAROOT=%PAROOT_DIR%\r
@@ -135,14 +104,11 @@ set XDAISROOT=%TI_TOOLS_DIR%\xdais_%XDAIS_VERSION%
 set DSPLIBROOT=%TI_TOOLS_DIR%\dsplib_c66x_%DSPLIB_VERSION%\r
 set ROOTDIR=%PAROOT%\pasrc\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

diff --git a/setup_build_env/setup_env.sh b/setup_build_env/setup_env.sh
index 75930e705959e7e15c9afec383162e39d1fc31f2..9b69695225514c7f6169bb1cab29e799acd29de1 100755 (executable)
--- a/setup_build_env/setup_env.sh
+++ b/setup_build_env/setup_env.sh
@@ -10,23 +10,23 @@ 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 IPC_INSTALL_DIR="${ti_tools_path}/ipc_3_47_02_00"
+export PDK_INSTALL_DIR="${ti_tools_path}/pdk_k2g_1_0_10"
 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 PAROOT="${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/pasrc/paf"
+export CG_TOOLS_c66x=${ti_targets_elf_C66}
+export CG_TOOLS_a15=${gnu_targets_arm_A15F}
+export BIOSROOT=${BIOS_INSTALL_DIR}
+export XDCROOT=${XDC_INSTALL_DIR}
+export IPCROOT=${IPC_INSTALL_DIR}
+export PDKROOT=${PDK_INSTALL_DIR}
+export EDMA3LLDROOT=${EDMA3_INSTALL_DIR}
+export XDAISROOT=${XDAIS_INSTALL_DIR}
+export DSPLIBROOT=${DSPLIB_INSTALL_DIR}
+export ROOTDIR="${performance_audio_path}/src/pasdk/paf"
 
-export PATH=${XDCROOT}:$PATH
+export PATH=${XDC_INSTALL_DIR}:$PATH

diff --git a/setup_build_env/setup_paf.bat b/setup_build_env/setup_paf.bat
index f29372358152499ca769c88f1d17b6fe452e00d7..7085acf8c19c8d01b6d4aa185ffcca3e1f29ed76 100644 (file)
--- a/setup_build_env/setup_paf.bat
+++ b/setup_build_env/setup_paf.bat
@@ -11,8 +11,6 @@
 \r
 set PAF_ROOT_DIR=%PAROOT%\pasrc\paf\r
 \r
-goto end\r
-\r
 rem\r
 rem Temporary  \r
 rem Copy Windows based make files to "working" make files.\r