diff --git a/images/foss-asic-tools/Dockerfile b/images/foss-asic-tools/Dockerfile index d9b08d2c..ab3e9a26 100755 --- a/images/foss-asic-tools/Dockerfile +++ b/images/foss-asic-tools/Dockerfile @@ -22,7 +22,7 @@ ENV HOME=/headless \ VNC_VIEW_ONLY=false \ DESIGNS=/foss/designs \ TOOLS=/foss/tools \ - PDK_ROOT=/foss/pdk + PDK_ROOT=/foss/pdks ADD ./scripts/ $STARTUPDIR/scripts RUN find $STARTUPDIR/scripts -name '*.sh' -exec chmod a+x {} + @@ -43,7 +43,7 @@ FROM openlane:latest as openlane FROM klayout:latest as klayout FROM gtkwave:latest as gtkwave FROM iverilog:latest as iverilog -FROM pdks-volare:latest as pdk +FROM pdks-volare:latest as pdks FROM magic:latest as magic FROM netgen:latest as netgen FROM riscv-gnu-toolchain-rv32i as rv32i @@ -59,7 +59,7 @@ FROM base #FROM dv as dv -COPY --from=pdk /foss/pdks/ /foss/pdks/ +COPY --from=pdks /foss/pdks/ /foss/pdks/ COPY --from=openlane /foss/tools/openlane /foss/tools/openlane COPY --from=openlane /foss/tools/openlane_tools /foss/tools/openlane_tools COPY --from=gtkwave /foss/tools/ /foss/tools/ diff --git a/images/foss-asic-tools/scripts/env.sh b/images/foss-asic-tools/scripts/env.sh index ebbd72e1..806076aa 100755 --- a/images/foss-asic-tools/scripts/env.sh +++ b/images/foss-asic-tools/scripts/env.sh @@ -33,7 +33,7 @@ export OPENLANE_ROOT=$TOOLS/openlane export SAK=$TOOLS/sak/ export EDITOR='gedit' -export PATH=$TOOLS/bin:$SAK:/usr/local/sbin:$PATH +export PATH=$TOOLS/bin:$SAK/bin:/usr/local/sbin:$PATH #---------------------------------------- # Tool Aliases @@ -49,7 +49,7 @@ alias kf='klayout -c $SAK/klayout/tech/sky130A/sky130A.krc -nn $PDK_ROOT/$PD alias tt='cd /foss/tools' alias dd='cd /foss/designs' -alias pp='cd /foss/pdk' +alias pp='cd /foss/pdks' alias destroy='sudo \rm -rf' alias cp='cp -i' alias egrep='egrep ' diff --git a/images/foss-asic-tools/scripts/miscellaneous.sh b/images/foss-asic-tools/scripts/miscellaneous.sh index 6b4dd498..2059e44a 100755 --- a/images/foss-asic-tools/scripts/miscellaneous.sh +++ b/images/foss-asic-tools/scripts/miscellaneous.sh @@ -12,7 +12,7 @@ yum install -y hub ############### mkdir -p /foss/designs -mkdir -p /foss/pdk +mkdir -p /foss/pdks cp -a $TOOLS/sak/openlane/spef_extractor $TOOLS/ diff --git a/images/open_pdks/scripts/install.sh b/images/open_pdks/scripts/install.sh index 230f45ed..a24aa411 100755 --- a/images/open_pdks/scripts/install.sh +++ b/images/open_pdks/scripts/install.sh @@ -5,7 +5,7 @@ source scl_source enable devtoolset-8 magic_version=$(ls /foss/tools/magic/ ) export PATH=$PATH:/foss/tools/magic/$magic_version/bin/ -export PDK_ROOT=/foss/pdk +export PDK_ROOT=/foss/pdks cd $PDK_ROOT git clone ${REPO_URL} ${NAME} diff --git a/images/skywater-pdk.not-included/Dockerfile b/images/skywater-pdk.not-included/Dockerfile index 5c4daaf9..8b80d4c6 100755 --- a/images/skywater-pdk.not-included/Dockerfile +++ b/images/skywater-pdk.not-included/Dockerfile @@ -4,7 +4,7 @@ ARG REPO_URL ARG REPO_COMMIT ARG NAME -ENV PDK_ROOT=/foss/pdk +ENV PDK_ROOT=/foss/pdks COPY corners/corners.yml /foss/pdk/corners.yml COPY corners/make_timing.py /foss/pdk/make_timing.py