Revert "[PDK-9315] Updating the BIOS version to 06.83.02.07"

[processor-sdk/pdk.git] / packages / ti / build / pdk_tools_path.mk

diff --git a/packages/ti/build/pdk_tools_path.mk b/packages/ti/build/pdk_tools_path.mk
index 7b0934e08d1311bd37e04fe691f094c2d5166133..8a54f257ddd795a6c9c319e7ff1b344a62ec4bf9 100644 (file)
--- a/packages/ti/build/pdk_tools_path.mk
+++ b/packages/ti/build/pdk_tools_path.mk
@@ -10,45 +10,36 @@ endif
 
   #Tool versions for non-TDA builds
   GCC_CROSS_TOOL_PREFIX=arm-none-eabi-
-  GCC_CROSS_TOOL_TAG=7-2018-q2-update
+  GCC_CROSS_TOOL_TAG=9-2019-q4-major
   GCC_ARCH64_VERSION=9.2-2019.12
   GCC_ARCH64_BIN_PREFIX_STR=aarch64-none-elf
-  CGT_VERSION=8.3.2
-  BIOS_VERSION=6_82_00_16
-  XDC_VERSION=3_61_00_16_core
-  CGT_VERSION=8.3.2
+  CGT_VERSION=8.3.7
+  BIOS_VERSION=6_83_00_18
+  XDC_VERSION=3_61_03_29_core
 
-  CGT_C7X_VERSION=1.3.0.STS
+  CGT_C7X_VERSION=1.4.0.LTS
   CGT_ARM_VERSION=20.2.0.LTS
-  GCC_VERSION_HARDLIB=7.3.1
+  GCC_VERSION_HARDLIB=9.2.1
 
   CGT_ARP32_VERSION=1.0.8
   CG_XML_VERSION=2.61.00
 
-ifeq ($(BOARD),$(filter $(BOARD), tpr12_evm))
-  BIOS_VERSION=6_82_00_16
-  XDC_VERSION=3_61_00_16_core
-  CGT_VERSION=8.3.3
-endif
-ifeq ($(BOARD),$(filter $(BOARD), am64x_evm))
-  BIOS_VERSION=6_83_00_01_eng
-  XDC_VERSION=3_61_00_16_core
-  GCC_ARCH64_VERSION=7.2.1-2017.11
-  GCC_ARCH64_BIN_PREFIX_STR=aarch64-elf
+ifeq ($(BOARD),$(filter $(BOARD), tpr12_evm tpr12_qt awr294x_evm))
+  CGT_ARM_VERSION=20.2.2.LTS
 endif
 
   EDMA_VERSION=2_12_05_30E
   SECDEV_VERSION=01_06_00_05
-  CGT_PRU_VERSION=2.3.2
+  CGT_PRU_VERSION=2.3.3
 
   #Hardcode IPC version if it is not set already
   IPC_VERSION=3_50_04_08
   NDK_VERSION=3_61_01_01
   NS_VERSION=2_60_01_06
 
-ifeq ($(BOARD),$(filter $(BOARD), am65xx_evm am65xx_idk j721e_evm j7200_evm))
-  NDK_VERSION=3_75_01_00
-  NS_VERSION=2_75_00_17
+ifeq ($(BOARD),$(filter $(BOARD), am65xx_evm am65xx_idk j721e_evm j7200_evm am64x_evm am64x_svb tpr12_qt tpr12_evm awr294x_evm))
+  NDK_VERSION=3_80_00_19
+  NS_VERSION=2_80_00_17
 endif
 
   UIA_VERSION=2_30_01_02
