Another experiment to see if we can resolve the vcu118 build.
This one puts the in-order shim before the width converter.
This commit is contained in:
@@ -177,7 +177,8 @@ module mkP3_Core (P3_Core_IFC);
|
|||||||
, AXI4_Master #(TAdd#(Wd_MId,1), Wd_Addr, Wd_Data_Periph, 0, 0, 0, 0, 0) )
|
, AXI4_Master #(TAdd#(Wd_MId,1), Wd_Addr, Wd_Data_Periph, 0, 0, 0, 0, 0) )
|
||||||
wideS_narrowM <- mkAXI4DataWidthShim_WideToNarrow (proxyInDepth, proxyOutDepth);
|
wideS_narrowM <- mkAXI4DataWidthShim_WideToNarrow (proxyInDepth, proxyOutDepth);
|
||||||
match {.wideS, .narrowM} = wideS_narrowM;
|
match {.wideS, .narrowM} = wideS_narrowM;
|
||||||
mkConnection(corew.manager_0, wideS);
|
let master0_inOrder <- mkAXI4SingleIDMaster(corew.manager_0);
|
||||||
|
mkConnection(master0_inOrder, wideS);
|
||||||
|
|
||||||
// ================================================================
|
// ================================================================
|
||||||
// Delay DRAM to compensate for relatively lower FPGA clock
|
// Delay DRAM to compensate for relatively lower FPGA clock
|
||||||
|
|||||||
@@ -169,7 +169,8 @@ module mkSoC_Top #(Reset dm_power_on_reset)
|
|||||||
, AXI4_Master #(TAdd#(Wd_MId,1), Wd_Addr, Wd_Data_Periph, 0, 0, 0, 0, 0) )
|
, AXI4_Master #(TAdd#(Wd_MId,1), Wd_Addr, Wd_Data_Periph, 0, 0, 0, 0, 0) )
|
||||||
wideS_narrowM <- mkAXI4DataWidthShim_WideToNarrow (proxyInDepth, proxyOutDepth);
|
wideS_narrowM <- mkAXI4DataWidthShim_WideToNarrow (proxyInDepth, proxyOutDepth);
|
||||||
match {.wideS, .narrowM} = wideS_narrowM;
|
match {.wideS, .narrowM} = wideS_narrowM;
|
||||||
mkConnection(corew.manager_0, wideS);
|
let master0_inOrder <- mkAXI4SingleIDMaster(corew.manager_0);
|
||||||
|
mkConnection(master0_inOrder, wideS);
|
||||||
|
|
||||||
// SoC IPs
|
// SoC IPs
|
||||||
UART_IFC uart0 <- mkUART;
|
UART_IFC uart0 <- mkUART;
|
||||||
|
|||||||
Reference in New Issue
Block a user