M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

Revert "Globally update UART baudrate to 921600." 

This reverts commit b29e2d5bfe.

This broke flterm firmware upload, which was the entire point
of the whole exercise.
This commit is contained in:
whitequark 2017-01-25 00:29:37 +00:00
parent 6414e40deb
commit de17908b38
7 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/frontend/artiq_devtool.py
View File

@ -100,7 +100,7 @@ def main():
logger.info("Booting runtime") logger.info("Booting runtime")
flterm = run_command( flterm = run_command(
"{env} python3 flterm.py {serial} --speed 921600" + "{env} python3 flterm.py {serial} " +
"--kernel /tmp/{tmp}/runtime.bin " + "--kernel /tmp/{tmp}/runtime.bin " +
("--upload-only" if action == "boot" else "--output-only")) ("--upload-only" if action == "boot" else "--output-only"))
artiq_flash = run_command( artiq_flash = run_command(
@ -151,7 +151,7 @@ def main():
logger.info("Connecting to device") logger.info("Connecting to device")
flterm = run_command( flterm = run_command(
"{env} python3 flterm.py {serial} --speed 921600 --output-only") "{env} python3 flterm.py {serial} --output-only")
drain(flterm) drain(flterm)
else: else:

1
artiq/gateware/targets/kc705_dds.py
View File

@ -112,7 +112,6 @@ class _NIST_Ions(MiniSoC, AMPSoC):
sdram_controller_type="minicon", sdram_controller_type="minicon",
l2_size=128*1024, l2_size=128*1024,
ident=artiq_version, ident=artiq_version,
uart_baudrate=921600,
**kwargs) **kwargs)
AMPSoC.__init__(self) AMPSoC.__init__(self)
if isinstance(self.platform.toolchain, XilinxVivadoToolchain): if isinstance(self.platform.toolchain, XilinxVivadoToolchain):

1
artiq/gateware/targets/kc705_drtio_master.py
View File

@ -33,7 +33,6 @@ class Master(MiniSoC, AMPSoC):
sdram_controller_type="minicon", sdram_controller_type="minicon",
l2_size=128*1024, l2_size=128*1024,
ident=artiq_version, ident=artiq_version,
uart_baudrate=921600,
**kwargs) **kwargs)
AMPSoC.__init__(self) AMPSoC.__init__(self)

1
artiq/gateware/targets/kc705_drtio_satellite.py
View File

@ -131,7 +131,6 @@ class Satellite(BaseSoC):
sdram_controller_type="minicon", sdram_controller_type="minicon",
l2_size=128*1024, l2_size=128*1024,
ident=artiq_version, ident=artiq_version,
uart_baudrate=921600,
**kwargs) **kwargs)
platform = self.platform platform = self.platform

1
artiq/gateware/targets/phaser.py
View File

@ -169,7 +169,6 @@ class Phaser(MiniSoC, AMPSoC):
sdram_controller_type="minicon", sdram_controller_type="minicon",
l2_size=128*1024, l2_size=128*1024,
ident=artiq_version, ident=artiq_version,
uart_baudrate=921600,
**kwargs) **kwargs)
AMPSoC.__init__(self) AMPSoC.__init__(self)
self.platform.toolchain.bitstream_commands.extend([ self.platform.toolchain.bitstream_commands.extend([

1
artiq/gateware/targets/pipistrello.py
View File

@ -160,7 +160,6 @@ class Demo(BaseSoC, AMPSoC):
l2_size=64*1024, l2_size=64*1024,
ident=artiq_version, ident=artiq_version,
clk_freq=75*1000*1000, clk_freq=75*1000*1000,
uart_baudrate=921600,
**kwargs) **kwargs)
AMPSoC.__init__(self) AMPSoC.__init__(self)

4
doc/manual/installing_from_source.rst
View File

@ -187,7 +187,7 @@ These steps are required to generate gateware bitstream (``.bit``) files, build
* Check that the board boots by running a serial terminal program (you may need to press its FPGA reconfiguration button or power-cycle it to load the gateware bitstream that was newly written into the flash): :: * Check that the board boots by running a serial terminal program (you may need to press its FPGA reconfiguration button or power-cycle it to load the gateware bitstream that was newly written into the flash): ::
$ flterm /dev/ttyUSB1 --speed 921600 $ flterm /dev/ttyUSB1
MiSoC BIOS http://m-labs.hk MiSoC BIOS http://m-labs.hk
[...] [...]
Booting from flash... Booting from flash...
@ -197,7 +197,7 @@ These steps are required to generate gateware bitstream (``.bit``) files, build
.. note:: flterm is part of MiSoC. If you installed MiSoC with ``setup.py develop --user``, the flterm launcher is in ``~/.local/bin``. .. note:: flterm is part of MiSoC. If you installed MiSoC with ``setup.py develop --user``, the flterm launcher is in ``~/.local/bin``.
The communication parameters are 921600 8-N-1. Ensure that your user has access The communication parameters are 115200 8-N-1. Ensure that your user has access
to the serial device (``sudo adduser $USER dialout`` assuming standard setup). to the serial device (``sudo adduser $USER dialout`` assuming standard setup).
.. _installing-the-host-side-software: .. _installing-the-host-side-software: