Skip to content

Commit 0e6f6cf

Browse files
stephanosiocarlescufi
authored andcommitted
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 <[email protected]>
1 parent fe87abe commit 0e6f6cf

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

scripts/pylib/twister/twisterlib/platform.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,18 +149,18 @@ def load(self, board, target, aliases, data):
149149

150150
support_toolchain_variants = {
151151
# we don't provide defaults for 'arc' intentionally: some targets can't be built with GNU
152-
# toolchain ("zephyr", "cross-compile", "xtools" options) and for some targets we haven't
153-
# provided MWDT compiler / linker options in corresponding SoC file in Zephyr, so these
154-
# targets can't be built with ARC MWDT toolchain ("arcmwdt" option) by Zephyr build system
155-
# Instead for 'arc' we rely on 'toolchain' option in board yaml configuration.
156-
"arm": ["zephyr", "gnuarmemb", "xtools", "armclang", "llvm"],
152+
# toolchain ("zephyr", "cross-compile" options) and for some targets we haven't provided
153+
# MWDT compiler / linker options in corresponding SoC file in Zephyr, so these targets
154+
# can't be built with ARC MWDT toolchain ("arcmwdt" option) by Zephyr build system Instead
155+
# for 'arc' we rely on 'toolchain' option in board yaml configuration.
156+
"arm": ["zephyr", "gnuarmemb", "armclang", "llvm"],
157157
"arm64": ["zephyr", "cross-compile"],
158-
"mips": ["zephyr", "xtools"],
159-
"nios2": ["zephyr", "xtools"],
158+
"mips": ["zephyr"],
159+
"nios2": ["zephyr"],
160160
"riscv": ["zephyr", "cross-compile"],
161161
"posix": ["host", "llvm"],
162-
"sparc": ["zephyr", "xtools"],
163-
"x86": ["zephyr", "xtools", "llvm"],
162+
"sparc": ["zephyr"],
163+
"x86": ["zephyr", "llvm"],
164164
# Xtensa is not listed on purpose, since there is no single toolchain
165165
# that is supported on all board targets for xtensa.
166166
}

scripts/tests/twister/test_data/boards/1_level/2_level/board_config_1.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ arch: arm
55
toolchain:
66
- zephyr
77
- gnuarmemb
8-
- xtools
98
ram: 256
109
flash: 1024
1110
supported:

scripts/tests/twister/test_data/boards/1_level/2_level/board_config_2.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ arch: x86
55
toolchain:
66
- zephyr
77
- gnuarmemb
8-
- xtools
98
ram: 256
109
flash: 1024
1110
supported:

scripts/tests/twister/test_data/boards/1_level/2_level/board_config_3.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ arch: arm
55
toolchain:
66
- zephyr
77
- gnuarmemb
8-
- xtools
98
ram: 256
109
flash: 1024
1110
supported:

0 commit comments

Comments
 (0)