From 9e9d53ec45118503bb791f64f067229a9cc0f760 Mon Sep 17 00:00:00 2001 From: Tinghan Shen Date: Fri, 18 Feb 2022 11:43:24 +0800 Subject: [PATCH 1/2] docker_build: Add support for mt8195 and mt8186 Add support for building mt8186 and mt8195 toolchain in docker image. Signed-off-by: Tinghan Shen --- scripts/docker_build/sof_builder/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/docker_build/sof_builder/Dockerfile b/scripts/docker_build/sof_builder/Dockerfile index c181d919feee..abdaaafc0337 100644 --- a/scripts/docker_build/sof_builder/Dockerfile +++ b/scripts/docker_build/sof_builder/Dockerfile @@ -89,7 +89,7 @@ RUN cd /home/sof && \ mkdir -p /home/sof/work/ && \ cd crosstool-ng && \ ./bootstrap && ./configure --prefix=`pwd` && make && make install && \ - for arch in byt hsw apl cnl imx imx8m imx8ulp rn; do \ + for arch in byt hsw apl cnl imx imx8m imx8ulp rn mt8186 mt8195; do \ cp config-${arch}-gcc10.2-gdb9 .config && \ # replace the build dist to save space sed -i 's#${CT_TOP_DIR}\/builds#\/home\/sof\/work#g' .config && \ @@ -107,12 +107,14 @@ ENV PATH="/home/sof/work/xtensa-rn-elf/bin:${PATH}" ENV PATH="/home/sof/work/xtensa-imx-elf/bin:${PATH}" ENV PATH="/home/sof/work/xtensa-imx8m-elf/bin:${PATH}" ENV PATH="/home/sof/work/xtensa-imx8ulp-elf/bin:${PATH}" +ENV PATH="/home/sof/work/xtensa-mt8186-elf/bin:${PATH}" +ENV PATH="/home/sof/work/xtensa-mt8195-elf/bin:${PATH}" ARG NEWLIB_REPO=https://github.com/jcmvbkbc/newlib-xtensa.git RUN cd /home/sof && \ git clone $CLONE_DEFAULTS --branch xtensa $NEWLIB_REPO && \ cd newlib-xtensa && \ - for arch in byt hsw apl cnl imx imx8m imx8ulp rn; do \ + for arch in byt hsw apl cnl imx imx8m imx8ulp rn mt8186 mt8195; do \ ./configure --target=xtensa-${arch}-elf \ --prefix=/home/sof/work/xtensa-root && \ make && \ From 91bbb57200a7b5a82a70de61d130c8f9b98e9147 Mon Sep 17 00:00:00 2001 From: Tinghan Shen Date: Wed, 18 May 2022 10:45:56 +0800 Subject: [PATCH 2/2] .github: Add a TODO for mt81xx gcc build to pull request tests Add masked mt81xx gcc build to pull request tests. Unmask mt81xx after docker image updated with mt81xx toolchain. Signed-off-by: Tinghan Shen --- .github/workflows/pull-request.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 32c0d36630e0..01639e699845 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -95,6 +95,8 @@ jobs: platform: [imx8ulp, sue jsl tgl, rn, + # TODO: enable mt81xx after docker image udpated + # mt8186, mt8195, ] steps: