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

xtensa-build-zephyr: download rimage whether we clone zephyr or not 

... because there's no reason to make one depend on the other.

Same for the opportunistic creation of the sof symbolic link.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This commit is contained in:
Marc Herbert 2021-09-27 17:53:06 -07:00 committed by Liam Girdwood
parent d80d70bf47
commit 868e00bdd0
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/xtensa-build-zephyr.sh
View File

@ -364,21 +364,22 @@ see https://docs.zephyrproject.org/latest/getting_started/index.html"
fi fi
( cd "${WEST_TOP}" && assert_west_topdir ) ( cd "${WEST_TOP}" && assert_west_topdir )
fi
# Symlink zephyr-project to our SOF selves if no sof west module yet # Symlink zephyr-project to our SOF selves if no sof west module yet
test -e "${WEST_TOP}"/modules/audio/sof || { test -e "${WEST_TOP}"/modules/audio/sof || {
mkdir -p "${WEST_TOP}"/modules/audio mkdir -p "${WEST_TOP}"/modules/audio
ln -s "$SOF_TOP" "${WEST_TOP}"/modules/audio/sof ln -s "$SOF_TOP" "${WEST_TOP}"/modules/audio/sof
} }
# FIXME: remove this hack. Downloading and building # FIXME: remove this hack. Downloading and building should be
# should be kept separate but support for submodules in # kept separate but support for submodules in west is too
# west is too recent, cannot rely on it yet. # recent, cannot rely on it yet.
# https://docs.zephyrproject.org/latest/guides/west/release-notes.html#v0-9-0 # https://docs.zephyrproject.org/latest/guides/west/release-notes.html#v0-9-0
test -e "${WEST_TOP}"/modules/audio/sof/rimage/CMakeLists.txt || ( test -e "${WEST_TOP}"/modules/audio/sof/rimage/CMakeLists.txt || (
cd "${WEST_TOP}"/modules/audio/sof cd "${WEST_TOP}"/modules/audio/sof
# Support starting with sof/ coming from "west # Support starting with sof/ coming from "west
# update sof". # update sof".
@ -388,9 +389,8 @@ see https://docs.zephyrproject.org/latest/getting_started/index.html"
git remote | grep -q '^origin$' || git remote | grep -q '^origin$' ||
git remote add origin https://github.com/thesofproject/sof git remote add origin https://github.com/thesofproject/sof
git submodule update --init --recursive git submodule update --init --recursive
) )
fi
test "${#PLATFORMS[@]}" -eq 0 || build_all test "${#PLATFORMS[@]}" -eq 0 || build_all
} }