From 2ea0a0a414182b5955461a6d68da43a832274a1c Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Mon, 30 Aug 2021 13:14:49 +0800 Subject: BaseTools: Switch to downloading the ARM compiler from Arm's site Linaro no longer do gcc releases - they're done by Arm now. Update gcc_arm_linux_ext_dep.yaml to fetch the latest ARM gcc release (10.3-2021.07) from their site and fix LinuxGcc5ToolChain.py with the new GCC_ARM_PREFIX. Signed-off-by: Rebecca Cran Acked-by: Leif Lindholm Acked-by: Liming Gao Acked-by: Ard Biesheuvel Reviewed-by: Pierre Gondois Acked-by: Bob Feng --- BaseTools/Bin/gcc_arm_linux_ext_dep.yaml | 10 +++++----- BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'BaseTools') diff --git a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml b/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml index 09481ceae0..9b3c4e394f 100644 --- a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml +++ b/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml @@ -1,5 +1,5 @@ ## @file -# Download GCC ARM compiler from Linaro's release site +# Download GCC ARM compiler from Arm's release site # Set shell variable GCC5_ARM_INSTALL to this folder # # This is only downloaded when a build activates scope gcc_arm_linux @@ -11,11 +11,11 @@ "scope": "gcc_arm_linux", "type": "web", "name": "gcc_arm_linux", - "source": "https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/arm-linux-gnueabihf/gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf.tar.xz", - "version": "7.4.1", - "sha256": "3C951CF1941D0FA06D64CC0D5E88612B209D8123B273FA26C16D70BD7BC6B163", + "source": "https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf.tar.asc", + "version": "10.3-2021.07", + "sha256": "aa074fa8371a4f73fecbd16bd62c8b1945f23289e26414794f130d6ccdf8e39c", "compression_type": "tar", - "internal_path": "/gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf/", + "internal_path": "/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf/", "flags": ["set_shell_var", ], "var_name": "GCC5_ARM_INSTALL" } diff --git a/BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py b/BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py index 81075438d2..a695fc3285 100644 --- a/BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py +++ b/BaseTools/Plugin/LinuxGcc5ToolChain/LinuxGcc5ToolChain.py @@ -57,7 +57,7 @@ class LinuxGcc5ToolChain(IUefiBuildPlugin): return 0 # make GCC5_ARM_PREFIX to align with tools_def.txt - prefix = os.path.join(install_path, "bin", "arm-linux-gnueabihf-") + prefix = os.path.join(install_path, "bin", "arm-none-linux-gnueabihf-") shell_environment.GetEnvironment().set_shell_var("GCC5_ARM_PREFIX", prefix) # now confirm it exists -- cgit v1.2.3