From 120dc669257c1b443ac747ded0e81ea21f87e8f0 Mon Sep 17 00:00:00 2001 From: bowei Date: Wed, 26 Aug 2026 07:50:48 +0800 Subject: [PATCH] =?UTF-8?q?sync:=20SHANGHAI-U9=202026-08-26=20fpga=5Fupdat?= =?UTF-8?q?e/gen=5Fupdate=5Fmcs.py=20=E7=9A=84=20REPO=20=E6=94=B9=E8=AF=BB?= =?UTF-8?q?=20skills=5Fenv.md=20=E7=9A=84=20SMOD=5FREPO=5FROOT=EF=BC=88081?= =?UTF-8?q?9=20=E9=81=97=E6=BC=8F=E7=9A=84=E7=AC=AC=E4=B8=89=E4=B8=AA?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fpga_update/scripts/gen_update_mcs.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/fpga_update/scripts/gen_update_mcs.py b/fpga_update/scripts/gen_update_mcs.py index 62ba1ff..ef3b8c0 100644 --- a/fpga_update/scripts/gen_update_mcs.py +++ b/fpga_update/scripts/gen_update_mcs.py @@ -26,16 +26,6 @@ import subprocess import sys import tempfile -REPO = r"E:\Xilinx_design\smod\SMOD_ATSC\my_exciter" -TCL_DIR = os.path.join(REPO, "my_exciter.srcs", "tcl_1") -BITSTREAM = os.path.join(REPO, "bitstream") -IMPL = os.path.join(REPO, "my_exciter.runs", "impl_1") - -POST_BITSTREAM = os.path.join(TCL_DIR, "post_bitstream.tcl") -GEN_RU = os.path.join(TCL_DIR, "runScript_GenRu.tcl") -PERL_SCRIPT = os.path.join(TCL_DIR, "MakeSpiFlashProgrammerMcsFiles_backup.pl") - - def _env_lookup(key, default=None): """Machine-local values (paths, IPs) live in ~/skills_env.md, never in git. An OS environment variable of the same name overrides the file.""" @@ -56,6 +46,18 @@ def _env_lookup(key, default=None): return default +# The my_exciter checkout root differs per machine; default keeps this machine's +# historical path so behaviour is unchanged when the key is absent. +REPO = _env_lookup("SMOD_REPO_ROOT", r"E:\Xilinx_design\smod\SMOD_ATSC\my_exciter") +TCL_DIR = os.path.join(REPO, "my_exciter.srcs", "tcl_1") +BITSTREAM = os.path.join(REPO, "bitstream") +IMPL = os.path.join(REPO, "my_exciter.runs", "impl_1") + +POST_BITSTREAM = os.path.join(TCL_DIR, "post_bitstream.tcl") +GEN_RU = os.path.join(TCL_DIR, "runScript_GenRu.tcl") +PERL_SCRIPT = os.path.join(TCL_DIR, "MakeSpiFlashProgrammerMcsFiles_backup.pl") + + def resolve_vivado(): """Vivado's install path differs per machine -- never hardcode it.""" exe = _env_lookup("VIVADO_PATH")