Fix file names, move packages btw base & extended, generate lock files

scripts/generate-conda-lockfiles.sh

@@ -19,7 +19,7 @@ for TOOLCHAIN_TYPE in riscv-tools esp-tools; do
       --no-mamba \
       --no-micromamba \
       -f "$REQS_DIR/chipyard-base.yaml" \
-      -f "$REQS_DIR/fsim-marshal.yaml" \
+      -f "$REQS_DIR/chipyard-extended.yaml" \
       -f "$REQS_DIR/docs.yaml" \
       -f "$REQS_DIR/$TOOLCHAIN_TYPE.yaml" \
       -p linux-64 \
@@ -33,7 +33,7 @@ for TOOLCHAIN_TYPE in riscv-tools esp-tools; do
       --no-micromamba \
       -f "$REQS_DIR/chipyard-base.yaml" \
       -f "$REQS_DIR/docs.yaml" \
-      -f "$REQS_DIR/riscv-tools.yaml" \
+      -f "$REQS_DIR/$TOOLCHAIN_TYPE.yaml" \
       -p linux-64 \
       --lockfile $LOCKFILE
 done