OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

scripts: Dockerfile: re-add TGL toolchain removed by accident 

TGL has always been using the `xtensa-cnl-elf` toolchain. That
toolchain was removed by accident when cavs 1.8 support (including
CNL) was removed by massive search/replace commit dc9ba281d7
("platform: remove support for cAVS 1.8 platforms")

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This commit is contained in:
Marc Herbert 2023-04-25 17:49:20 -07:00 committed by Liam Girdwood
parent 0c7db9a58e
commit 34d7baa800
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/docker_build/sof_builder/Dockerfile
View File

@ -93,7 +93,7 @@ RUN cd "$HOME" && \
git clone $CLONE_DEFAULTS --branch sof-gcc10x $CT_NG_REPO && \ git clone $CLONE_DEFAULTS --branch sof-gcc10x $CT_NG_REPO && \
cd crosstool-ng && \ cd crosstool-ng && \
./bootstrap && ./configure --prefix=`pwd` && make && make install && \ ./bootstrap && ./configure --prefix=`pwd` && make && make install && \
for arch in imx imx8m imx8ulp rn rmb mt8186 mt8195; do \ for arch in cnl imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
echo "$arch: ct-ng build start..." && \ echo "$arch: ct-ng build start..." && \
cp config-${arch}-gcc10.2-gdb9 .config && \ cp config-${arch}-gcc10.2-gdb9 .config && \
# replace the build dist to save space # replace the build dist to save space
@ -104,6 +104,7 @@ RUN cd "$HOME" && \
done && \ done && \
echo "Stage2: xtensa-overlay, crosstool-ng are done!" echo "Stage2: xtensa-overlay, crosstool-ng are done!"
ENV PATH="/home/sof/work/xtensa-cnl-elf/bin:${PATH}"
ENV PATH="/home/sof/work/xtensa-rn-elf/bin:${PATH}" ENV PATH="/home/sof/work/xtensa-rn-elf/bin:${PATH}"
ENV PATH="/home/sof/work/xtensa-rmb-elf/bin:${PATH}" ENV PATH="/home/sof/work/xtensa-rmb-elf/bin:${PATH}"
ENV PATH="/home/sof/work/xtensa-imx-elf/bin:${PATH}" ENV PATH="/home/sof/work/xtensa-imx-elf/bin:${PATH}"
@ -116,7 +117,7 @@ ARG NEWLIB_REPO=https://github.com/jcmvbkbc/newlib-xtensa.git
RUN cd "$HOME" && \ RUN cd "$HOME" && \
git clone $CLONE_DEFAULTS --branch xtensa $NEWLIB_REPO && \ git clone $CLONE_DEFAULTS --branch xtensa $NEWLIB_REPO && \
cd newlib-xtensa && \ cd newlib-xtensa && \
for arch in imx imx8m imx8ulp rn rmb mt8186 mt8195; do \ for arch in cnl imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
./configure --target=xtensa-${arch}-elf \ ./configure --target=xtensa-${arch}-elf \
--prefix=/home/sof/work/xtensa-root && \ --prefix=/home/sof/work/xtensa-root && \
make && make install && \ make && make install && \