forked from Mirrors/opensbi
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. Signed-off-by: Anup Patel <apatel@ventanamicro.com>
This commit is contained in:
@@ -112,11 +112,12 @@ build_opensbi() {
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
# Ensure output directory is present
|
# Ensure output directory is present
|
||||||
mkdir -p "${BUILD_OUTPUT_PATH}/${BUILD_NAME}"
|
mkdir -p "${BUILD_OUTPUT_PATH}"
|
||||||
|
|
||||||
# Build and install generic library
|
# Build and install generic library
|
||||||
echo "Build and install generic library XLEN=${BUILD_RISCV_XLEN}"
|
echo "Build and install generic library XLEN=${BUILD_RISCV_XLEN}"
|
||||||
echo ""
|
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}"
|
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 ""
|
echo ""
|
||||||
|
|
||||||
@@ -125,6 +126,7 @@ build_opensbi() {
|
|||||||
do
|
do
|
||||||
echo "Build and install PLATFORM=${BUILD_PLATFORM_SUBDIR[${INDEX}]} XLEN=${BUILD_RISCV_XLEN}"
|
echo "Build and install PLATFORM=${BUILD_PLATFORM_SUBDIR[${INDEX}]} XLEN=${BUILD_RISCV_XLEN}"
|
||||||
echo ""
|
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}"
|
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 ""
|
echo ""
|
||||||
done
|
done
|
||||||
@@ -133,6 +135,7 @@ build_opensbi() {
|
|||||||
if [ "${BUILD_DOCS}" == "yes" ]; then
|
if [ "${BUILD_DOCS}" == "yes" ]; then
|
||||||
echo "Build and install docs"
|
echo "Build and install docs"
|
||||||
echo ""
|
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
|
make -C "${BUILD_OPENSBI_SOURCE_PATH}" O="${BUILD_OUTPUT_PATH}/${BUILD_NAME}" I="${BUILD_OUTPUT_PATH}/${BUILD_ARCHIVE_NAME}" install_docs
|
||||||
echo ""
|
echo ""
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user