SoC common : build: RISC-V compilation toolchain modification [3/4]
PD#SWPL-166566
Problem:
Different Versions of Toolchain Required Based on Chip Configuration
Solution:
Modified the Process of Finding RISC-V Toolchain
Verify:
N/A
Change-Id: I871a41ded779f1aecbf4be67d69472481314df2e
Signed-off-by: shijie.xiong <shijie.xiong@amlogic.com>
diff --git a/Makefile b/Makefile
index 203f65a..ca92de9 100644
--- a/Makefile
+++ b/Makefile
@@ -64,27 +64,32 @@
CROSSTOOL := $(PRJDIR)/arch/$(ARCH)/toolchain/$(COMPILER)*$(TOOLCHAIN_KEYWORD)
PATH := $(toolchain_DIR)/bin:$(PATH)
-#xtensa toolchain option by soc name
-XTENSA_LOWPOWER_PATTERN=_lowpower
-ifeq ($(SOC),$(filter $(SOC),a5 t3x s6))
- XTENSA_CORE = Amlogic_v9
- XTENSA_TOOLCHAIN_VER = RI-2020.5-linux
-else ifeq ($(SOC),a1)
-ifeq ($(findstring $(XTENSA_LOWPOWER_PATTERN),$(BOARD)),$(XTENSA_LOWPOWER_PATTERN))
- XTENSA_CORE = Amlogic_v2
-else
- XTENSA_CORE = Amlogic_v0
+#This code segment is used to set the path of the compiler for the find_compiler.cmake to search.
+ifeq ($(ARCH),arm)
+ TOOLCHAIN_PATH=$(toolchain_DIR)
+else ifeq ($(ARCH),arm64)
+ TOOLCHAIN_PATH=$(toolchain_DIR)
+else ifeq ($(ARCH),xtensa)
+ XTENSA_LOWPOWER_PATTERN=_lowpower
+ ifeq ($(SOC),$(filter $(SOC),a5 t3x s6))
+ XTENSA_CORE = Amlogic_v9
+ XTENSA_TOOLCHAIN_VER = RI-2020.5-linux
+ else ifeq ($(SOC),a1)
+ ifeq ($(findstring $(XTENSA_LOWPOWER_PATTERN),$(BOARD)),$(XTENSA_LOWPOWER_PATTERN))
+ XTENSA_CORE = Amlogic_v2
+ else
+ XTENSA_CORE = Amlogic_v0
+ endif
+ XTENSA_TOOLCHAIN_VER = RG-2018.9-linux
+ else
+ XTENSA_CORE = Amlogic_v0
+ XTENSA_TOOLCHAIN_VER = RG-2018.9-linux
+ endif
+ TOOLCHAIN_PATH=/opt/xtensa/XtDevTools/install/tools/$(XTENSA_TOOLCHAIN_VER)/XtensaTools
+ XTENSA_SYSTEM=/opt/xtensa/XtDevTools/install/builds/$(XTENSA_TOOLCHAIN_VER)/$(XTENSA_CORE)/config
endif
- XTENSA_TOOLCHAIN_VER = RG-2018.9-linux
-else
- XTENSA_CORE = Amlogic_v0
- XTENSA_TOOLCHAIN_VER = RG-2018.9-linux
-endif
-XTENSA_HOME = /opt/xtensa/XtDevTools/install/tools/${XTENSA_TOOLCHAIN_VER}/XtensaTools
-XTENSA_SYSTEM = /opt/xtensa/XtDevTools/install/builds/${XTENSA_TOOLCHAIN_VER}/${XTENSA_CORE}/config
-PATH := ${XTENSA_HOME}/bin:${PATH}
-export PATH ARCH SOC BOARD KERNEL SDK_BASE kernel_BUILD_DIR XTENSA_CORE XTENSA_HOME XTENSA_SYSTEM
+export PATH ARCH SOC BOARD KERNEL SDK_BASE kernel_BUILD_DIR TOOLCHAIN_PATH XTENSA_CORE XTENSA_SYSTEM
################################################################
# Macros
@@ -280,7 +285,7 @@
ifndef COMPILER
$(error COMPILER is not set, Please execute source scripts/env.sh)
endif
- @ if [[ "$(COMPILER)" != "xcc" ]]; then \
+ @ if [[ "$(ARCH)" == "arm" || "$(ARCH)" == "arm64" ]]; then \
if [ ! -d $($@_DIR) ]; then \
$(call MESSAGE,"Extracting $@"); \
mkdir -p $($@_DIR); \