commit 44404dcb1899e5ad97aa6d106592b6795a891886
author Alvin Chang <alvinga@andestech.com> Mon May 15 22:12:00 2023 +0800
committer Jérôme Forissier <jerome@forissier.org> Tue May 16 13:56:49 2023 +0200
tree 5072e9a87d765b689d660a37f24ff52c244a28cf
parent 4b263e2f4c3a174222e9a4afe35d89f6d86a2553

common.mk: Remove deprecated legacy toolchains

The legacy toolchain support is added in commit:
92582b5 ("Support legacy compiler")
However, it is removed later in commit:
6a0fc2b ("toolchain: Remove legacy toolchains")

Since legacy toolchain is removed, we also remove unnecessary variables
in common.mk.

Signed-off-by: Alvin Chang <alvinga@andestech.com>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>

br-ext/configs/toolchain-aarch32-legacy

diff --git a/br-ext/configs/toolchain-aarch32-legacy b/br-ext/configs/toolchain-aarch32-legacy
deleted file mode 100644
index fdc1496..0000000
--- a/br-ext/configs/toolchain-aarch32-legacy
+++ /dev/null
@@ -1,9 +0,0 @@
-BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="%TOP_DIR%/toolchains/aarch32-legacy"
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-linux-gnueabihf"
-BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_17=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
-BR2_TOOLCHAIN_EXTERNAL_CXX=y
-

common.mk

diff --git a/common.mk b/common.mk
index 9299a86..e4769d0 100644
--- a/common.mk
+++ b/common.mk
@@ -186,19 +186,10 @@
 ################################################################################
 # set the compiler when COMPILE_xxx are defined
 ################################################################################
-
-
-ifeq ($(COMPILE_LEGACY),)
 CROSS_COMPILE_NS_USER   ?= "$(CCACHE)$(AARCH$(COMPILE_NS_USER)_CROSS_COMPILE)"
 CROSS_COMPILE_NS_KERNEL ?= "$(CCACHE)$(AARCH$(COMPILE_NS_KERNEL)_CROSS_COMPILE)"
 CROSS_COMPILE_S_USER    ?= "$(CCACHE)$(AARCH$(COMPILE_S_USER)_CROSS_COMPILE)"
 CROSS_COMPILE_S_KERNEL  ?= "$(CCACHE)$(AARCH$(COMPILE_S_KERNEL)_CROSS_COMPILE)"
-else
-CROSS_COMPILE_NS_USER   ?= "$(CCACHE)$(LEGACY_AARCH$(COMPILE_NS_USER)_CROSS_COMPILE)"
-CROSS_COMPILE_NS_KERNEL ?= "$(CCACHE)$(LEGACY_AARCH$(COMPILE_NS_KERNEL)_CROSS_COMPILE)"
-CROSS_COMPILE_S_USER    ?= "$(CCACHE)$(LEGACY_AARCH$(COMPILE_S_USER)_CROSS_COMPILE)"
-CROSS_COMPILE_S_KERNEL  ?= "$(CCACHE)$(LEGACY_AARCH$(COMPILE_S_KERNEL)_CROSS_COMPILE)"
-endif
 
 ifeq ($(COMPILE_S_USER),32)
 OPTEE_OS_TA_DEV_KIT_DIR	?= $(OPTEE_OS_PATH)/out/arm/export-ta_arm32
@@ -260,11 +251,7 @@
 else
 # Local toolchains (downloaded by "make toolchains")
 ifeq ($(UNAME_M),x86_64)
-ifeq ($(COMPILE_LEGACY),)
 BUILDROOT_TOOLCHAIN=toolchain-aarch$(COMPILE_NS_USER)
-else
-BUILDROOT_TOOLCHAIN=toolchain-aarch$(COMPILE_NS_USER)-legacy
-endif
 else ifeq ($(UNAME_M),aarch64)
 ifeq ($(COMPILE_NS_USER),64)
 BUILDROOT_TOOLCHAIN=toolchain-aarch64-sdk