PRSDK-1156: removed unused references to PATH in env.mk

[keystone-rtos/edma3_lld.git] / makerules / env.mk

diff --git a/makerules/env.mk b/makerules/env.mk
index 6cca5ca5f471148ba1fa4464da3b20ebfd35de5d..dc9ca6c304295e74bed0a3c32a5ab08bb184f535 100755 (executable)
--- a/makerules/env.mk
+++ b/makerules/env.mk
@@ -7,12 +7,12 @@
 # Directory where all internal software packages are located; typically 
 #  those that are checked into version controlled repository. In this case all
 #  the OMX components and SDK/OMX demo.
-INTERNAL_SW_ROOT ?= E:/EDMA/edma3_lld_02_11_07_01
+INTERNAL_SW_ROOT ?= E:/EDMA/edma3_lld_02_12_01_23
 
 # Directory where all external (imported) software packages are located; typically 
 #  those that are NOT checked into version controlled repository. In this case,
 #  compiler tool chains, BIOS, XDC, Syslink, IPC, FC, CE, drivers, codecs, etc.
-EXTERNAL_SW_ROOT ?= C:/PROGRA~1/TEXASI~1
+EXTERNAL_SW_ROOT ?= C:/PROGRA~2/TEXASI~1
 
 # Destination root directory.
 #   - specify the directory where you want to place the object, archive/library,
@@ -23,23 +23,32 @@ EXTERNAL_SW_ROOT ?= C:/PROGRA~1/TEXASI~1
 # Utilities directory. This is required only if the build machine is Windows.
 #   - specify the installation directory of utility which supports POSIX commands
 #     (eg: Cygwin installation or MSYS installation).
-UTILS_INSTALL_DIR = $(EXTERNAL_SW_ROOT)/xdctools_3_25_04_88
+UTILS_INSTALL_DIR = $(EXTERNAL_SW_ROOT)/xdctools_3_31_02_38_core
 
 # Set path separator, etc based on the OS
+# On windows if sh.exe is installed (cygwin installs) make will execute
+# commands on sh or it executes on windows cmd prompt. When executing on sh,
+# unix style command seperator is used.
 ifeq ($(OS),Windows_NT)
   PATH_SEPARATOR = ;
   UTILSPATH = $(UTILS_INSTALL_DIR)/bin/
+  ifeq (cygwin,$(findstring cygwin,$(PATH)))
+  COMMAND_SEPERATOR = ;
+  else
+  COMMAND_SEPERATOR = &
+  endif
 else 
   # else, assume it is linux
   PATH_SEPARATOR = :
+  COMMAND_SEPERATOR = ;
 endif
 
 # BIOS
-bios_PATH = $(EXTERNAL_SW_ROOT)/bios_6_37_00_16_eng
+bios_PATH = $(EXTERNAL_SW_ROOT)/bios_6_42_02_29
 bios_INCLUDE = $(bios_PATH)/packages
 
 # XDC
-xdc_PATH = $(EXTERNAL_SW_ROOT)/xdctools_3_25_04_88
+xdc_PATH = $(EXTERNAL_SW_ROOT)/xdctools_3_31_02_38
 xdc_INCLUDE = $(xdc_PATH)/packages
 
 # EDMA3 LLD
@@ -50,29 +59,31 @@ include $(edma3_lld_PATH)/packages/component.mk
 # Tools paths
 #
 # Cortex-M3
-CODEGEN_PATH_M3 = $(EXTERNAL_SW_ROOT)/TIARMC~1.2
+CODEGEN_PATH_M3 = $(EXTERNAL_SW_ROOT)/TIARMC~1.5
 # Cortex-M4
-CODEGEN_PATH_M4 = $(EXTERNAL_SW_ROOT)/TIARMC~1.2
+CODEGEN_PATH_M4 = $(EXTERNAL_SW_ROOT)/ti-cgt-arm_5.2.2
 # Cortex-A8
-CODEGEN_PATH_A8 = $(EXTERNAL_SW_ROOT)/TIARMC~1.2
+CODEGEN_PATH_A8 = $(EXTERNAL_SW_ROOT)/TIARMC~1.5
 # Cortex-A8 GCC
-CODEGEN_PATH_A8_GCC = C:/PROGRA~1/GNUTOO~1/4F700~1.720
+CODEGEN_PATH_A8_GCC = $(EXTERNAL_SW_ROOT)/gcc-arm-none-eabi-4_8-2014q3
 
 # Cortex-A15
-CODEGEN_PATH_A15 = C:/PROGRA~1/GNUTOO~1/4F700~1.720
+CODEGEN_PATH_A15 = $(EXTERNAL_SW_ROOT)/gcc-arm-none-eabi-4_8-2014q3
 # Cortex-A15_GCC
-CODEGEN_PATH_A15_GCC = $(EXTERNAL_SW_ROOT)/gcc-linaro-arm-linux-gnueabihf-4.7-2013.03-20130313_linux/
+CODEGEN_PATH_A15_GCC = $(EXTERNAL_SW_ROOT)/gcc-arm-none-eabi-4_8-2014q3
 
 # ARM-9
-CODEGEN_PATH_ARM9 = $(EXTERNAL_SW_ROOT)/TIARMC~1.2
+CODEGEN_PATH_ARM9 = $(EXTERNAL_SW_ROOT)/TIARMC~1.5
+# ARM-9 GCC
+CODEGEN_PATH_A9_GCC = $(EXTERNAL_SW_ROOT)/gcc-arm-none-eabi-4_8-2014q3
 
 # DSP - Since same toolchain does not support COFF and ELF, there are two entries
 #        This would go away when one version supports both formats
-CODEGEN_PATH_DSP = $(EXTERNAL_SW_ROOT)/C6000C~2.1
-CODEGEN_PATH_DSPELF = $(EXTERNAL_SW_ROOT)/C6000C~2.1
+CODEGEN_PATH_DSP = $(EXTERNAL_SW_ROOT)/c6000_7.4.12
+CODEGEN_PATH_DSPELF = $(EXTERNAL_SW_ROOT)/c6000_7.4.12
 
 # ARP32
-CODEGEN_PATH_ARP32 = $(EXTERNAL_SW_ROOT)/ARP32C~1.2
+CODEGEN_PATH_ARP32 = $(EXTERNAL_SW_ROOT)/ARP32_1.0.2
 
 # Commands commonly used within the make files
 
@@ -122,7 +133,4 @@ export TMS470_CGTOOLS
 CODESOURCERYCGTOOLS = $(CODEGEN_PATH_A8)
 export CODESOURCERYCGTOOLS
 
-PATH += $(PATH_SEPARATOR)$(xdc_PATH)$(PATH_SEPARATOR)$(CODEGEN_PATH_M3)/bin
-export PATH
-
 # Nothing beyond this point