Merge branch 'dev_pasdk' into dev_pasdk_frank_pasdk87PrSdkUpdate
authorFrank Livingston <frank-livingston@ti.com>
Wed, 23 Aug 2017 01:32:45 +0000 (20:32 -0500)
committerFrank Livingston <frank-livingston@ti.com>
Wed, 23 Aug 2017 01:32:45 +0000 (20:32 -0500)
pasdk/test_arm/.cproject
pasdk/test_arm/.project
scripts/build_ccs_projects.bat
scripts/build_os_pkg.bat

index 7fb74d73981dae51e3f936fdd16a824457a1204d..3ad14d6e1d4ba01c52c73d0486cea3a1519ac483 100644 (file)
@@ -11,8 +11,8 @@
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_03/psdk_cust/pdk_k2g_1_0_1_2_eng/packages"/>
                                        <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/pdk_k2g_1_0_6/packages"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CPPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_03/psdk_cust/pdk_k2g_1_0_1_2_eng/packages"/>
                                        <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_03/psdk_cust/pdk_k2g_1_0_1_2_eng/packages"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CPPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/pdk_k2g_1_0_6/packages"/>
                                        <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_03/psdk_cust/pdk_k2g_1_0_1_2_eng/packages"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
index c733de24da895b2658fef30f1ad17971b6f9af7d..52de06588ba2520f275b5702ef489b20663f655d 100644 (file)
                </variable>
                <variable>
                        <name>PDK_INSTALL_PATH</name>
-                       <value>file:/C:/ti/processor_audio_sdk_1_00_00_03/psdk_cust/pdk_k2g_1_0_1_2_eng/packages</value>
+                       <value>file:/C:/ti/pdk_k2g_1_0_6/packages</value>
                </variable>
                <variable>
                        <name>PKTLIB_INSTALL_PATH</name>
index c31af81670b0392fddba3e0741fc8958881227da..0d135e156dfa65ceda181209220109460db13e6b 100644 (file)
@@ -21,8 +21,8 @@ set PASDK_LROOT_DIR=%PASDK_ROOT_DIR%pasdk
 set PSDK_CUST_LROOT_DIR=%PASDK_ROOT_DIR%psdk_cust
 
 :: Set custom PDK install directory
-set PDK_VERSION=1_0_1_2_eng
-set PDK_INSTALL_DIR=%PSDK_CUST_LROOT_DIR%\pdk_k2g_%PDK_VERSION%
+::set PDK_VERSION=1_0_1_2_eng
+::set PDK_INSTALL_DIR=%PSDK_CUST_LROOT_DIR%\pdk_k2g_%PDK_VERSION%
 
 :: Set workspace directory
 set CCS_WRKSP_DIR=workspace_v6_1
@@ -35,14 +35,14 @@ if "%1"=="Debug" goto SetBuildProfilesDebug
 if "%1"=="Release" goto SetBuildProfilesRelease
 
 :: Set build profiles for SDF
-set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
+::set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
 set ARM_APP_BUILD_PROFILE=Debug_pkgs
 set DSP_APP_BUILD_PROFILE=Debug_pkgs
 goto cont1
 
 :SetBuildProfilesDebug
 :: Set build profiles for debug
-set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
+::set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
 set ARM_APP_BUILD_PROFILE=Debug
 set DSP_APP_BUILD_PROFILE=Debug
 goto cont1
@@ -50,7 +50,7 @@ goto cont1
 :SetBuildProfilesRelease
 :: Set build profiles for release
 :: FL: currently we only have a "Release" profile for the DSP
-set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
+::set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
 set ARM_APP_BUILD_PROFILE=Debug
 set DSP_APP_BUILD_PROFILE=Release
 
@@ -139,12 +139,12 @@ eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.c
 :cleanupenv
 set PASDK_LROOT_DIR=
 set PSDK_CUST_LROOT_DIR=
-set PDK_VERSION=
-set PDK_INSTALL_DIR=
+::set PDK_VERSION=
+::set PDK_INSTALL_DIR=
 set CCS_WRKSP_DIR=
 set SAVE_CYGWIN=
 set CYGWIN=
-set PDK_PLATFORM_LIB_BUILD_PROFILE=
+::set PDK_PLATFORM_LIB_BUILD_PROFILE=
 set ARM_APP_BUILD_PROFILE=
 set DSP_APP_BUILD_PROFILE=
 set UNZIP_PATH=
index 689117654436b3fa4cf433d91a501340cf1fa087..bfe768db7e63ec6656b6b49a86b6acf9f4af3fcd 100644 (file)
@@ -97,7 +97,8 @@ if NOT exist %OS_PKG_DEST_DIR%\nul ( mkdir %OS_PKG_DEST_DIR% )
 :: scripts
 @mkdir Temp\scripts
 @copy /Y %PASDK_ROOT_DIR%scripts\build_paf_libs.bat Temp\scripts
-@copy /Y %PASDK_ROOT_DIR%scripts\build_pdk_libs.bat Temp\scripts
+:: PDK 1.0.1.2_eng removed from BR1, replaced w/ PrSDK 4.0, PDK 1.0.6
+::@copy /Y %PASDK_ROOT_DIR%scripts\build_pdk_libs.bat Temp\scripts
 @copy /Y %PASDK_ROOT_DIR%scripts\setup_env.bat Temp\scripts
 
 @pushd Temp