From 3366ba9427d20e8ced44ba864b949d70639d5afd Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 8 Jun 2022 10:17:06 +0100 Subject: [PATCH] CI: remove armcompiler references Arm Compiler has been removed, so remove it from the CI. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- ci/base.yml | 2 +- ci/toolchains.yml | 2 -- scripts/machine-summary.py | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/base.yml b/ci/base.yml index 6cb18589..2c127290 100644 --- a/ci/base.yml +++ b/ci/base.yml @@ -30,7 +30,7 @@ local_conf_header: CONF_VERSION = "2" BB_NUMBER_THREADS = "16" PARALLEL_MAKE = "-j16" - LICENSE_FLAGS_ACCEPTED += "armcompiler Arm-FVP-EULA" + LICENSE_FLAGS_ACCEPTED += "Arm-FVP-EULA" setup: | PACKAGE_CLASSES = "package_ipk" PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl" diff --git a/ci/toolchains.yml b/ci/toolchains.yml index d2dc2961..080d8d97 100644 --- a/ci/toolchains.yml +++ b/ci/toolchains.yml @@ -11,9 +11,7 @@ local_conf_header: toolchains: | SDKMACHINE = "x86_64" -# No target armcompiler as currently there is no arm64 build target: - - nativesdk-armcompiler - gcc-aarch64-none-elf - nativesdk-gcc-aarch64-none-elf - gcc-arm-none-eabi diff --git a/scripts/machine-summary.py b/scripts/machine-summary.py index 47d8ff34..c2b43dae 100755 --- a/scripts/machine-summary.py +++ b/scripts/machine-summary.py @@ -145,7 +145,6 @@ recipes = ("virtual/kernel", "edk2-firmware", "u-boot", "optee-os", - "armcompiler-native", "gcc-aarch64-none-elf-native", "gcc-arm-none-eabi-native")