resolved merge issues.
authorChitresh Gupta <chitresh.g@pathpartnertech.com>
Tue, 3 Jan 2017 10:44:49 +0000 (16:14 +0530)
committerChitresh Gupta <chitresh.g@pathpartnertech.com>
Tue, 3 Jan 2017 10:44:49 +0000 (16:14 +0530)
pasdk/test_arm/.cproject
pasdk/test_arm/application/app.cfg
pasdk/test_dsp/.cproject
pasdk/test_dsp/application/app.cmd
scripts/build_paf_libs.bat

index bcb0a8a7b55b384a13484ee20d9ef0be6068983f..2b5ef73c447e795ac224236e4fed05b11bb91d13 100644 (file)
@@ -74,6 +74,7 @@
                                                                        <listOptionValue builtIn="false" value="ARMCOMPILE"/>
                                                                        <listOptionValue builtIn="false" value="PAF_DEVICE=0xDA000000"/>
                                                                        <listOptionValue builtIn="false" value="far="/>
+                                                                       <listOptionValue builtIn="false" value="NON_CACHE_STATUS"/>
                                                                </option>
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MCPU.1180163032" name="Target CPU (-mcpu)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MCPU" value="cortex-a15" valueType="string"/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MTUNE.1670792469" name="Tune code for the given processor (-mtune)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MTUNE" value="cortex-a15" valueType="string"/>
@@ -95,6 +96,7 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/f/alpha&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/util/c67x_cintrins&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/util/da10x_misc&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/util/statusop_common&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/common&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/shared&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/test_arm/framework&quot;"/>
index 3a989b1f0bfe044b801f014c015bd1f5c117ed91..bb2526256ef4bd7091ef640621ebe1a838d3d643 100644 (file)
@@ -307,7 +307,7 @@ Program.sectMap[".msmcSramHeap"] = "HOST_MSMC";
 /* Add DDR3 heap */ // formerly SDRAM
 var heapMem2Params = new HeapMem.Params();
 heapMem2Params.instance.name = "heapMemDdr3";
-heapMem2Params.size = 4350528;
+heapMem2Params.size = 5350528;//4350528;
 heapMem2Params.sectionName = ".ddr3Heap";
 Program.global.heapMemDdr3 = HeapMem.create(heapMem2Params);
 Program.sectMap[".ddr3Heap"] = "HOST_DDR3";
index 82f26fe9465f59d6b13f354fd7892f54e80ad116..da143217007842ec088a9e97fdb186495667e605 100644 (file)
@@ -73,6 +73,7 @@
                                                                        <listOptionValue builtIn="false" value="SOC_K2G"/>
                                                                        <listOptionValue builtIn="false" value="DEVICE_K2G"/>
                                                                        <listOptionValue builtIn="false" value="PAF_DEVICE=0xDA000000"/>
+                                                                       <listOptionValue builtIn="false" value="NON_CACHE_STATUS"/>
                                                                        <listOptionValue builtIn="false" value="INCLUDE_HDMI_CONFIG"/>
                                                                        <listOptionValue builtIn="false" value="TEST_MULTICHANNEL"/>
                                                                        <listOptionValue builtIn="false" value="DCS7_UART_EDMA_ENABLE"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/f/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/f/alpha&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/util/da10x_misc&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/util/statusop_common&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/test_dsp/framework&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/test_dsp/application/itopo/evmk2g/alpha&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/test_dsp/sio&quot;"/>
index 7a3f402dfa075fee7068d09c426c63462a524c31..450d6a97668e2247276b435d03972413a147ea9a 100644 (file)
@@ -53,6 +53,7 @@ All rights reserved.
 -l"pcm1_elf.lib"
 -l"dcs7_elf.lib"
 -l"misc_elf.lib"
+-l"statusop_common_elf.lib"
 
 -l"dolby_oar_lib.lib"
 -l"libcar_c66_float_release.lib"
index 89c6b5c68798a32b57f82e38dbfc42a07b7abf21..7df3dcf2fd2f213a272474f8682d4f5ae96eb00d 100644 (file)
@@ -77,6 +77,11 @@ gmake clean
 gmake install
 popd
 
+pushd %PAF_ROOT_DIR%\pa\util\statusop_common
+gmake clean
+gmake install
+popd
+
 if "%1"=="DSP" goto end
 
 
@@ -124,6 +129,10 @@ gmake clean
 gmake install
 popd
 
+pushd %PAF_ROOT_DIR%\pa\util\statusop_common
+gmake clean
+gmake install
+popd
 
 :end