From 215e45bdb35c19e47be13364dafc823ab6c09768 Mon Sep 17 00:00:00 2001 From: Oliver Smith-Denny Date: Sun, 14 Sep 2025 21:11:10 -0700 Subject: [PATCH] .azurepipelines,.github,.pytool: Disable ARM32 at Top Level/Pipelines edk2 is dropping support for the ARM32 architecture. As such, this commit drops ARM32 from running in CI and removes the references to it in the readme and Maintainers.txt. Continuous-integration-options: PatchCheck.ignore-multi-package Signed-off-by: Oliver Smith-Denny --- .azurepipelines/Ubuntu-GCC.yml | 2 +- .github/workflows/codeql.yml | 2 +- .pytool/CISettings.py | 1 - .../HostUnitTestCompilerPlugin.py | 2 -- .pytool/Readme.md | 4 ++-- Maintainers.txt | 7 ++----- ReadMe.rst | 1 - 7 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.azurepipelines/Ubuntu-GCC.yml b/.azurepipelines/Ubuntu-GCC.yml index 99fb247187..ff0dfedce6 100644 --- a/.azurepipelines/Ubuntu-GCC.yml +++ b/.azurepipelines/Ubuntu-GCC.yml @@ -22,5 +22,5 @@ jobs: tool_chain_tag: 'GCC5' vm_image: 'ubuntu-24.04' container: ${{ variables.default_linux_image }} - arch_list: "IA32,X64,ARM,AARCH64,RISCV64,LOONGARCH64" + arch_list: "IA32,X64,AARCH64,RISCV64,LOONGARCH64" usePythonVersion: '' # use Python from the container image diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index c22fa8dd61..348a8637f2 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -277,7 +277,7 @@ jobs: import shutil from pathlib import Path - dirs_to_delete = ['ia32', 'x64', 'arm', 'aarch64'] + dirs_to_delete = ['ia32', 'x64', 'aarch64'] def delete_dirs(path: Path): if path.exists() and path.is_dir(): diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py index 46f61db284..e3904a62d2 100644 --- a/.pytool/CISettings.py +++ b/.pytool/CISettings.py @@ -98,7 +98,6 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag return ( "IA32", "X64", - "ARM", "AARCH64", "RISCV64", "LOONGARCH64") diff --git a/.pytool/Plugin/HostUnitTestCompilerPlugin/HostUnitTestCompilerPlugin.py b/.pytool/Plugin/HostUnitTestCompilerPlugin/HostUnitTestCompilerPlugin.py index 76e3392ba1..a4e8e2d6d2 100644 --- a/.pytool/Plugin/HostUnitTestCompilerPlugin/HostUnitTestCompilerPlugin.py +++ b/.pytool/Plugin/HostUnitTestCompilerPlugin/HostUnitTestCompilerPlugin.py @@ -65,8 +65,6 @@ class HostUnitTestCompilerPlugin(ICiBuildPlugin): elif GetHostInfo().arch == 'ARM': if GetHostInfo().bit == '64': host.append("AARCH64") - elif GetHostInfo().bit == '32': - host.append("ARM") willrun = set(requested) & set(host) return (len(willrun), " ".join(willrun)) diff --git a/.pytool/Readme.md b/.pytool/Readme.md index d147549270..e74e502213 100644 --- a/.pytool/Readme.md +++ b/.pytool/Readme.md @@ -9,7 +9,7 @@ on the TianoCore wiki. ## Basic Status -| Package | Windows VS2022 (IA32/X64)| Ubuntu GCC (IA32/X64/ARM/AARCH64) | Known Issues | +| Package | Windows VS2022 (IA32/X64)| Ubuntu GCC (IA32/X64/AARCH64) | Known Issues | | :---- | :----- | :---- | :--- | | ArmPkg | | :heavy_check_mark: | | ArmPlatformPkg | | :heavy_check_mark: | @@ -272,7 +272,7 @@ few standard scopes. * PatchCheck tests as plugins * MacOS/xcode support * Clang/LLVM support -* Visual Studio AARCH64 and ARM support +* Visual Studio AARCH64 support * BaseTools C tools CI/PR and binary release process * BaseTools Python tools CI/PR process * Extensible private/closed source platform reporting diff --git a/Maintainers.txt b/Maintainers.txt index 0541e10886..9a7dc0d2ae 100644 --- a/Maintainers.txt +++ b/Maintainers.txt @@ -83,13 +83,10 @@ M: Liming Gao [lgao4] EDK II Architectures: --------------------- -ARM, AARCH64 +AARCH64 F: MdeModulePkg/*/AArch64/ -F: MdeModulePkg/*/Arm/ F: MdePkg/*/AArch64/ -F: MdePkg/*/Arm/ F: UefiCpuPkg/*/AArch64/ -F: UefiCpuPkg/*/Arm/ M: Leif Lindholm [leiflindholm] M: Ard Biesheuvel [ardbiesheuvel] M: Sami Mujawar [samimujawar] @@ -451,7 +448,7 @@ F: MdePkg/Include/IndustryStandard/SpiNorFlashJedecSfdp.h M: Abner Chang [changab] R: Brit Chesley [BritChesley] -MdePkg: ARM/AARCH64 standard interfaces +MdePkg: AARCH64 standard interfaces F: MdePkg/Include/Library/ArmLib.h M: Leif Lindholm [leiflindholm] M: Ard Biesheuvel [ardbiesheuvel] diff --git a/ReadMe.rst b/ReadMe.rst index ecde5cc2eb..a694bc9a79 100644 --- a/ReadMe.rst +++ b/ReadMe.rst @@ -50,7 +50,6 @@ Ubuntu 24.04 Toolchain CONFIG DEBUG RELEASE NOOPT ============================= ================= ============= ============= ============== ArmVirtPkg_Ubuntu_GCC_ | AARCH64 |avAArch64du| |avAArch64ru| |avAArch64nu| -| | ARM |avArmdu| |avArmru| |avArmnu| EmulatorPkg_Ubuntu_GCC_ | IA32 **N/A** **N/A** **N/A** | | X64 |em64du| |em64ru| |em64nu| | | IA32 FULL **N/A** **N/A** **N/A**