Lab_NHMFL
/
upsilon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc.py: fix syntax errors

This commit is contained in:
Peter McGoron 2023-03-15 03:04:27 -04:00
parent fefa6409cf
commit 7af907ffb4
2 changed files with 261 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/Makefile
View File

@ -2,8 +2,11 @@
DEVICETREE_GEN_DIR=. DEVICETREE_GEN_DIR=.
all: build/digilent_arty/digilent_arty.bit overlay.dts overlay.config pin_io.h all: rtl/base/base.v build/digilent_arty/digilent_arty.bit overlay.dts overlay.config pin_io.h
build/digilent_arty/digilent_arty.bit: soc.py
rtl/base/base.v:
cd rtl/base && make
build/digilent_arty/digilent_arty.bit: rtl/base/base.v soc.py
python3 soc.py python3 soc.py
clean: clean:
rm -rf build csr.json overlay.config overlay.dts pin_io.h rm -rf build csr.json overlay.config overlay.dts pin_io.h

350
firmware/soc.py
View File

@ -14,13 +14,14 @@ from litex.soc.interconnect.csr import AutoCSR, Module, CSRStorage, CSRStatus
from litedram.phy import s7ddrphy from litedram.phy import s7ddrphy
from litedram.modules import MT41K128M16 from litedram.modules import MT41K128M16
from litedram.frontend.dma import LiteDRAMDMAReader
from liteeth.phy.mii import LiteEthPHYMII from liteeth.phy.mii import LiteEthPHYMII
# Refer to `A7-constraints.xdc` for pin names. # Refer to `A7-constraints.xdc` for pin names.
# IO with Subsignals make Record types, which have the name of the # IO with Subsignals make Record types, which have the name of the
# subsignal as an attribute. # subsignal as an attribute.
io = [ io = [
("dac_ss", 0, Pins("G13 D13 E15 J17 U12 U14 D4 E2"), IOStandard("LVCMOS33")), ("dac_ss_L", 0, Pins("G13 D13 E15 J17 U12 U14 D4 E2"), IOStandard("LVCMOS33")),
("dac_mosi", 0, Pins("B11 B18 E16 J18 V12 V14 D3 D2"), IOStandard("LVCMOS33")), ("dac_mosi", 0, Pins("B11 B18 E16 J18 V12 V14 D3 D2"), IOStandard("LVCMOS33")),
("dac_miso", 0, Pins("A11 A18 D15 K15 V10 T13 F4 H2"), IOStandard("LVCMOS33")), ("dac_miso", 0, Pins("A11 A18 D15 K15 V10 T13 F4 H2"), IOStandard("LVCMOS33")),
("dac_sck", 0, Pins("D12 K16 C15 J15 V11 U13 F3 G2"), IOStandard("LVCMOS33")), ("dac_sck", 0, Pins("D12 K16 C15 J15 V11 U13 F3 G2"), IOStandard("LVCMOS33")),
@ -30,26 +31,27 @@ io = [
] ]
class Base(Module, AutoCSR): class Base(Module, AutoCSR):
def __init__(self, clk, sdram): def __init__(self, clk, sdram, platform):
for i in range(0,8): for i in range(0,8):
setattr(self, f"dac_sel_{i}", CSRStorage(3)) setattr(self, f"dac_sel_{i}", CSRStorage(3, name=f"dac_sel_{i}"))
setattr(self, f"dac_finished_{i}", CSRStatus(1)) setattr(self, f"dac_finished_{i}", CSRStatus(1, name=f"dac_finished_{i}"))
setattr(self, f"dac_arm_{i}", CSRStorage(1)) setattr(self, f"dac_arm_{i}", CSRStorage(1, name=f"dac_arm_{i}"))
setattr(self, f"from_dac_{i}", CSRStatus(24)) setattr(self, f"from_dac_{i}", CSRStatus(24, name=f"from_dac_{i}"))
setattr(self, f"to_dac_{i}", CSRStorage(24)) setattr(self, f"to_dac_{i}", CSRStorage(24, name=f"to_dac_{i}"))
setattr(self, f"wf_arm_{i}", CSRStorage(1)) setattr(self, f"wf_arm_{i}", CSRStorage(1, name=f"wf_arm_{i}"))
setattr(self, f"wf_halt_on_finish_{i}", CSRStorage(1)), setattr(self, f"wf_halt_on_finish_{i}", CSRStorage(1, name=f"wf_halt_on_finish_{i}")),
setattr(self, f"wf_finished_{i}", CSRStatus(1)), setattr(self, f"wf_finished_{i}", CSRStatus(1, name=f"wf_finished_{i}")),
setattr(self, f"wf_time_to_wait_{i}", CSRStorage(16)) setattr(self, f"wf_time_to_wait_{i}", CSRStorage(16, name=f"wf_time_to_wait_{i}"))
setattr(self, f"wf_refresh_start_{i}", CSRStorage(1)) setattr(self, f"wf_refresh_start_{i}", CSRStorage(1, name=f"wf_refresh_start_{i}"))
setattr(self, f"wf_refresh_finished_{i}", CSRStatus(1)) setattr(self, f"wf_refresh_finished_{i}", CSRStatus(1, name=f"wf_refresh_finished_{i}"))
setattr(self, f"wf_start_addr_{i}", CSRStorage(32)) setattr(self, f"wf_start_addr_{i}", CSRStorage(32, name=f"wf_start_addr_{i}"))
port = sdram.crossbar.get_port() port = sdram.crossbar.get_port()
setattr(self, f"wf_sdram_{i}", LiteDRAMDMAReader(port)) setattr(self, f"wf_sdram_{i}", LiteDRAMDMAReader(port))
setattr(self, f"adc_finished_{i}", CSRStatus(1)) setattr(self, f"adc_finished_{i}", CSRStatus(1, name=f"adc_finished_{i}"))
setattr(self, f"adc_arm_{i}", CSRStorage(1)) setattr(self, f"adc_arm_{i}", CSRStorage(1, name=f"adc_arm_{i}"))
setattr(self, f"from_adc_{i}", CSRStatus(32)) setattr(self, f"from_adc_{i}", CSRStatus(32, name=f"from_adc_{i}"))
self.adc_sel_0 = CSRStorage(2) self.adc_sel_0 = CSRStorage(2)
self.cl_in_loop = CSRStatus(1) self.cl_in_loop = CSRStatus(1)
@ -59,208 +61,208 @@ class Base(Module, AutoCSR):
self.cl_start_cmd = CSRStorage(1) self.cl_start_cmd = CSRStorage(1)
self.cl_finish_cmd = CSRStatus(1) self.cl_finish_cmd = CSRStatus(1)
self.specials = Instance("base", self.specials += Instance("base",
i_clk(clk), i_clk = clk,
.i_dac_miso(platform.request("dac_miso")), i_dac_miso = platform.request("dac_miso"),
.o_dac_mosi(platform.request("dac_mosi")), o_dac_mosi = platform.request("dac_mosi"),
.o_dac_sck(platform.request("dac_sck")), o_dac_sck = platform.request("dac_sck"),
.o_dac_ss_L(platform.request("dac_ss_L")), o_dac_ss_L = platform.request("dac_ss_L"),
.o_adc_conv(platform.request("adc_conv")), o_adc_conv = platform.request("adc_conv"),
.i_adc_sdo(platform.request("adc_sdo")), i_adc_sdo = platform.request("adc_sdo"),
.o_adc_sck(platform.request("adc_sck")), o_adc_sck = platform.request("adc_sck"),
# dac_0 # dac_0
.i_dac_sel_0(self.dac_sel_0.storage), i_dac_sel_0 = self.dac_sel_0.storage,
.o_dac_finished_0(self.dac_finished_0.status), o_dac_finished_0 = self.dac_finished_0.status,
.i_dac_arm_0(self.dac_arm_0.storage), i_dac_arm_0 = self.dac_arm_0.storage,
.o_from_dac_0(self.from_dac_0.status), o_from_dac_0 = self.from_dac_0.status,
.i_to_dac_0(self.to_dac_0.storage), i_to_dac_0 = self.to_dac_0.storage,
.i_wf_arm_0(self.wf_arm_0.storage), i_wf_arm_0 = self.wf_arm_0.storage,
.i_wf_time_to_wait_0(self.wf_time_to_wait_0.storage), i_wf_time_to_wait_0 = self.wf_time_to_wait_0.storage,
.i_wf_refresh_start_0(self.wf_refresh_start_0.storage), i_wf_refresh_start_0 = self.wf_refresh_start_0.storage,
.o_wf_refresh_finished_0(self.wf_refresh_finished_0.status), o_wf_refresh_finished_0 = self.wf_refresh_finished_0.status,
.o_wf_start_addr_0(self.wf_start_addr_0.storage), o_wf_start_addr_0 = self.wf_start_addr_0.storage,
.o_wf_ram_dma_addr_0(self.wf_sdram_0.sink.address), o_wf_ram_dma_addr_0 = self.wf_sdram_0.sink.address,
.i_wf_ram_word_0(self.wf_sdram_0.source.data), i_wf_ram_word_0 = self.wf_sdram_0.source.data,
.o_wf_ram_read_0(self.wf_sdram_0.sink.valid), o_wf_ram_read_0 = self.wf_sdram_0.sink.valid,
.i_wf_ram_valid_0(self.wf_sdram_0.source.valid), i_wf_ram_valid_0 = self.wf_sdram_0.source.valid,
# dac_1 # dac_1
.i_dac_sel_1(self.dac_sel_1.storage), i_dac_sel_1 = self.dac_sel_1.storage,
.o_dac_finished_1(self.dac_finished_1.status), o_dac_finished_1 = self.dac_finished_1.status,
.i_dac_arm_1(self.dac_arm_1.storage), i_dac_arm_1 = self.dac_arm_1.storage,
.o_from_dac_1(self.from_dac_1.status), o_from_dac_1 = self.from_dac_1.status,
.i_to_dac_1(self.to_dac_1.storage), i_to_dac_1 = self.to_dac_1.storage,
.i_wf_arm_1(self.wf_arm_1.storage), i_wf_arm_1 = self.wf_arm_1.storage,
.i_wf_time_to_wait_1(self.wf_time_to_wait_1.storage), i_wf_time_to_wait_1 = self.wf_time_to_wait_1.storage,
.i_wf_refresh_start_1(self.wf_refresh_start_1.storage), i_wf_refresh_start_1 = self.wf_refresh_start_1.storage,
.o_wf_refresh_finished_1(self.wf_refresh_finished_1.status), o_wf_refresh_finished_1 = self.wf_refresh_finished_1.status,
.o_wf_start_addr_1(self.wf_start_addr_1.storage), o_wf_start_addr_1 = self.wf_start_addr_1.storage,
.o_wf_ram_dma_addr_1(self.wf_sdram_1.sink.address), o_wf_ram_dma_addr_1 = self.wf_sdram_1.sink.address,
.i_wf_ram_word_1(self.wf_sdram_1.source.data), i_wf_ram_word_1 = self.wf_sdram_1.source.data,
.o_wf_ram_read_1(self.wf_sdram_1.sink.valid), o_wf_ram_read_1 = self.wf_sdram_1.sink.valid,
.i_wf_ram_valid_1(self.wf_sdram_1.source.valid), i_wf_ram_valid_1 = self.wf_sdram_1.source.valid,
# dac_2 # dac_2
.i_dac_sel_2(self.dac_sel_2.storage), i_dac_sel_2 = self.dac_sel_2.storage,
.o_dac_finished_2(self.dac_finished_2.status), o_dac_finished_2 = self.dac_finished_2.status,
.i_dac_arm_2(self.dac_arm_2.storage), i_dac_arm_2 = self.dac_arm_2.storage,
.o_from_dac_2(self.from_dac_2.status), o_from_dac_2 = self.from_dac_2.status,
.i_to_dac_2(self.to_dac_2.storage), i_to_dac_2 = self.to_dac_2.storage,
.i_wf_arm_2(self.wf_arm_2.storage), i_wf_arm_2 = self.wf_arm_2.storage,
.i_wf_time_to_wait_2(self.wf_time_to_wait_2.storage), i_wf_time_to_wait_2 = self.wf_time_to_wait_2.storage,
.i_wf_refresh_start_2(self.wf_refresh_start_2.storage), i_wf_refresh_start_2 = self.wf_refresh_start_2.storage,
.o_wf_refresh_finished_2(self.wf_refresh_finished_2.status), o_wf_refresh_finished_2 = self.wf_refresh_finished_2.status,
.o_wf_start_addr_2(self.wf_start_addr_2.storage), o_wf_start_addr_2 = self.wf_start_addr_2.storage,
.o_wf_ram_dma_addr_2(self.wf_sdram_2.sink.address), o_wf_ram_dma_addr_2 = self.wf_sdram_2.sink.address,
.i_wf_ram_word_2(self.wf_sdram_2.source.data), i_wf_ram_word_2 = self.wf_sdram_2.source.data,
.o_wf_ram_read_2(self.wf_sdram_2.sink.valid), o_wf_ram_read_2 = self.wf_sdram_2.sink.valid,
.i_wf_ram_valid_2(self.wf_sdram_2.source.valid), i_wf_ram_valid_2 = self.wf_sdram_2.source.valid,
# dac_3 # dac_3
.i_dac_sel_3(self.dac_sel_3.storage), i_dac_sel_3 = self.dac_sel_3.storage,
.o_dac_finished_3(self.dac_finished_3.status), o_dac_finished_3 = self.dac_finished_3.status,
.i_dac_arm_3(self.dac_arm_3.storage), i_dac_arm_3 = self.dac_arm_3.storage,
.o_from_dac_3(self.from_dac_3.status), o_from_dac_3 = self.from_dac_3.status,
.i_to_dac_3(self.to_dac_3.storage), i_to_dac_3 = self.to_dac_3.storage,
.i_wf_arm_3(self.wf_arm_3.storage), i_wf_arm_3 = self.wf_arm_3.storage,
.i_wf_time_to_wait_3(self.wf_time_to_wait_3.storage), i_wf_time_to_wait_3 = self.wf_time_to_wait_3.storage,
.i_wf_refresh_start_3(self.wf_refresh_start_3.storage), i_wf_refresh_start_3 = self.wf_refresh_start_3.storage,
.o_wf_refresh_finished_3(self.wf_refresh_finished_3.status), o_wf_refresh_finished_3 = self.wf_refresh_finished_3.status,
.o_wf_start_addr_3(self.wf_start_addr_3.storage), o_wf_start_addr_3 = self.wf_start_addr_3.storage,
.o_wf_ram_dma_addr_3(self.wf_sdram_3.sink.address), o_wf_ram_dma_addr_3 = self.wf_sdram_3.sink.address,
.i_wf_ram_word_3(self.wf_sdram_3.source.data), i_wf_ram_word_3 = self.wf_sdram_3.source.data,
.o_wf_ram_read_3(self.wf_sdram_3.sink.valid), o_wf_ram_read_3 = self.wf_sdram_3.sink.valid,
.i_wf_ram_valid_3(self.wf_sdram_3.source.valid), i_wf_ram_valid_3 = self.wf_sdram_3.source.valid,
# dac_4 # dac_4
.i_dac_sel_4(self.dac_sel_4.storage), i_dac_sel_4 = self.dac_sel_4.storage,
.o_dac_finished_4(self.dac_finished_4.status), o_dac_finished_4 = self.dac_finished_4.status,
.i_dac_arm_4(self.dac_arm_4.storage), i_dac_arm_4 = self.dac_arm_4.storage,
.o_from_dac_4(self.from_dac_4.status), o_from_dac_4 = self.from_dac_4.status,
.i_to_dac_4(self.to_dac_4.storage), i_to_dac_4 = self.to_dac_4.storage,
.i_wf_arm_4(self.wf_arm_4.storage), i_wf_arm_4 = self.wf_arm_4.storage,
.i_wf_time_to_wait_4(self.wf_time_to_wait_4.storage), i_wf_time_to_wait_4 = self.wf_time_to_wait_4.storage,
.i_wf_refresh_start_4(self.wf_refresh_start_4.storage), i_wf_refresh_start_4 = self.wf_refresh_start_4.storage,
.o_wf_refresh_finished_4(self.wf_refresh_finished_4.status), o_wf_refresh_finished_4 = self.wf_refresh_finished_4.status,
.o_wf_start_addr_4(self.wf_start_addr_4.storage), o_wf_start_addr_4 = self.wf_start_addr_4.storage,
.o_wf_ram_dma_addr_4(self.wf_sdram_4.sink.address), o_wf_ram_dma_addr_4 = self.wf_sdram_4.sink.address,
.i_wf_ram_word_4(self.wf_sdram_4.source.data), i_wf_ram_word_4 = self.wf_sdram_4.source.data,
.o_wf_ram_read_4(self.wf_sdram_4.sink.valid), o_wf_ram_read_4 = self.wf_sdram_4.sink.valid,
.i_wf_ram_valid_4(self.wf_sdram_4.source.valid), i_wf_ram_valid_4 = self.wf_sdram_4.source.valid,
# dac_5 # dac_5
.i_dac_sel_5(self.dac_sel_5.storage), i_dac_sel_5 = self.dac_sel_5.storage,
.o_dac_finished_5(self.dac_finished_5.status), o_dac_finished_5 = self.dac_finished_5.status,
.i_dac_arm_5(self.dac_arm_5.storage), i_dac_arm_5 = self.dac_arm_5.storage,
.o_from_dac_5(self.from_dac_5.status), o_from_dac_5 = self.from_dac_5.status,
.i_to_dac_5(self.to_dac_5.storage), i_to_dac_5 = self.to_dac_5.storage,
.i_wf_arm_5(self.wf_arm_5.storage), i_wf_arm_5 = self.wf_arm_5.storage,
.i_wf_time_to_wait_5(self.wf_time_to_wait_5.storage), i_wf_time_to_wait_5 = self.wf_time_to_wait_5.storage,
.i_wf_refresh_start_5(self.wf_refresh_start_5.storage), i_wf_refresh_start_5 = self.wf_refresh_start_5.storage,
.o_wf_refresh_finished_5(self.wf_refresh_finished_5.status), o_wf_refresh_finished_5 = self.wf_refresh_finished_5.status,
.o_wf_start_addr_5(self.wf_start_addr_5.storage), o_wf_start_addr_5 = self.wf_start_addr_5.storage,
.o_wf_ram_dma_addr_5(self.wf_sdram_5.sink.address), o_wf_ram_dma_addr_5 = self.wf_sdram_5.sink.address,
.i_wf_ram_word_5(self.wf_sdram_5.source.data), i_wf_ram_word_5 = self.wf_sdram_5.source.data,
.o_wf_ram_read_5(self.wf_sdram_5.sink.valid), o_wf_ram_read_5 = self.wf_sdram_5.sink.valid,
.i_wf_ram_valid_5(self.wf_sdram_5.source.valid), i_wf_ram_valid_5 = self.wf_sdram_5.source.valid,
# dac_6 # dac_6
.i_dac_sel_6(self.dac_sel_6.storage), i_dac_sel_6 = self.dac_sel_6.storage,
.o_dac_finished_6(self.dac_finished_6.status), o_dac_finished_6 = self.dac_finished_6.status,
.i_dac_arm_6(self.dac_arm_6.storage), i_dac_arm_6 = self.dac_arm_6.storage,
.o_from_dac_6(self.from_dac_6.status), o_from_dac_6 = self.from_dac_6.status,
.i_to_dac_6(self.to_dac_6.storage), i_to_dac_6 = self.to_dac_6.storage,
.i_wf_arm_6(self.wf_arm_6.storage), i_wf_arm_6 = self.wf_arm_6.storage,
.i_wf_time_to_wait_6(self.wf_time_to_wait_6.storage), i_wf_time_to_wait_6 = self.wf_time_to_wait_6.storage,
.i_wf_refresh_start_6(self.wf_refresh_start_6.storage), i_wf_refresh_start_6 = self.wf_refresh_start_6.storage,
.o_wf_refresh_finished_6(self.wf_refresh_finished_6.status), o_wf_refresh_finished_6 = self.wf_refresh_finished_6.status,
.o_wf_start_addr_6(self.wf_start_addr_6.storage), o_wf_start_addr_6 = self.wf_start_addr_6.storage,
.o_wf_ram_dma_addr_6(self.wf_sdram_6.sink.address), o_wf_ram_dma_addr_6 = self.wf_sdram_6.sink.address,
.i_wf_ram_word_6(self.wf_sdram_6.source.data), i_wf_ram_word_6 = self.wf_sdram_6.source.data,
.o_wf_ram_read_6(self.wf_sdram_6.sink.valid), o_wf_ram_read_6 = self.wf_sdram_6.sink.valid,
.i_wf_ram_valid_6(self.wf_sdram_6.source.valid), i_wf_ram_valid_6 = self.wf_sdram_6.source.valid,
# dac_7 # dac_7
.i_dac_sel_7(self.dac_sel_7.storage), i_dac_sel_7 = self.dac_sel_7.storage,
.o_dac_finished_7(self.dac_finished_7.status), o_dac_finished_7 = self.dac_finished_7.status,
.i_dac_arm_7(self.dac_arm_7.storage), i_dac_arm_7 = self.dac_arm_7.storage,
.o_from_dac_7(self.from_dac_7.status), o_from_dac_7 = self.from_dac_7.status,
.i_to_dac_7(self.to_dac_7.storage), i_to_dac_7 = self.to_dac_7.storage,
.i_wf_arm_7(self.wf_arm_7.storage), i_wf_arm_7 = self.wf_arm_7.storage,
.i_wf_time_to_wait_7(self.wf_time_to_wait_7.storage), i_wf_time_to_wait_7 = self.wf_time_to_wait_7.storage,
.i_wf_refresh_start_7(self.wf_refresh_start_7.storage), i_wf_refresh_start_7 = self.wf_refresh_start_7.storage,
.o_wf_refresh_finished_7(self.wf_refresh_finished_7.status), o_wf_refresh_finished_7 = self.wf_refresh_finished_7.status,
.o_wf_start_addr_7(self.wf_start_addr_7.storage), o_wf_start_addr_7 = self.wf_start_addr_7.storage,
.o_wf_ram_dma_addr_7(self.wf_sdram_7.sink.address), o_wf_ram_dma_addr_7 = self.wf_sdram_7.sink.address,
.i_wf_ram_word_7(self.wf_sdram_7.source.data), i_wf_ram_word_7 = self.wf_sdram_7.source.data,
.o_wf_ram_read_7(self.wf_sdram_7.sink.valid), o_wf_ram_read_7 = self.wf_sdram_7.sink.valid,
.i_wf_ram_valid_7(self.wf_sdram_7.source.valid), i_wf_ram_valid_7 = self.wf_sdram_7.source.valid,
.i_adc_sel_0(self.adc_sel_0.storage), i_adc_sel_0 = self.adc_sel_0.storage,
# adc_0 # adc_0
.o_adc_finished_0(self.adc_finished_0.status), o_adc_finished_0 = self.adc_finished_0.status,
.i_adc_arm_0(self.adc_arm_0.storage), i_adc_arm_0 = self.adc_arm_0.storage,
.o_from_adc_0(self.from_adc_0.status), o_from_adc_0 = self.from_adc_0.status,
# adc_1 # adc_1
.o_adc_finished_1(self.adc_finished_1.status), o_adc_finished_1 = self.adc_finished_1.status,
.i_adc_arm_1(self.adc_arm_1.storage), i_adc_arm_1 = self.adc_arm_1.storage,
.o_from_adc_1(self.from_adc_1.status), o_from_adc_1 = self.from_adc_1.status,
# adc_2 # adc_2
.o_adc_finished_2(self.adc_finished_2.status), o_adc_finished_2 = self.adc_finished_2.status,
.i_adc_arm_2(self.adc_arm_2.storage), i_adc_arm_2 = self.adc_arm_2.storage,
.o_from_adc_2(self.from_adc_2.status), o_from_adc_2 = self.from_adc_2.status,
# adc_3 # adc_3
.o_adc_finished_3(self.adc_finished_3.status), o_adc_finished_3 = self.adc_finished_3.status,
.i_adc_arm_3(self.adc_arm_3.storage), i_adc_arm_3 = self.adc_arm_3.storage,
.o_from_adc_3(self.from_adc_3.status), o_from_adc_3 = self.from_adc_3.status,
# adc_4 # adc_4
.o_adc_finished_4(self.adc_finished_4.status), o_adc_finished_4 = self.adc_finished_4.status,
.i_adc_arm_4(self.adc_arm_4.storage), i_adc_arm_4 = self.adc_arm_4.storage,
.o_from_adc_4(self.from_adc_4.status), o_from_adc_4 = self.from_adc_4.status,
# adc_5 # adc_5
.o_adc_finished_5(self.adc_finished_5.status), o_adc_finished_5 = self.adc_finished_5.status,
.i_adc_arm_5(self.adc_arm_5.storage), i_adc_arm_5 = self.adc_arm_5.storage,
.o_from_adc_5(self.from_adc_5.status), o_from_adc_5 = self.from_adc_5.status,
# adc_6 # adc_6
.o_adc_finished_6(self.adc_finished_6.status), o_adc_finished_6 = self.adc_finished_6.status,
.i_adc_arm_6(self.adc_arm_6.storage), i_adc_arm_6 = self.adc_arm_6.storage,
.o_from_adc_6(self.from_adc_6.status), o_from_adc_6 = self.from_adc_6.status,
# adc_7 # adc_7
.o_adc_finished_7(self.adc_finished_7.status), o_adc_finished_7 = self.adc_finished_7.status,
.i_adc_arm_7(self.adc_arm_7.storage), i_adc_arm_7 = self.adc_arm_7.storage,
.o_from_adc_7(self.from_adc_7.status), o_from_adc_7 = self.from_adc_7.status,
.o_cl_in_loop(self.cl_in_loop.status), o_cl_in_loop = self.cl_in_loop.status,
.i_cl_cmd(self.cl_cmd.storage), i_cl_cmd = self.cl_cmd.storage,
.i_cl_word_in(self.cl_word_in.storage), i_cl_word_in = self.cl_word_in.storage,
.o_cl_word_out(self.cl_word_out.status), o_cl_word_out = self.cl_word_out.status,
.i_cl_start_cmd(self.cl_start_cmd.storage), i_cl_start_cmd = self.cl_start_cmd.storage,
.o_cl_finish_cmd(self.cl_finish_cmd.status) o_cl_finish_cmd = self.cl_finish_cmd.status
) )
# Clock and Reset Generator # Clock and Reset Generator
@ -298,7 +300,7 @@ class _CRG(Module):
class CryoSNOM1SoC(SoCCore): class CryoSNOM1SoC(SoCCore):
def __init__(self, variant): def __init__(self, variant):
sys_clk_freq = int(100e6) sys_clk_freq = int(100e6)
platform = board_spec.Platform(variant=variant, toolchain="symbiflow") platform = board_spec.Platform(variant=variant, toolchain="f4pga")
self.submodules.crg = _CRG(platform, sys_clk_freq, True) self.submodules.crg = _CRG(platform, sys_clk_freq, True)
platform.add_source("rtl/spi/spi_switch.v") platform.add_source("rtl/spi/spi_switch.v")
platform.add_source("rtl/spi/spi_master.v") platform.add_source("rtl/spi/spi_master.v")
@ -309,9 +311,9 @@ class CryoSNOM1SoC(SoCCore):
platform.add_source("rtl/control_loop/boothmul.v") platform.add_source("rtl/control_loop/boothmul.v")
platform.add_source("rtl/control_loop/control_loop_math.v") platform.add_source("rtl/control_loop/control_loop_math.v")
platform.add_source("rtl/control_loop/control_loop.v") platform.add_source("rtl/control_loop/control_loop.v")
platform.add_source("rtl/control_loop/spi_switch.v") platform.add_source("rtl/waveform/bram_interface.v")
platform.add_source("rtl/waveform/waveform.v") platform.add_source("rtl/waveform/waveform.v")
platform.add_source("rtl/spi/base/base.v") platform.add_source("rtl/base/base.v")
# SoCCore does not have sane defaults (no integrated rom) # SoCCore does not have sane defaults (no integrated rom)
SoCCore.__init__(self, SoCCore.__init__(self,
@ -353,11 +355,11 @@ class CryoSNOM1SoC(SoCCore):
# Add the DAC and ADC pins as GPIO. They will be used directly # Add the DAC and ADC pins as GPIO. They will be used directly
# by Zephyr. # by Zephyr.
platform.add_extension(io) platform.add_extension(io)
self.submodules.sdram = Base(ClockSignal(), self.sdram) self.submodules.base = Base(ClockSignal(), self.sdram, platform)
def main(): def main():
soc = CryoSNOM1SoC("a7-35") soc = CryoSNOM1SoC("a7-35")
builder = Builder(soc, csr_json="csr.json") builder = Builder(soc, csr_json="csr.json", compile_software=False)
builder.build() builder.build()
if __name__ == "__main__": if __name__ == "__main__":