| Message ID | 20241208190741.4192601-2-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | 12d7be498a88385271cf28bc2466695ce6d31305 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Enable arm64 host support in Gitlab | expand |
On Sun, 8 Dec 2024 at 12:08, Tom Rini <trini@konsulko.com> wrote: > > The xtensa architecture is interesting in that the platforms we support > are only valid on the binary-only toolchains as the DC233C instruction > set requires those toolchains (and not the FSF instruction set). Only > install the binary toolchain on amd64 hosts and only run the tests on > them as well. > > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > .gitlab-ci.yml | 8 +++++++- > tools/docker/Dockerfile | 4 +++- > 2 files changed, 10 insertions(+), 2 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Sun, Dec 08, 2024 at 11:07:24AM -0600, Tom Rini wrote: > The xtensa architecture is interesting in that the platforms we support > are only valid on the binary-only toolchains as the DC233C instruction > set requires those toolchains (and not the FSF instruction set). Only > install the binary toolchain on amd64 hosts and only run the tests on > them as well. > > Signed-off-by: Tom Rini <trini@konsulko.com> > Reviewed-by: Simon Glass <sjg@chromium.org> For the series, applied to u-boot/next, thanks!
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57037e243ecb..2671c3bb1061 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -144,12 +144,14 @@ build all PowerPC platforms: exit $ret; fi; +# We exclude xtensa here due to not being able to build on aarch64 +# hosts but covering all platforms in the pytest section. build all other platforms: extends: .world_build script: - ret=0; git config --global --add safe.directory "${CI_PROJECT_DIR}"; - ./tools/buildman/buildman -o /tmp -PEWM -x arm,powerpc || ret=$?; + ./tools/buildman/buildman -o /tmp -PEWM -x arm,powerpc,xtensa || ret=$?; if [[ $ret -ne 0 ]]; then ./tools/buildman/buildman -o /tmp -seP; exit $ret; @@ -451,6 +453,8 @@ qemu-xtensa-dc233c test.py: variables: TEST_PY_BD: "qemu-xtensa-dc233c" TEST_PY_TEST_SPEC: "not sleep and not efi" + tags: + - all <<: *buildman_and_testpy_dfn r2dplus_i82557c test.py: @@ -514,6 +518,8 @@ xtfpga test.py: TEST_PY_BD: "xtfpga" TEST_PY_TEST_SPEC: "not sleep" TEST_PY_ID: "--id qemu" + tags: + - all <<: *buildman_and_testpy_dfn coreboot test.py: diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index ce1ad7cb23a2..8723834e6e5c 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -320,7 +320,9 @@ RUN virtualenv -p /usr/bin/python3 /tmp/venv && \ # Create the buildman config file RUN /bin/echo -e "[toolchain]\nroot = /usr" > ~/.buildman RUN /bin/echo -e "kernelorg = /opt/gcc-13.2.0-nolibc/*" >> ~/.buildman -RUN /bin/echo -e "\n[toolchain-prefix]\nxtensa = /opt/2020.07/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman; +RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ + /bin/echo -e "\n[toolchain-prefix]\nxtensa = /opt/2020.07/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman; \ + fi RUN /bin/echo -e "\n[toolchain-alias]\nsh = sh2" >> ~/.buildman RUN /bin/echo -e "\nx86 = i386" >> ~/.buildman;
The xtensa architecture is interesting in that the platforms we support are only valid on the binary-only toolchains as the DC233C instruction set requires those toolchains (and not the FSF instruction set). Only install the binary toolchain on amd64 hosts and only run the tests on them as well. Signed-off-by: Tom Rini <trini@konsulko.com> --- .gitlab-ci.yml | 8 +++++++- tools/docker/Dockerfile | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-)