gateware: update analyzer and selftest for Amaranth 0.5.x and LUNA 0.…

…2.x changes
antoinevg · Jan 28, 2025 · af76a7d · af76a7d
1 parent b2cdbeb
commit af76a7d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/cynthion/python/src/gateware/analyzer/top.py b/cynthion/python/src/gateware/analyzer/top.py
@@ -27,7 +27,6 @@
 from luna.gateware.usb.request.control   import ControlRequestHandler
 from luna.gateware.usb.stream            import USBInStreamInterface
 from luna.gateware.stream.generator      import StreamSerializer
-from luna.gateware.utils.cdc             import synchronize
 from luna.gateware.architecture.car      import LunaECP5DomainGenerator
 from luna.gateware.architecture.flash_sn import ECP5FlashUIDStringDescriptor
 from luna.gateware.interface.ulpi        import UTMITranslator

diff --git a/cynthion/python/src/selftest/gateware.py b/cynthion/python/src/selftest/gateware.py
@@ -8,7 +8,6 @@
 from amaranth import Signal, Elaboratable, Module, Cat, ClockDomain, ClockSignal, ResetSignal
 from amaranth.lib.cdc import FFSynchronizer
 
-from luna.gateware.utils.cdc          import synchronize
 from luna.gateware.architecture.car   import LunaECP5DomainGenerator
 from luna.gateware.interface.jtag     import JTAGRegisterInterface
 from luna.gateware.interface.ulpi     import ULPIRegisterWindow
@@ -40,7 +39,7 @@ def elaborate(self, platform):
         registers.add_read_only_register(REGISTER_ID, read=0x54455354)
 
         # LED test register.
-        led_reg = registers.add_register(REGISTER_LEDS, size=6, name="leds", reset=0b111111)
+        led_reg = registers.add_register(REGISTER_LEDS, size=6, name="leds", init=0b111111)
         led_out   = Cat([platform.request("led", i, dir="o").o for i in range(0, 6)])
         m.d.comb += led_out.eq(led_reg)