| Message ID | 20220112202640.7064-1-ju.o@free.fr |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] board/spike/riscv64/start.sh: add buildroot host dir in PATH | expand |
On Wed, 12 Jan 2022 21:26:40 +0100 Julien Olivain <ju.o@free.fr> wrote: > commit 0d0f84d2004b04bc93d5ceb58c86640f190e5d78 > added the missing host-dtc dependency to riscv-isa-sim. > > The spike simulator calls the dtc binary at its startup. The host dtc > command needs to be in the PATH at that time. > > This commit add the buildroot host binary directory into the PATH of the > start.sh helper script. It make sure spike will use the buildroot dtc > version. This commit fixes this start.sh script on host not providing > the dtc command. Since the "spike" binary is now in the PATH, the > binary name is also simplified. > > Signed-off-by: Julien Olivain <ju.o@free.fr> > --- > board/spike/riscv64/start.sh | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas
diff --git a/board/spike/riscv64/start.sh b/board/spike/riscv64/start.sh index 75b1412df8..6fbbced806 100755 --- a/board/spike/riscv64/start.sh +++ b/board/spike/riscv64/start.sh @@ -3,9 +3,13 @@ SCRIPT_DIR="$(dirname "$0")" BR_BASEDIR="$(readlink -e "${SCRIPT_DIR}/../../..")" +# spike uses dtc at runtime startup, so make sure buildroot host +# directory is in the PATH +export PATH="${BR_BASEDIR}/output/host/usr/bin:$PATH" + # Use Buildroot host spike by default, but allow the caller to # redefine another spike binary -: "${SPIKE:=${BR_BASEDIR}/output/host/usr/bin/spike}" +: "${SPIKE:=spike}" exec "${SPIKE}" \ --initrd "${BR_BASEDIR}"/output/images/rootfs.cpio \
commit 0d0f84d2004b04bc93d5ceb58c86640f190e5d78 added the missing host-dtc dependency to riscv-isa-sim. The spike simulator calls the dtc binary at its startup. The host dtc command needs to be in the PATH at that time. This commit add the buildroot host binary directory into the PATH of the start.sh helper script. It make sure spike will use the buildroot dtc version. This commit fixes this start.sh script on host not providing the dtc command. Since the "spike" binary is now in the PATH, the binary name is also simplified. Signed-off-by: Julien Olivain <ju.o@free.fr> --- board/spike/riscv64/start.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)