From 0e6f6cfb1287fb2d7fc340887c402583a5637884 Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Sat, 26 Oct 2024 12:45:09 +0900 Subject: [PATCH] twister: Remove 'xtools' toolchain variant references This commit removes all references to the `xtools` toolchain variant in the twister scripts. Note that the `xtools` toolchain variant has been deprecated since Zephyr v3.3.0 and now removed. Signed-off-by: Stephanos Ioannidis --- scripts/pylib/twister/twisterlib/platform.py | 18 +++++++++--------- .../boards/1_level/2_level/board_config_1.yaml | 1 - .../boards/1_level/2_level/board_config_2.yaml | 1 - .../boards/1_level/2_level/board_config_3.yaml | 1 - 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/scripts/pylib/twister/twisterlib/platform.py b/scripts/pylib/twister/twisterlib/platform.py index 325520d1513..3be5ba5cc28 100644 --- a/scripts/pylib/twister/twisterlib/platform.py +++ b/scripts/pylib/twister/twisterlib/platform.py @@ -149,18 +149,18 @@ class Platform: support_toolchain_variants = { # we don't provide defaults for 'arc' intentionally: some targets can't be built with GNU - # toolchain ("zephyr", "cross-compile", "xtools" options) and for some targets we haven't - # provided MWDT compiler / linker options in corresponding SoC file in Zephyr, so these - # targets can't be built with ARC MWDT toolchain ("arcmwdt" option) by Zephyr build system - # Instead for 'arc' we rely on 'toolchain' option in board yaml configuration. - "arm": ["zephyr", "gnuarmemb", "xtools", "armclang", "llvm"], + # toolchain ("zephyr", "cross-compile" options) and for some targets we haven't provided + # MWDT compiler / linker options in corresponding SoC file in Zephyr, so these targets + # can't be built with ARC MWDT toolchain ("arcmwdt" option) by Zephyr build system Instead + # for 'arc' we rely on 'toolchain' option in board yaml configuration. + "arm": ["zephyr", "gnuarmemb", "armclang", "llvm"], "arm64": ["zephyr", "cross-compile"], - "mips": ["zephyr", "xtools"], - "nios2": ["zephyr", "xtools"], + "mips": ["zephyr"], + "nios2": ["zephyr"], "riscv": ["zephyr", "cross-compile"], "posix": ["host", "llvm"], - "sparc": ["zephyr", "xtools"], - "x86": ["zephyr", "xtools", "llvm"], + "sparc": ["zephyr"], + "x86": ["zephyr", "llvm"], # Xtensa is not listed on purpose, since there is no single toolchain # that is supported on all board targets for xtensa. } diff --git a/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_1.yaml b/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_1.yaml index b801812080c..fd48fa43d97 100644 --- a/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_1.yaml +++ b/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_1.yaml @@ -5,7 +5,6 @@ arch: arm toolchain: - zephyr - gnuarmemb - - xtools ram: 256 flash: 1024 supported: diff --git a/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_2.yaml b/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_2.yaml index 7336ba1c2f4..78f7c3892cc 100644 --- a/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_2.yaml +++ b/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_2.yaml @@ -5,7 +5,6 @@ arch: x86 toolchain: - zephyr - gnuarmemb - - xtools ram: 256 flash: 1024 supported: diff --git a/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_3.yaml b/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_3.yaml index 57118726f3c..2897ea8c130 100644 --- a/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_3.yaml +++ b/scripts/tests/twister/test_data/boards/1_level/2_level/board_config_3.yaml @@ -5,7 +5,6 @@ arch: arm toolchain: - zephyr - gnuarmemb - - xtools ram: 256 flash: 1024 supported: