fix F4PGA_DIR_ROOT inconsistency

Signed-off-by: Pawel Czarnecki <pczarnecki@antmicro.com>
This commit is contained in:
Pawel Czarnecki 2022-07-28 11:56:41 +02:00
parent a54555942a
commit 9cd048885e
2 changed files with 4 additions and 8 deletions

View File

@ -20,10 +20,7 @@ set -e
FPGA_FAM=${FPGA_FAM:=xc7} FPGA_FAM=${FPGA_FAM:=xc7}
case "$FPGA_FAM" in F4PGA_DIR_ROOT='install'
xc7) F4PGA_DIR_ROOT='install';;
eos-s3) F4PGA_DIR_ROOT='quicklogic-arch-defs';;
esac
export PATH="$F4PGA_INSTALL_DIR/$FPGA_FAM/$F4PGA_DIR_ROOT/bin:$PATH" export PATH="$F4PGA_INSTALL_DIR/$FPGA_FAM/$F4PGA_DIR_ROOT/bin:$PATH"
source "$F4PGA_INSTALL_DIR/$FPGA_FAM/conda/etc/profile.d/conda.sh" source "$F4PGA_INSTALL_DIR/$FPGA_FAM/conda/etc/profile.d/conda.sh"

View File

@ -68,10 +68,9 @@ cd ..
echo '::group::Add f4pga-env' echo '::group::Add f4pga-env'
case "$FPGA_FAM" in
xc7) F4PGA_DIR_ROOT='install';; F4PGA_DIR_ROOT='install'
eos-s3) F4PGA_DIR_ROOT='quicklogic-arch-defs';;
esac
F4PGA_DIR_BIN="$F4PGA_INSTALL_DIR_FAM/$F4PGA_DIR_ROOT"/bin/ F4PGA_DIR_BIN="$F4PGA_INSTALL_DIR_FAM/$F4PGA_DIR_ROOT"/bin/
mkdir -p "$F4PGA_DIR_BIN" mkdir -p "$F4PGA_DIR_BIN"
cp $(dirname "$0")/../../f4pga-env "$F4PGA_DIR_BIN" cp $(dirname "$0")/../../f4pga-env "$F4PGA_DIR_BIN"