diff --git a/makerules/env.mk b/makerules/env.mk
index 8ac829c46cce6ba37891fdb19890a29a7a2757e6..dc9ca6c304295e74bed0a3c32a5ab08bb184f535 100755 (executable)
--- a/makerules/env.mk
+++ b/makerules/env.mk
# 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_02_04
+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,
# 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 = C:/PROGRA~1/TEXASI~1/xdctools_3_20_07_86
+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_31_04_27
+bios_PATH = $(EXTERNAL_SW_ROOT)/bios_6_42_02_29
bios_INCLUDE = $(bios_PATH)/packages
# XDC
-xdc_PATH = $(EXTERNAL_SW_ROOT)/xdctools_3_20_07_86
+xdc_PATH = $(EXTERNAL_SW_ROOT)/xdctools_3_31_02_38
xdc_INCLUDE = $(xdc_PATH)/packages
# EDMA3 LLD
# Tools paths
#
# Cortex-M3
-CODEGEN_PATH_M3 = $(EXTERNAL_SW_ROOT)/TMS470~1.4
-
+CODEGEN_PATH_M3 = $(EXTERNAL_SW_ROOT)/TIARMC~1.5
+# Cortex-M4
+CODEGEN_PATH_M4 = $(EXTERNAL_SW_ROOT)/ti-cgt-arm_5.2.2
# Cortex-A8
-CODEGEN_PATH_A8 = $(EXTERNAL_SW_ROOT)/TMS470~1.4
+CODEGEN_PATH_A8 = $(EXTERNAL_SW_ROOT)/TIARMC~1.5
+# Cortex-A8 GCC
+CODEGEN_PATH_A8_GCC = $(EXTERNAL_SW_ROOT)/gcc-arm-none-eabi-4_8-2014q3
+
+# Cortex-A15
+CODEGEN_PATH_A15 = $(EXTERNAL_SW_ROOT)/gcc-arm-none-eabi-4_8-2014q3
+# Cortex-A15_GCC
+CODEGEN_PATH_A15_GCC = $(EXTERNAL_SW_ROOT)/gcc-arm-none-eabi-4_8-2014q3
# ARM-9
-CODEGEN_PATH_ARM9 = $(EXTERNAL_SW_ROOT)/TMS470~1.4
+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~1.0B2
-CODEGEN_PATH_DSPELF = $(EXTERNAL_SW_ROOT)/C6000C~1.0B2
+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)/ARP32_1.0.2
# Commands commonly used within the make files
CONFIG_BLD_XDC_arm9 = $(edma3_lld_PATH)/packages/_config.bld
CONFIG_BLD_XDC_66 = $(edma3_lld_PATH)/packages/_config.bld
CONFIG_BLD_XDC_m3 = $(edma3_lld_PATH)/packages/_config.bld
+CONFIG_BLD_XDC_m4 = $(edma3_lld_PATH)/packages/_config.bld
+CONFIG_BLD_XDC_a15 = $(edma3_lld_PATH)/packages/_config.bld
XDCPATH = $(bios_PATH)/packages;$(xdc_PATH)/packages;$(edma3_lld_PATH)/packages;
export XDCPATH
TMS470_CGTOOLS = $(CODEGEN_PATH_M3)
CGTOOLS = $(CODEGEN_PATH_DSP)
CGTOOLS_ELF = $(CODEGEN_PATH_DSPELF)
-export TMS470CGTOOLPATH
+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