From d5b8dccaac9a0ecc04c4ecddce21e7b8f50c9ec8 Mon Sep 17 00:00:00 2001 From: David Marceau Date: Sat, 9 Dec 2023 19:25:54 -0500 Subject: [PATCH 1/3] Update build_spl.sh the working directory and the .out file destination are not the same. added the specific destination path for the listing of the .out file. --- mnt/build_spl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mnt/build_spl.sh b/mnt/build_spl.sh index 841bb69..8a509cf 100755 --- a/mnt/build_spl.sh +++ b/mnt/build_spl.sh @@ -6,7 +6,7 @@ git clone https://github.com/starfive-tech/Tools.git cd Tools/spl_tool || exit 1 make || exit 6 ./spl_tool -c -f ${UBOOT}/spl/u-boot-spl.bin || exit 2 -ls -l u-boot-spl.bin.normal.out +ls -l ${UBOOT}/spl/u-boot-spl.bin.normal.out cd ../uboot_its || exit 3 cp ${OPENSBI}/build/platform/generic/firmware/fw_payload.bin ./ || exit 4 ${UBOOT}/tools/mkimage -f visionfive2-uboot-fit-image.its -A riscv -O u-boot -T firmware visionfive2_fw_payload.img || exit 5 From 21cbe040a7bf3f2ace4cefda078c7a9a3d0d1478 Mon Sep 17 00:00:00 2001 From: David Marceau Date: Sat, 9 Dec 2023 19:45:39 -0500 Subject: [PATCH 2/3] Update Dockerfile added a few other tools to make the build succeed. a more up to date python and llvm toolchain not used everywhere but maybe some day. --- Dockerfile | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index bd517fb..ec6f8a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,23 +4,45 @@ MAINTAINER sa2kng RUN apt-get -y update &&\ apt -y upgrade &&\ apt-get -y install \ + wget \ + build-essential \ + linux-source \ bc \ + kmod \ + cpio \ + flex \ + libncurses5-dev \ + libncurses-dev \ + libelf-dev \ + libssl-dev \ + dwarves \ bison \ + git \ ca-certificates \ - cpio \ device-tree-compiler \ - flex \ gcc \ gcc-riscv64-linux-gnu \ - git \ - kmod \ - libncurses-dev \ - libssl-dev \ + ccache \ + cmake \ make \ - xz-utils &&\ - rm -rf /var/lib/apt/lists/* + xz-utils \ + software-properties-common &&\ + add-apt-repository ppa:deadsnakes/ppa &&\ + apt update &&\ + apt-get -y install python3.8 &&\ + apt-get -y install python3-dev &&\ + apt-get -y install python3-pip &&\ + apt-get -y install python3-venv &&\ + apt-get -y install sudo &&\ + add-apt-repository ppa:ubuntu-toolchain-r/test &&\ + apt update &&\ + wget https://apt.llvm.org/llvm.sh &&\ + chmod +x llvm.sh &&\ + ./llvm.sh all &&\ + rm -rf /var/lib/apt/lists/* ENV PATH="/mnt:${PATH}" +ENV CC=clang-17 +ENV CXX=clang++-17 WORKDIR /mnt CMD "bash" - From 7435e22f815d6f09b193668ec9cbf38c98d893df Mon Sep 17 00:00:00 2001 From: David Marceau Date: Sat, 9 Dec 2023 19:50:26 -0500 Subject: [PATCH 3/3] Update Dockerfile oops fixed xz-utils line. --- Dockerfile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index ec6f8a6..b5fb2bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,21 +25,21 @@ RUN apt-get -y update &&\ ccache \ cmake \ make \ - xz-utils \ - software-properties-common &&\ - add-apt-repository ppa:deadsnakes/ppa &&\ - apt update &&\ - apt-get -y install python3.8 &&\ - apt-get -y install python3-dev &&\ - apt-get -y install python3-pip &&\ - apt-get -y install python3-venv &&\ - apt-get -y install sudo &&\ - add-apt-repository ppa:ubuntu-toolchain-r/test &&\ - apt update &&\ - wget https://apt.llvm.org/llvm.sh &&\ - chmod +x llvm.sh &&\ - ./llvm.sh all &&\ - rm -rf /var/lib/apt/lists/* + xz-utils &&\ + software-properties-common &&\ + add-apt-repository ppa:deadsnakes/ppa &&\ + apt update &&\ + apt-get -y install python3.8 &&\ + apt-get -y install python3-dev &&\ + apt-get -y install python3-pip &&\ + apt-get -y install python3-venv &&\ + apt-get -y install sudo &&\ + add-apt-repository ppa:ubuntu-toolchain-r/test &&\ + apt update &&\ + wget https://apt.llvm.org/llvm.sh &&\ + chmod +x llvm.sh &&\ + ./llvm.sh all &&\ + rm -rf /var/lib/apt/lists/* ENV PATH="/mnt:${PATH}" ENV CC=clang-17