From 86fd0d5c18c610f626e2b18f306ba8877cf41041 Mon Sep 17 00:00:00 2001 From: Romain Dolbeau Date: Mon, 31 Oct 2022 15:58:47 +0100 Subject: [PATCH] more stuff moved to common --- nubus-to-ztex-gateware/VintageBusFPGA_Common | 2 +- nubus-to-ztex-gateware/nubus_to_fpga_soc.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nubus-to-ztex-gateware/VintageBusFPGA_Common b/nubus-to-ztex-gateware/VintageBusFPGA_Common index 747e95c..1a0d113 160000 --- a/nubus-to-ztex-gateware/VintageBusFPGA_Common +++ b/nubus-to-ztex-gateware/VintageBusFPGA_Common @@ -1 +1 @@ -Subproject commit 747e95cb9c4574776c42fa53a9ed0e07e6bd9ea6 +Subproject commit 1a0d113e8bd9126625e55d5572d00569d47a88ac diff --git a/nubus-to-ztex-gateware/nubus_to_fpga_soc.py b/nubus-to-ztex-gateware/nubus_to_fpga_soc.py index 857be41..2339db6 100644 --- a/nubus-to-ztex-gateware/nubus_to_fpga_soc.py +++ b/nubus-to-ztex-gateware/nubus_to_fpga_soc.py @@ -37,7 +37,8 @@ from VintageBusFPGA_Common.goblin_accel import * # Wishbone stuff from VintageBusFPGA_Common.cdc_wb import WishboneDomainCrossingMaster -from sbus_to_fpga_blk_dma import * +from VintageBusFPGA_Common.fpga_blk_dma import * + from nubus_mem_wb import NuBus2Wishbone from nubus_memfifo_wb import NuBus2WishboneFIFO from nubus_cpu_wb import Wishbone2NuBus