Skip to content

Commit

Permalink
Merge pull request #482 from efabless/fix_caravan_core
Browse files Browse the repository at this point in the history
fix compilation error at caravan core caught by iverilog
  • Loading branch information
jeffdi authored Aug 17, 2023
2 parents 95712ca + 4cb4356 commit bb9a48f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
4 changes: 2 additions & 2 deletions manifest
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
cc82a78753f5f5d0a1519bd81adbcff8a4296d91 verilog/rtl/__user_project_wrapper.v
3c8c04f53b2848dc46132cda82c614e06e56571b verilog/rtl/buff_flash_clkrst.v
14064261ec18d633a5d72b45b2347c388f2f446f verilog/rtl/caravan.v
120661aaee20d83948e5e419a88ca9b63531ec95 verilog/rtl/caravan_core.v
502219ed86a5c1707bd0cf636f3b61de78f159d8 verilog/rtl/caravan_core.v
e68fd2e085679d0f61040115fdd1d50651705d3a verilog/rtl/caravan_logo.v
d265ea6bf861e3f5c1b1b984ae057dbaed995008 verilog/rtl/caravan_motto.v
d36e539fad7563a03974cb7d18489e6a0ccfe80d verilog/rtl/caravan_netlists.v
baf7cf0e8a8a712621aed75aff98198a663db43b verilog/rtl/caravan_netlists.v
a3d12a2d2d3596800bec47d1266dce2399a2fcc6 verilog/rtl/caravan_openframe.v
b532b4c6315c29fd19fe38ac221b6fc41e6f5ecb verilog/rtl/caravan_power_routing.v
fa26aa34b4b382aacad9b7ac07a36b17172a401f verilog/rtl/caravel.v
Expand Down
8 changes: 4 additions & 4 deletions verilog/rtl/caravan_core.v
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ module caravan_core (
// User project direct access to gpio pad connections for analog
// (all but the lowest-numbered 7 pads)
inout [`MPRJ_IO_PADS-`ANALOG_PADS-10:0] user_gpio_analog,
inout [`MPRJ_IO_PADS-`ANALOG_PADS-10:0] user_gpio_noesd,
inout [`ANALOG_PADS-1:0] user_analog,
inout [2:0] user_clamp_high,
inout wire [2:0] user_clamp_low
inout [`MPRJ_IO_PADS-`ANALOG_PADS-10:0] user_gpio_noesd,
inout [`ANALOG_PADS-1:0] user_analog,
inout [2:0] user_clamp_high,
inout [2:0] user_clamp_low
);

//------------------------------------------------------------
Expand Down
9 changes: 7 additions & 2 deletions verilog/rtl/caravan_netlists.v
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,16 @@
`include "buff_flash_clkrst.v"
`include "RAM128.v"
`include "RAM256.v"
`include "VexRiscv_MinDebug.v"
`include "VexRiscv_MinDebugCache.v"
`include "mgmt_core.v"
`include "caravan.v"
`endif

`include "simple_por.v"

`include "caravan_core.v"
`include "caravan_logo.v"
`include "caravan_motto.v"
`include "copyright_block_a.v"
`include "open_source.v"
`include "user_id_textblock.v"
`endif

0 comments on commit bb9a48f

Please sign in to comment.