@@ -84,6 +75,7 @@ GCC_VERSION_ARM_A15=$(GCC_CROSS_TOOL_PREFIX)$(GCC_CROSS_TOOL_TAG)
   export TOOLCHAIN_PATH_A9         ?= $(TOOLS_INSTALL_PATH)/gcc-$(GCC_VERSION_ARM_A9)
   export TOOLCHAIN_PATH_Arm9       ?= $(TOOLS_INSTALL_PATH)/ti-cgt-arm_$(CGT_ARM_VERSION)
   export TOOLCHAIN_PATH_A15        ?= $(TOOLS_INSTALL_PATH)/gcc-$(GCC_VERSION_ARM_A15)
+
 ifeq ($(OS),Windows_NT)
   #Paths for windows machine
   export TOOLCHAIN_PATH_GCC_ARCH64 ?= $(TOOLS_INSTALL_PATH)/gcc-arm-$(GCC_ARCH64_VERSION)-mingw-w64-i686-aarch64-none-elf
@@ -91,17 +83,6 @@ else
   #Paths for linux machine
   export TOOLCHAIN_PATH_GCC_ARCH64 ?= $(TOOLS_INSTALL_PATH)/gcc-arm-$(GCC_ARCH64_VERSION)-x86_64-aarch64-none-elf
 endif
-  export GCC_ARCH64_BIN_PREFIX     ?= $(GCC_ARCH64_BIN_PREFIX_STR)
-
-ifeq ($(BOARD),$(filter $(BOARD), am64x_evm))
-  ifeq ($(OS),Windows_NT)
-    #Paths for windows machine
-    export TOOLCHAIN_PATH_GCC_ARCH64 ?= $(TOOLS_INSTALL_PATH)/gcc-linaro-$(GCC_ARCH64_VERSION)-mingw-w64-i686-aarch64-elf
-  else
-    #Paths for linux machine
-    export TOOLCHAIN_PATH_GCC_ARCH64 ?= $(TOOLS_INSTALL_PATH)/gcc-linaro-$(GCC_ARCH64_VERSION)-x86_64-aarch64-elf
-  endif
-endif
 
   export GCC_ARCH64_BIN_PREFIX     ?= $(GCC_ARCH64_BIN_PREFIX_STR)
 
@@ -133,13 +114,13 @@ endif
   export M4_TOOLCHAIN_INSTALL_DIR  ?= $(TOOLCHAIN_PATH_M4)
 
 ifeq ($(SOC),$(filter $(SOC), am335x))
-  export HARDLIB_PATH ?= $(TOOLCHAIN_PATH_A8)/lib/gcc/arm-none-eabi/$(GCC_VERSION_HARDLIB)/hard
+  export HARDLIB_PATH ?= $(TOOLCHAIN_PATH_A8)/lib/gcc/arm-none-eabi/$(GCC_VERSION_HARDLIB)
   export FPULIB_PATH ?= $(TOOLCHAIN_PATH_A8)/lib/gcc/arm-none-eabi/$(GCC_VERSION_FPULIB)/fpu
 else ifeq  ($(SOC),$(filter $(SOC), am437x))
-  export HARDLIB_PATH ?= $(TOOLCHAIN_PATH_A9)/lib/gcc/arm-none-eabi/$(GCC_VERSION_HARDLIB)/hard
+  export HARDLIB_PATH ?= $(TOOLCHAIN_PATH_A9)/lib/gcc/arm-none-eabi/$(GCC_VERSION_HARDLIB)
   export FPULIB_PATH ?= $(TOOLCHAIN_PATH_A9)/lib/gcc/arm-none-eabi/$(GCC_VERSION_FPULIB)/fpu
 else
-  export HARDLIB_PATH ?= $(TOOLCHAIN_PATH_A15)/lib/gcc/arm-none-eabi/$(GCC_VERSION_HARDLIB)/hard
+  export HARDLIB_PATH ?= $(TOOLCHAIN_PATH_A15)/lib/gcc/arm-none-eabi/$(GCC_VERSION_HARDLIB)
   export FPULIB_PATH ?= $(TOOLCHAIN_PATH_A15)/lib/gcc/arm-none-eabi/$(GCC_VERSION_FPULIB)/fpu
 endif