Dedup chipyard conda lock file, add esp-tools to lean conda-lock

scripts/build-setup.sh

@@ -169,10 +169,6 @@ if run_step "1"; then
     if [ "$USE_LEAN_CONDA" = false ]; then
       LOCKFILE=$CONDA_LOCK_REQS/conda-requirements-$TOOLCHAIN_TYPE-linux-64.conda-lock.yml
     else
-      if [ "$TOOLCHAIN_TYPE" != "riscv-tools" ]; then
-        echo "::ERROR:: Lean conda env is not supported for esp-tools"
-        exit 1
-      fi
       LOCKFILE=$CONDA_LOCK_REQS/conda-requirements-$TOOLCHAIN_TYPE-linux-64-lean.conda-lock.yml
     fi
 
@@ -181,7 +177,7 @@ if run_step "1"; then
         $CYDIR/scripts/generate-conda-lockfiles.sh
         exit_if_last_command_failed
     fi
-    echo "lockfile $LOCKFILE"
+    echo "Using lockfile: $LOCKFILE"
 
     # use conda-lock to create env
     conda-lock install --conda $(which conda) -p $CYDIR/.conda-env $LOCKFILE &&

scripts/generate-conda-lockfiles.sh

@@ -18,18 +18,22 @@ for TOOLCHAIN_TYPE in riscv-tools esp-tools; do
     conda-lock \
       --no-mamba \
       --no-micromamba \
-      -f "$REQS_DIR/chipyard.yaml" \
+      -f "$REQS_DIR/chipyard-base.yaml" \
+      -f "$REQS_DIR/fsim-marshal.yaml" \
       -f "$REQS_DIR/docs.yaml" \
       -f "$REQS_DIR/$TOOLCHAIN_TYPE.yaml" \
       -p linux-64 \
       --lockfile $LOCKFILE
-done
 
-conda-lock \
-  --no-mamba \
-  --no-micromamba \
-  -f "$REQS_DIR/chipyard-lean.yaml" \
-  -f "$REQS_DIR/docs.yaml" \
-  -f "$REQS_DIR/riscv-tools.yaml" \
-  -p linux-64 \
-  --lockfile $REQS_DIR/conda-lock-reqs/conda-requirements-riscv-tools-linux-64-lean.conda-lock.yml
+    LOCKFILE=$REQS_DIR/conda-lock-reqs/conda-requirements-$TOOLCHAIN_TYPE-linux-64-lean.conda-lock.yml
+    rm -rf $LOCKFILE
+
+    conda-lock \
+      --no-mamba \
+      --no-micromamba \
+      -f "$REQS_DIR/chipyard-base.yaml" \
+      -f "$REQS_DIR/docs.yaml" \
+      -f "$REQS_DIR/riscv-tools.yaml" \
+      -p linux-64 \
+      --lockfile $LOCKFILE
+done