forked from M-Labs/artiq
gateware: name targets consistently. Closes #290
This commit is contained in:
parent
4ca9797627
commit
ed1c368e73
|
@ -16,6 +16,9 @@ unreleased [2.x]
|
|||
for p in patterns:
|
||||
print(p)
|
||||
* The "GUI" has been renamed the "dashboard".
|
||||
* When flashing NIST boards, use "-m nist_qcX" or "-m nist_clock" instead of
|
||||
just "-m qcX" or "-m clock" (#290).
|
||||
|
||||
|
||||
1.0rc2
|
||||
------
|
||||
|
|
|
@ -36,7 +36,7 @@ Prerequisites:
|
|||
""")
|
||||
parser.add_argument("-t", "--target", default="kc705",
|
||||
help="target board, default: %(default)s")
|
||||
parser.add_argument("-m", "--adapter", default="clock",
|
||||
parser.add_argument("-m", "--adapter", default="nist_clock",
|
||||
help="target adapter, default: %(default)s")
|
||||
parser.add_argument("-f", "--storage", help="write file to storage area")
|
||||
parser.add_argument("-d", "--dir", help="look for files in this directory")
|
||||
|
|
|
@ -368,21 +368,20 @@ def main():
|
|||
builder_args(parser)
|
||||
soc_kc705_args(parser)
|
||||
parser.add_argument("-H", "--hw-adapter", default="clock",
|
||||
help="hardware adapter type: qc1/clock/qc2 "
|
||||
help="hardware adapter type: "
|
||||
"nist_qc1/nist_clock/nist_qc2 "
|
||||
"(default: %(default)s)")
|
||||
args = parser.parse_args()
|
||||
|
||||
hw_adapter = args.hw_adapter.lower()
|
||||
if hw_adapter == "qc1":
|
||||
if hw_adapter == "nist_qc1":
|
||||
cls = NIST_QC1
|
||||
elif hw_adapter == "clock":
|
||||
elif hw_adapter == "nist_clock":
|
||||
cls = NIST_CLOCK
|
||||
elif hw_adapter == "qc2":
|
||||
elif hw_adapter == "nist_qc2":
|
||||
cls = NIST_QC2
|
||||
else:
|
||||
print("Invalid hardware adapter string (-H/--hw-adapter), "
|
||||
"choose from qc1, clock or qc2")
|
||||
sys.exit(1)
|
||||
raise SystemExit("Invalid hardware adapter string (-H/--hw-adapter)")
|
||||
|
||||
soc = cls(**soc_kc705_argdict(args))
|
||||
build_artiq_soc(soc, builder_argdict(args))
|
||||
|
|
|
@ -3,10 +3,10 @@
|
|||
BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh
|
||||
[ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE
|
||||
|
||||
SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-clock
|
||||
SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-nist_clock
|
||||
mkdir -p $SOC_PREFIX
|
||||
|
||||
$PYTHON -m artiq.gateware.targets.kc705 -H clock --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
|
||||
$PYTHON -m artiq.gateware.targets.kc705 -H nist_clock --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
|
||||
cp misoc_nist_clock_kc705/gateware/top.bit $SOC_PREFIX
|
||||
cp misoc_nist_clock_kc705/software/bios/bios.bin $SOC_PREFIX
|
||||
cp misoc_nist_clock_kc705/software/runtime/runtime.fbi $SOC_PREFIX
|
||||
|
|
|
@ -3,10 +3,10 @@
|
|||
BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh
|
||||
[ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE
|
||||
|
||||
SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-qc1
|
||||
SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-nist_qc1
|
||||
mkdir -p $SOC_PREFIX
|
||||
|
||||
$PYTHON -m artiq.gateware.targets.kc705 -H qc1 --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
|
||||
$PYTHON -m artiq.gateware.targets.kc705 -H nist_qc1 --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
|
||||
cp misoc_nist_qc1_kc705/gateware/top.bit $SOC_PREFIX
|
||||
cp misoc_nist_qc1_kc705/software/bios/bios.bin $SOC_PREFIX
|
||||
cp misoc_nist_qc1_kc705/software/runtime/runtime.fbi $SOC_PREFIX
|
||||
|
|
|
@ -3,10 +3,10 @@
|
|||
BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh
|
||||
[ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE
|
||||
|
||||
SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-qc2
|
||||
SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-nist_qc2
|
||||
mkdir -p $SOC_PREFIX
|
||||
|
||||
$PYTHON -m artiq.gateware.targets.kc705 -H qc2 --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
|
||||
$PYTHON -m artiq.gateware.targets.kc705 -H nist_qc2 --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
|
||||
cp misoc_nist_qc2_kc705/gateware/top.bit $SOC_PREFIX
|
||||
cp misoc_nist_qc2_kc705/software/bios/bios.bin $SOC_PREFIX
|
||||
cp misoc_nist_qc2_kc705/software/runtime/runtime.fbi $SOC_PREFIX
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh
|
||||
[ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE
|
||||
|
||||
SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/pipistrello-qc1
|
||||
SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/pipistrello-nist_qc1
|
||||
mkdir -p $SOC_PREFIX
|
||||
|
||||
$PYTHON -m artiq.gateware.targets.pipistrello $MISOC_EXTRA_ISE_CMDLINE
|
||||
|
|
Loading…
Reference in New Issue