scripts: Fix firmware binaries compilation in create-binary-archive.sh
PATCH 1/1 scripts: Fix firmware binaries compilation in create-binary-archive.sh
Currently, the generic libsbi.a is compiled in create-binary-archive.sh before platform specific firmwares so a libsbi.a without any SBI extension gets linked to the platform specific firmwares. To address this, remove the temporary build directory in create-binary-archive.sh before using it.
--- scripts/create-binary-archive.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
scripts/create-binary-archive.sh +4 -1
@@ -112,11 +112,12 @@ build_opensbi() { esac # Ensure output directory is present - mkdir -p "${BUILD_OUTPUT_PATH}/${BUILD_NAME}" + mkdir -p "${BUILD_OUTPUT_PATH}" # Build and install generic library echo "Build and install generic library XLEN=${BUILD_RISCV_XLEN}" echo "" + rm -rf "${BUILD_OUTPUT_PATH}/${BUILD_NAME}" make -C "${BUILD_OPENSBI_SOURCE_PATH}" O="${BUILD_OUTPUT_PATH}/${BUILD_NAME}" I="${BUILD_OUTPUT_PATH}/${BUILD_ARCHIVE_NAME}" PLATFORM_RISCV_XLEN="${BUILD_RISCV_XLEN}" install_libsbi -j "${BUILD_NUM_THREADS}" echo ""
@@ -125,6 +126,7 @@ build_opensbi() { do echo "Build and install PLATFORM=${BUILD_PLATFORM_SUBDIR[${INDEX}]} XLEN=${BUILD_RISCV_XLEN}" echo "" + rm -rf "${BUILD_OUTPUT_PATH}/${BUILD_NAME}" make -C "${BUILD_OPENSBI_SOURCE_PATH}" O="${BUILD_OUTPUT_PATH}/${BUILD_NAME}" I="${BUILD_OUTPUT_PATH}/${BUILD_ARCHIVE_NAME}" PLATFORM="${BUILD_PLATFORM_SUBDIR[${INDEX}]}" PLATFORM_RISCV_XLEN="${BUILD_RISCV_XLEN}" install_libplatsbi install_firmwares -j "${BUILD_NUM_THREADS}" echo "" done
@@ -133,6 +135,7 @@ build_opensbi() { if [ "${BUILD_DOCS}" == "yes" ]; then echo "Build and install docs" echo "" + rm -rf "${BUILD_OUTPUT_PATH}/${BUILD_NAME}" make -C "${BUILD_OPENSBI_SOURCE_PATH}" O="${BUILD_OUTPUT_PATH}/${BUILD_NAME}" I="${BUILD_OUTPUT_PATH}/${BUILD_ARCHIVE_NAME}" install_docs echo "" fi
Signature · 1 line
2.43.0
Anup Patel
AppliedPATCH 1/1 scripts: Fix firmware binaries compilation in create-binary-archive.sh
Quoted 7 lines · On Thu, Feb 20, 2025 at 11:16?AM Anup Patel <[email protected]> wrote:
Currently, the generic libsbi.a is compiled in
create-binary-archive.shbefore platform specific firmwares so a libsbi.a without any SBI extension gets linked to the platform specific firmwares. To address this, remove the temporary build directory increate-binary-archive.shbefore using it.Signed-off-by Anup Patel <[email protected]>
Applied this patch to the riscv/opensbi repo.
Regards,
Anup
Quoted 41 lines
--- scripts/create-binary-archive.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)scripts/create-binary-archive.sh +4
-2@@ -112,11 +112,12 @@ build_opensbi() { esac # Ensure output directory is present - mkdir -p "${BUILD_OUTPUT_PATH}/${BUILD_NAME}" + mkdir -p "${BUILD_OUTPUT_PATH}" # Build and install generic library echo "Build and install generic library XLEN=${BUILD_RISCV_XLEN}" echo "" + rm -rf "${BUILD_OUTPUT_PATH}/${BUILD_NAME}" make -C "${BUILD_OPENSBI_SOURCE_PATH}" O="${BUILD_OUTPUT_PATH}/${BUILD_NAME}" I="${BUILD_OUTPUT_PATH}/${BUILD_ARCHIVE_NAME}" PLATFORM_RISCV_XLEN="${BUILD_RISCV_XLEN}" install_libsbi -j "${BUILD_NUM_THREADS}" echo ""@@ -125,6 +126,7 @@ build_opensbi() { do echo "Build and install PLATFORM=${BUILD_PLATFORM_SUBDIR[${INDEX}]} XLEN=${BUILD_RISCV_XLEN}" echo "" + rm -rf "${BUILD_OUTPUT_PATH}/${BUILD_NAME}" make -C "${BUILD_OPENSBI_SOURCE_PATH}" O="${BUILD_OUTPUT_PATH}/${BUILD_NAME}" I="${BUILD_OUTPUT_PATH}/${BUILD_ARCHIVE_NAME}" PLATFORM="${BUILD_PLATFORM_SUBDIR[${INDEX}]}" PLATFORM_RISCV_XLEN="${BUILD_RISCV_XLEN}" install_libplatsbi install_firmwares -j "${BUILD_NUM_THREADS}" echo "" done@@ -133,6 +135,7 @@ build_opensbi() { if [ "${BUILD_DOCS}" == "yes" ]; then echo "Build and install docs" echo "" + rm -rf "${BUILD_OUTPUT_PATH}/${BUILD_NAME}" make -C "${BUILD_OPENSBI_SOURCE_PATH}" O="${BUILD_OUTPUT_PATH}/${BUILD_NAME}" I="${BUILD_OUTPUT_PATH}/${BUILD_ARCHIVE_NAME}" install_docs echo "" fi --2.43.0