Fix flags for real

This commit is contained in:
Jordan Carlin 2025-05-31 02:53:11 -07:00
parent 778a5bb813
commit dedb25f55a
No known key found for this signature in database
8 changed files with 16 additions and 13 deletions

View file

@ -55,7 +55,7 @@ if check_tool_version $ELF2HEX_VERSION; then
./configure --target=riscv64-unknown-elf --prefix="$RISCV"
make 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
make install 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
if [ "$clean" ]; then
if [ "$clean" = true ]; then
cd "$RISCV"
rm -rf elf2hex
fi

View file

@ -49,7 +49,7 @@ if check_tool_version $QEMU_VERSION; then
./configure --target-list=riscv64-softmmu --prefix="$RISCV"
make -j "${NUM_THREADS}" 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
make install 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
if [ "$clean" ]; then
if [ "$clean" = true ]; then
cd "$RISCV"
rm -rf qemu
fi

View file

@ -52,7 +52,7 @@ if check_tool_version $RISCV_GNU_TOOLCHAIN_VERSION; then
cd "$RISCV"/riscv-gnu-toolchain
./configure --prefix="${RISCV}" --with-multilib-generator="rv32e-ilp32e--;rv32i-ilp32--;rv32im-ilp32--;rv32iac-ilp32--;rv32imac-ilp32--;rv32imafc-ilp32f--;rv32imafdc-ilp32d--;rv64i-lp64--;rv64ic-lp64--;rv64iac-lp64--;rv64imac-lp64--;rv64imafdc-lp64d--;rv64im-lp64--;"
make -j "${NUM_THREADS}" 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
if [ "$clean" ]; then
if [ "$clean" = true ]; then
cd "$RISCV"
rm -rf riscv-gnu-toolchain
fi

View file

@ -91,7 +91,7 @@ if check_tool_version $RISCV_SAIL_MODEL_VERSION; then
cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX="$RISCV" -DDOWNLOAD_GMP="$DOWNLOAD_GMP" -GNinja 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
cmake --build build 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
cmake --install build 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
if [ "$clean" ]; then
if [ "$clean" = true ]; then
cd "$RISCV"
rm -rf sail-riscv
fi

View file

@ -51,7 +51,7 @@ if check_tool_version $SPIKE_VERSION; then
../configure --prefix="$RISCV"
make -j "${NUM_THREADS}" 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
make install 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
if [ "$clean" ]; then
if [ "$clean" = true ]; then
cd "$RISCV"
rm -rf riscv-isa-sim
fi

View file

@ -68,7 +68,7 @@ if check_tool_version $VERILATOR_VERSION; then
./configure --prefix="$RISCV"
make -j "${NUM_THREADS}" 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
make install 2>&1 | logger; [ "${PIPESTATUS[0]}" == 0 ]
if [ "$clean" ]; then
if [ "$clean" = true ]; then
cd "$RISCV"
rm -rf verilator
fi
@ -77,4 +77,3 @@ if check_tool_version $VERILATOR_VERSION; then
else
echo -e "${SUCCESS_COLOR}Verilator already up to date.${ENDC}"
fi

View file

@ -39,6 +39,11 @@ WARNING_COLOR='\033[93m'
FAIL_COLOR='\033[91m'
ENDC='\033[0m' # Reset to default color
if [ -z "$WALLY" ]; then
dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
WALLY="$(dirname "$dir")"
export WALLY
fi
### Common functions and error handling ###
source "$WALLY"/bin/installation/wally-installation-helper-functions.sh
@ -134,13 +139,12 @@ fi
### Configure installation ###
# Check flags
# 0 = true, 1 = false for bash
clean=1
no_buidroot=1
clean=false
no_buildroot=false
while [[ "$#" -gt 0 ]]; do
case $1 in
-c|--clean) clean=0 ;;
--no-buildroot) no_buidroot=0 ;;
-c|--clean) clean=true ;;
--no-buildroot) no_buildroot=true ;;
--no-args) ;; # Ignore this flag, workaround for sourcing this script in other scripts
-h|--help)
echo -e "Usage: $0 [\$RISCV] [options]"

View file

@ -119,7 +119,7 @@ source "$WALLY"/bin/installation/skywater-lib-install.sh
# Buildroot and Linux testvectors
# Buildroot is used to boot a minimal version of Linux on Wally.
# Testvectors are generated using QEMU.
if [ "$no_buidroot" ]; then
if [ "$no_buildroot" = true ]; then
echo -e "${OK_COLOR}Skipping Buildroot and Linux testvectors.${ENDC}"
else
source "$WALLY"/bin/installation/buildroot-install.sh