PASDK-587:Add conditional assignment of build variables which can be set from environ...
authorFrank Livingston <frank-livingston@ti.com>
Mon, 19 Mar 2018 23:27:55 +0000 (18:27 -0500)
committerFrank Livingston <frank-livingston@ti.com>
Mon, 19 Mar 2018 23:27:55 +0000 (18:27 -0500)
Update name of CGT build variable to allow them to be set from environment.

pasdk/test_arm/Makefile
pasdk/test_dsp/Makefile
products.mak

index 267a4208f51eb0967028b1148a09b2dbcdb6ab24..857b3ad03e691643c1bf903483102ada888ca340 100644 (file)
@@ -174,7 +174,7 @@ $(OBJ_DIRS):
        $(XDC_INSTALL_DIR)/xs --xdcpath="$(subst +,;,$(PKGPATH))" \
             xdc.tools.configuro -o $(CONFIG) \
             -t gnu.targets.arm.A15F \
-            -c $(gnu.targets.arm.A15F) \
+            -c $(gnu_targets_arm_A15F) \
             -p ti.platforms.evmTCI66AK2G02:host \
             -b ../shared/config.bld -r release \
             --cfgArgs "{ \
@@ -211,16 +211,16 @@ endif
 XDCFLAGS = -Dxdc.platform.custom.check=false -DProjName=pa_i13_evmk2g_arm -DHsDevBuild=0
 
 #  ======== tool chain macros ========
-CC = $(gnu.targets.arm.A15F)/bin/arm-none-eabi-gcc -c -MD -MF $@.dep
-LD = $(gnu.targets.arm.A15F)/bin/arm-none-eabi-gcc
+CC = $(gnu_targets_arm_A15F)/bin/arm-none-eabi-gcc -c -MD -MF $@.dep
+LD = $(gnu_targets_arm_A15F)/bin/arm-none-eabi-gcc
 
 CPPFLAGS = -Dfar= -D__DYNAMIC_REENT__
 CFLAGS = -mcpu=cortex-a15 -mtune=cortex-a15 -marm -mfloat-abi=hard $(CPREDEFS) -Wall -Wunused -Wunknown-pragmas -ffunction-sections -fdata-sections $(CCPROFILE_$(PROFILE)) @$(CONFIG)/compiler.opt $(CINCDIRS)
 
 CPREDEFS = -Dk2g02 -Darm0 -DARMCOMPILE -DPAF_DEVICE=0xDA000000 -DNON_CACHE_STATUS
 
-CINCDIRS = -I"$(gnu.targets.arm.A15F)/arm-none-eabi/include" \
-    -I"$(gnu.targets.arm.A15F)/arm-none-eabi/include/newlib-nano" \
+CINCDIRS = -I"$(gnu_targets_arm_A15F)/arm-none-eabi/include" \
+    -I"$(gnu_targets_arm_A15F)/arm-none-eabi/include/newlib-nano" \
     -I"$(PDK_INSTALL_DIR)/packages" \
     -I"$(XDAIS_INSTALL_DIR)/packages" \
     -I"$(PAF_INSTALL_DIR)/pa/asp/com" \
index d2cf80f27a7a877b0caa652887a118a9202ad49b..3ff1d79e5eb2b58fa2a069150c74ccec68a10e85 100644 (file)
@@ -271,7 +271,7 @@ $(OBJ_DIRS):
        $(XDC_INSTALL_DIR)/xs --xdcpath="$(subst +,;,$(PKGPATH))" \
             xdc.tools.configuro -o $(CONFIG) \
             -t ti.targets.elf.C66 \
-            -c $(ti.targets.elf.C66) \
+            -c $(ti_targets_elf_C66) \
             -p ti.platforms.evmTCI66AK2G02:core0 \
             -b ../shared/config.bld -r release \
             --cfgArgs "{ \
@@ -309,7 +309,7 @@ XDCFLAGS = -Dxdc.platform.custom.check=false -DProjName=pa_i13_evmk2g_c66x -DHsD
 #XDCFLAGS = -Dxdc.platform.custom.check=false -DProjName=pa_i13_evmk2g_c66x -DHsDevBuild=0
 
 #  ======== tool chain macros ========
-CGTOOLS = $(ti.targets.elf.C66)
+CGTOOLS = $(ti_targets_elf_C66)
 
 CC = $(CGTOOLS)/bin/cl6x -c
 LD = $(CGTOOLS)/bin/cl6x -z
index 119be1b74337295041f7f7617e2c9f6bb6a2dae7..9e4e5532448e300f594bc3d1485ec13e61a22ade 100644 (file)
 DEPOT = /home/frank/ti
 
 #### PASDK installation directories ####
-PASDK_ROOT              = $(DEPOT)/processor_sdk_audio_1_03_00_00
+PASDK_ROOT             ?= $(DEPOT)/processor_sdk_audio_1_03_00_00
 PASDK_INSTALL_DIR       = $(PASDK_ROOT)/pasdk
 PAF_INSTALL_DIR         = $(PASDK_INSTALL_DIR)/paf
 
 #### Dependencies ####
-BIOS_INSTALL_DIR        = $(DEPOT)/bios_6_52_00_12
-XDC_INSTALL_DIR         = $(DEPOT)/xdctools_3_50_03_33_core
-UIA_INSTALL_DIR         = $(DEPOT)/uia_2_21_02_07
-IPC_INSTALL_DIR         = $(DEPOT)/ipc_3_47_01_00
-PDK_INSTALL_DIR         = $(DEPOT)/pdk_k2g_1_0_9
-EDMA3_INSTALL_DIR       = $(DEPOT)/edma3_lld_2_12_05_30B
-XDAIS_INSTALL_DIR       = $(DEPOT)/xdais_7_24_00_04
-DSPLIB_INSTALL_DIR      = $(DEPOT)/dsplib_c66x_3_4_0_0
+BIOS_INSTALL_DIR       ?= $(DEPOT)/bios_6_52_00_12
+XDC_INSTALL_DIR        ?= $(DEPOT)/xdctools_3_50_03_33_core
+UIA_INSTALL_DIR        ?= $(DEPOT)/uia_2_21_02_07
+IPC_INSTALL_DIR        ?= $(DEPOT)/ipc_3_47_01_00
+PDK_INSTALL_DIR        ?= $(DEPOT)/pdk_k2g_1_0_9
+EDMA3_INSTALL_DIR      ?= $(DEPOT)/edma3_lld_2_12_05_30B
+XDAIS_INSTALL_DIR      ?= $(DEPOT)/xdais_7_24_00_04
+DSPLIB_INSTALL_DIR     ?= $(DEPOT)/dsplib_c66x_3_4_0_0
 
 #### Tool chains ####
-gnu.targets.arm.A15F    = $(DEPOT)/gcc-arm-none-eabi-6-2017-q1-update
-ti.targets.elf.C66      = $(DEPOT)/ti-cgt-c6000_8.2.2
+gnu_targets_arm_A15F   ?= $(DEPOT)/gcc-arm-none-eabi-6-2017-q1-update
+ti_targets_elf_C66     ?= $(DEPOT)/ti-cgt-c6000_8.2.2
 
 # Use this goal to print your product variables.
 .show:
@@ -71,5 +71,5 @@ ti.targets.elf.C66      = $(DEPOT)/ti-cgt-c6000_8.2.2
        @echo "EDMA3_INSTALL_DIR    = $(EDMA3_INSTALL_DIR)"
        @echo "XDAIS_INSTALL_DIR    = $(XDAIS_INSTALL_DIR)"
        @echo "DSPLIB_INSTALL_DIR   = $(DSPLIB_INSTALL_DIR)"
-       @echo "gnu.targets.arm.A15F = $(gnu.targets.arm.A15F)"
-       @echo "ti.targets.elf.C66   = $(ti.targets.elf.C66)"
+       @echo "gnu_targets_arm_A15F = $(gnu_targets_arm_A15F)"
+       @echo "ti_targets_elf_C66   = $(ti_targets_elf_C66)"