diff --git a/makerules/env.mk b/makerules/env.mk
index be897be8684603c1b395eb7965a09cd87743e811..99b698e19918dff405883fcd0c562d5d341fa783 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_12_01_22
+INTERNAL_SW_ROOT ?= E:/EDMA/edma3_lld_02_12_01_25
# Directory where all external (imported) software packages are located; typically
# those that are NOT checked into version controlled repository. In this case,
# 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_31_02_38_core
+UTILS_INSTALL_DIR = $(EXTERNAL_SW_ROOT)/xdctools_3_61_00_16_core
# Set path separator, etc based on the OS
# On windows if sh.exe is installed (cygwin installs) make will execute
endif
# BIOS
-bios_PATH = $(EXTERNAL_SW_ROOT)/bios_6_42_02_29
+bios_PATH = $(EXTERNAL_SW_ROOT)/bios_6_82_00_16
bios_INCLUDE = $(bios_PATH)/packages
# XDC
-xdc_PATH = $(EXTERNAL_SW_ROOT)/xdctools_3_31_02_38
+xdc_PATH = $(EXTERNAL_SW_ROOT)/xdctools_3_61_00_16_core
xdc_INCLUDE = $(xdc_PATH)/packages
# EDMA3 LLD
# Tools paths
#
# Cortex-M3
-CODEGEN_PATH_M3 = $(EXTERNAL_SW_ROOT)/TIARMC~1.5
+CODEGEN_PATH_M3 = $(EXTERNAL_SW_ROOT)/ti-cgt-arm_20.2.0.LTS
# Cortex-M4
-CODEGEN_PATH_M4 = $(EXTERNAL_SW_ROOT)/ti-cgt-arm_5.2.2
+CODEGEN_PATH_M4 = $(EXTERNAL_SW_ROOT)/ti-cgt-arm_20.2.0.LTS
# Cortex-A8
-CODEGEN_PATH_A8 = $(EXTERNAL_SW_ROOT)/TIARMC~1.5
+CODEGEN_PATH_A8 = $(EXTERNAL_SW_ROOT)/ti-cgt-arm_20.2.0.LTS
# Cortex-A8 GCC
-CODEGEN_PATH_A8_GCC = $(EXTERNAL_SW_ROOT)/gcc-arm-none-eabi-4_8-2014q3
+CODEGEN_PATH_A8_GCC = $(EXTERNAL_SW_ROOT)/gcc-arm-none-eabi-9-2019-q4-major
# Cortex-A15
-CODEGEN_PATH_A15 = $(EXTERNAL_SW_ROOT)/gcc-arm-none-eabi-4_8-2014q3
+CODEGEN_PATH_A15 = $(EXTERNAL_SW_ROOT)/gcc-arm-none-eabi-9-2019-q4-major
# Cortex-A15_GCC
-CODEGEN_PATH_A15_GCC = $(EXTERNAL_SW_ROOT)/gcc-arm-none-eabi-4_8-2014q3
+CODEGEN_PATH_A15_GCC = $(EXTERNAL_SW_ROOT)/gcc-arm-none-eabi-6-2017-q1-update
# ARM-9
-CODEGEN_PATH_ARM9 = $(EXTERNAL_SW_ROOT)/TIARMC~1.5
+CODEGEN_PATH_ARM9 = $(EXTERNAL_SW_ROOT)/ti-cgt-arm_20.2.0.LTS
# ARM-9 GCC
-CODEGEN_PATH_A9_GCC = $(EXTERNAL_SW_ROOT)/gcc-arm-none-eabi-4_8-2014q3
+CODEGEN_PATH_A9_GCC = $(EXTERNAL_SW_ROOT)/gcc-arm-none-eabi-6-2017-q1-update
# 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)/c6000_7.4.12
-CODEGEN_PATH_DSPELF = $(EXTERNAL_SW_ROOT)/c6000_7.4.12
+CODEGEN_PATH_DSP = $(EXTERNAL_SW_ROOT)/ti-cgt-c6000_8.3.2
+CODEGEN_PATH_DSPELF = $(EXTERNAL_SW_ROOT)/ti-cgt-c6000_8.3.2
# ARP32
-CODEGEN_PATH_ARP32 = $(EXTERNAL_SW_ROOT)/ARP32_1.0.2
+CODEGEN_PATH_ARP32 = /datalocal/ti_components/cg_tools/linux/arp32_1.0.8
# Commands commonly used within the make files
CODESOURCERYCGTOOLS = $(CODEGEN_PATH_A8)
export CODESOURCERYCGTOOLS
-PATH += $(PATH_SEPARATOR)$(xdc_PATH)$(PATH_SEPARATOR)$(CODEGEN_PATH_M3)/bin
-export PATH
-
# Nothing beyond this point