Update Makefile.inc

diff --git a/utils/product/Makefile.inc b/utils/product/Makefile.inc
index 8e103e5703de09d00a121b4968065fb5af7cac80..8af49aed2ac023bd9463b3035987a1d0e4afa913 100644 (file)
--- a/utils/product/Makefile.inc
+++ b/utils/product/Makefile.inc
@@ -33,35 +33,33 @@
 
 # TI C6x CGT
 export XDCCGROOT ?=/cgnas/ti-cgt-c6000-8.1.0-release-linux
+PSDK_VERSION ?= 02.00.01.06-20160105
 
 ifeq ($(BUILD_AM572),1)
-RTOS_SDK_DIR ?= /cgnas/ti-processor-sdk-rtos-am57xx-evm-02.00.01.06-20160105
-export AM572_PDK_DIR ?= $(RTOS_SDK_DIR)/pdk_am57xx_1_0_1
+RTOS_SDK_DIR ?= /cgnas/ti-processor-sdk-rtos-am57xx-evm-$(PSDK_VERSION)
+export AM572_PDK_DIR ?= $(wildcard $(RTOS_SDK_DIR)/pdk_am57xx_*)
 DEVICE=am57xx
 else ifeq ($(BUILD_C6678),1)
-RTOS_SDK_DIR ?= /cgnas/ti-processor-sdk-rtos-c667x-evm-02.00.01.06-20160105
-export C6678_PDK_DIR ?= $(RTOS_SDK_DIR)/pdk_c667x_2_0_0
+RTOS_SDK_DIR ?= /cgnas/ti-processor-sdk-rtos-c667x-evm-$(PSDK_VERSION)
+export C6678_PDK_DIR ?= $(wildcard $(RTOS_SDK_DIR)/pdk_c667x_*)
 DEVICE=c667x
 else ifeq ($(BUILD_C6670),1)
 $(call error,ERROR - Processor SDK does not support C6670)
 else ifeq ($(BUILD_C6657),1)
-RTOS_SDK_DIR ?= /cgnas/ti-processor-sdk-rtos-c665x-evm-02.00.01.06-20160105
-export C6657_PDK_DIR ?= $(RTOS_SDK_DIR)/pdk_c665x_2_0_0
+RTOS_SDK_DIR ?= /cgnas/ti-processor-sdk-rtos-c665x-evm-$(PSDK_VERSION)
+export C6657_PDK_DIR ?= $(wildcard $(RTOS_SDK_DIR)/pdk_c665x_*)
 DEVICE=c665x
 else ifeq ($(BUILD_K2H),1)
-LINUX_SDK_DIR ?= /cgnas/ti-processor-sdk-linux-k2hk-evm-02.00.01.06-20160105
-RTOS_SDK_DIR  ?= /cgnas/ti-processor-sdk-rtos-k2hk-evm-02.00.01.06-20160105
-export C6636_PDK_DIR  ?= $(RTOS_SDK_DIR)/pdk_k2hk_4_0_0
+LINUX_SDK_DIR ?= /cgnas/ti-processor-sdk-linux-k2hk-evm-$(PSDK_VERSION)
+RTOS_SDK_DIR  ?= /cgnas/ti-processor-sdk-rtos-k2hk-evm-$(PSDK_VERSION)
+export C6636_PDK_DIR  ?= $(wildcard $(RTOS_SDK_DIR)/pdk_k2hk_*)
 
 # ULM_DIR is required only to build K2x OpenMP runtime libraries
 LINUX_DEVKIT_ROOT ?= $(LINUX_SDK_DIR)/linux-devkit/sysroots/cortexa15hf-vfp-neon-linux-gnueabi
-export ULM_DIR   ?= $(LINUX_DEVKIT_ROOT)/usr/share/ti/ulm
+export ULM_DIR ?= $(LINUX_DEVKIT_ROOT)/usr/share/ti/ulm
 DEVICE=k2x
 endif
 
-
-export BIOS_DIR       ?= $(RTOS_SDK_DIR)/bios_6_45_00_19
-export IPC_DIR        ?= $(RTOS_SDK_DIR)/ipc_3_41_00_08
-export XDC_DIR        ?= $(RTOS_SDK_DIR)/xdctools_3_31_02_38_core
-
-
+export BIOS_DIR       ?= $(wildcard $(RTOS_SDK_DIR)/bios_*)
+export IPC_DIR        ?= $(wildcard $(RTOS_SDK_DIR)/ipc_*)
+export XDC_DIR        ?= $(wildcard $(RTOS_SDK_DIR)/xdctools_*)