fix misc errors

This commit is contained in:
Peter McGoron 2023-06-20 13:10:12 -04:00
parent beeb9a5b91
commit 13286b940f
6 changed files with 13 additions and 28 deletions

View File

@ -1,12 +1,12 @@
m4_changequote(`⟨', `⟩')
m4_changecom(⟨/*⟩, ⟨*/⟩)
m4_define(generate_macro, ⟨m4_define(M4_$1, $2)⟩)
m4_include(control_loop_cmds.m4)
/* Copyright 2023 (C) Peter McGoron /* Copyright 2023 (C) Peter McGoron
* This file is a part of Upsilon, a free and open source software project. * This file is a part of Upsilon, a free and open source software project.
* For license terms, refer to the files in `doc/copying` in the Upsilon * For license terms, refer to the files in `doc/copying` in the Upsilon
* source distribution. * source distribution.
*/ */
m4_changequote(`⟨', `⟩')
m4_changecom(⟨/*⟩, ⟨*/⟩)
m4_define(generate_macro, ⟨m4_define(M4_$1, $2)⟩)
m4_include(control_loop_cmds.m4)
module control_loop module control_loop
#( #(

View File

@ -1,8 +1,3 @@
/* Copyright 2023 (C) Peter McGoron
* This file is a part of Upsilon, a free and open source software project.
* For license terms, refer to the files in `doc/copying` in the Upsilon
* source distribution.
*/
m4_changequote(`⟨', `⟩')m4_dnl m4_changequote(`⟨', `⟩')m4_dnl
m4_changecom(⟨/*⟩, ⟨*/⟩)m4_dnl m4_changecom(⟨/*⟩, ⟨*/⟩)m4_dnl
m4_define(generate_macro, ⟨m4_dnl m4_define(generate_macro, ⟨m4_dnl

View File

@ -1,8 +1,3 @@
/* Copyright 2023 (C) Peter McGoron
* This file is a part of Upsilon, a free and open source software project.
* For license terms, refer to the files in `doc/copying` in the Upsilon
* source distribution.
*/
generate_macro(CONTROL_LOOP_NOOP, 0) generate_macro(CONTROL_LOOP_NOOP, 0)
generate_macro(CONTROL_LOOP_STATUS, 1) generate_macro(CONTROL_LOOP_STATUS, 1)
generate_macro(CONTROL_LOOP_SETPT, 2) generate_macro(CONTROL_LOOP_SETPT, 2)

View File

@ -1,8 +1,3 @@
/* Copyright 2023 (C) Peter McGoron
* This file is a part of Upsilon, a free and open source software project.
* For license terms, refer to the files in `doc/copying` in the Upsilon
* source distribution.
*/
m4_changequote(`⟨', `⟩')m4_dnl m4_changequote(`⟨', `⟩')m4_dnl
m4_changecom(⟨/*⟩, ⟨*/⟩)m4_dnl m4_changecom(⟨/*⟩, ⟨*/⟩)m4_dnl
m4_define(generate_macro, ⟨m4_dnl m4_define(generate_macro, ⟨m4_dnl

View File

@ -1,10 +1,10 @@
m4_changequote(`⟨', `⟩')
m4_changecom(⟨/*⟩, ⟨*/⟩)
/* Copyright 2023 (C) Peter McGoron /* Copyright 2023 (C) Peter McGoron
* This file is a part of Upsilon, a free and open source software project. * This file is a part of Upsilon, a free and open source software project.
* For license terms, refer to the files in `doc/copying` in the Upsilon * For license terms, refer to the files in `doc/copying` in the Upsilon
* source distribution. * source distribution.
*/ */
m4_changequote(`⟨', `⟩')
m4_changecom(⟨/*⟩, ⟨*/⟩)
/*************** Precision ************** /*************** Precision **************
* The control loop is designed around these values, but generally * The control loop is designed around these values, but generally
* does not hardcode them. * does not hardcode them.

View File

@ -208,7 +208,7 @@ class Base(Module, AutoCSR):
self.kwargs["o_test_clock"] = platform.request("test_clock") self.kwargs["o_test_clock"] = platform.request("test_clock")
self.kwargs["o_set_low"] = platform.request("differntial_output_low") self.kwargs["o_set_low"] = platform.request("differntial_output_low")
""" Dump all MMIO pins to a JSON file with their exact bit widths. """ """ Dump all MMIO pins to a JSON file with their exact bit widths. """
with open("csr_bitwidth.json", mode='w') as f: with open("csr_bitwidth.json", mode='w') as f:
import json import json
json.dump(self.csrdict, f) json.dump(self.csrdict, f)
@ -254,18 +254,18 @@ class UpsilonSoC(SoCCore):
platform = board_spec.Platform(variant=variant, toolchain="f4pga") platform = board_spec.Platform(variant=variant, toolchain="f4pga")
rst = platform.request("cpu_reset") rst = platform.request("cpu_reset")
self.submodules.crg = _CRG(platform, sys_clk_freq, True, rst) self.submodules.crg = _CRG(platform, sys_clk_freq, True, rst)
""" """
These source files need to be sorted so that modules These source files need to be sorted so that modules
that rely on another module come later. For instance, that rely on another module come later. For instance,
`control_loop` depends on `control_loop_math`, so `control_loop` depends on `control_loop_math`, so
control_loop_math.v comes before control_loop.v control_loop_math.v comes before control_loop.v
If you want to add a new verilog file to the design, look at the If you want to add a new verilog file to the design, look at the
modules that it refers to and place it the files with those modules. modules that it refers to and place it the files with those modules.
Since Yosys doesn't support modern Verilog, only put preprocessed Since Yosys doesn't support modern Verilog, only put preprocessed
(if applicable) files here. (if applicable) files here.
""" """
platform.add_source("rtl/spi/spi_switch_preprocessed.v") platform.add_source("rtl/spi/spi_switch_preprocessed.v")
platform.add_source("rtl/spi/spi_master_preprocessed.v") platform.add_source("rtl/spi/spi_master_preprocessed.v")
platform.add_source("rtl/spi/spi_master_no_write_preprocessed.v") platform.add_source("rtl/spi/spi_master_no_write_preprocessed.v")