riscv
/
caravel
mirror of https://github.com/efabless/caravel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #165 from efabless/misc-rtl-changes 

some rtl changes
This commit is contained in:
Mohamed Shalan 2022-10-11 10:48:18 +02:00 committed by GitHub
parent fe3d2b927f db9362d858
commit 11530f691e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifest
View File

@ -7,11 +7,11 @@ ef356bbc8938fef0c1866a709a3bf846d8c7e1e4 verilog/rtl/__user_project_wrapper.v
f93c57988b0044d2bff4470a84b5eddc158f2094 verilog/rtl/caravan.v f93c57988b0044d2bff4470a84b5eddc158f2094 verilog/rtl/caravan.v
1b8dc7f0a4f2196b7c2de926af9c648ebf315f3d verilog/rtl/caravan_netlists.v 1b8dc7f0a4f2196b7c2de926af9c648ebf315f3d verilog/rtl/caravan_netlists.v
a3d12a2d2d3596800bec47d1266dce2399a2fcc6 verilog/rtl/caravan_openframe.v a3d12a2d2d3596800bec47d1266dce2399a2fcc6 verilog/rtl/caravan_openframe.v
b4b8fecbdc56c5d8acca9b904415f30e3159d1d5 verilog/rtl/caravel.v 0087afb30dea45ddc49c98a9959e73a264233cfa verilog/rtl/caravel.v
2fe34f043edbe87c626e5616ad54f82c9ba067c2 verilog/rtl/caravel_clocking.v 2fe34f043edbe87c626e5616ad54f82c9ba067c2 verilog/rtl/caravel_clocking.v
3b9185fd0dc2d0e8c49f1af3d14724e0948fe650 verilog/rtl/caravel_openframe.v 3b9185fd0dc2d0e8c49f1af3d14724e0948fe650 verilog/rtl/caravel_openframe.v
d97cb60c8d125d6098111d4f0aa00410515770eb verilog/rtl/caravel_power_routing.v d97cb60c8d125d6098111d4f0aa00410515770eb verilog/rtl/caravel_power_routing.v
82d3766e5ed2a29ff06150aab1c7b0f4c5651551 verilog/rtl/chip_io.v bc1e961e41d1d3a383a018279a08bf4108911f53 verilog/rtl/chip_io.v
97c958944dd74a87f75d9fe2309837e567468722 verilog/rtl/chip_io_alt.v 97c958944dd74a87f75d9fe2309837e567468722 verilog/rtl/chip_io_alt.v
126aff02aa229dc346301c552d785dec76a4d68e verilog/rtl/clock_div.v 126aff02aa229dc346301c552d785dec76a4d68e verilog/rtl/clock_div.v
941bd7636e7558b045faa3d8c6ba2d91b4c4b798 verilog/rtl/constant_block.v 941bd7636e7558b045faa3d8c6ba2d91b4c4b798 verilog/rtl/constant_block.v

35
verilog/rtl/caravel.v
View File

@ -196,7 +196,6 @@ module caravel (
// Flash SPI communication (management SoC to housekeeping) // Flash SPI communication (management SoC to housekeeping)
wire flash_clk_core, flash_csb_core; wire flash_clk_core, flash_csb_core;
wire flash_clk_oeb_core, flash_csb_oeb_core; wire flash_clk_oeb_core, flash_csb_oeb_core;
wire flash_clk_ieb_core, flash_csb_ieb_core;
wire flash_io0_oeb_core, flash_io1_oeb_core; wire flash_io0_oeb_core, flash_io1_oeb_core;
wire flash_io2_oeb_core, flash_io3_oeb_core; wire flash_io2_oeb_core, flash_io3_oeb_core;
wire flash_io0_ieb_core, flash_io1_ieb_core; wire flash_io0_ieb_core, flash_io1_ieb_core;
@ -237,22 +236,22 @@ module caravel (
.vccd2_pad (vccd2), // User area 2 1.8V supply .vccd2_pad (vccd2), // User area 2 1.8V supply
.vssd1_pad (vssd1), // User area 1 digital ground .vssd1_pad (vssd1), // User area 1 digital ground
.vssd2_pad (vssd2), // User area 2 digital ground .vssd2_pad (vssd2), // User area 2 digital ground
.vddio (vddio_core),
.vssio (vssio_core),
.vdda (vdda_core),
.vssa (vssa_core),
.vccd (vccd_core),
.vssd (vssd_core),
.vdda1 (vdda1_core),
.vdda2 (vdda2_core),
.vssa1 (vssa1_core),
.vssa2 (vssa2_core),
.vccd1 (vccd1_core),
.vccd2 (vccd2_core),
.vssd1 (vssd1_core),
.vssd2 (vssd2_core),
`endif `endif
// Core Side Pins // Core Side Pins
.vddio (vddio_core),
.vssio (vssio_core),
.vdda (vdda_core),
.vssa (vssa_core),
.vccd (vccd_core),
.vssd (vssd_core),
.vdda1 (vdda1_core),
.vdda2 (vdda2_core),
.vssa1 (vssa1_core),
.vssa2 (vssa2_core),
.vccd1 (vccd1_core),
.vccd2 (vccd2_core),
.vssd1 (vssd1_core),
.vssd2 (vssd2_core),
.gpio(gpio), .gpio(gpio),
.mprj_io(mprj_io), .mprj_io(mprj_io),
.clock(clock), .clock(clock),
@ -278,8 +277,6 @@ module caravel (
.flash_clk_oeb_core(flash_clk_oeb), .flash_clk_oeb_core(flash_clk_oeb),
.flash_io0_oeb_core(flash_io0_oeb), .flash_io0_oeb_core(flash_io0_oeb),
.flash_io1_oeb_core(flash_io1_oeb), .flash_io1_oeb_core(flash_io1_oeb),
.flash_csb_ieb_core(flash_csb_ieb),
.flash_clk_ieb_core(flash_clk_ieb),
.flash_io0_ieb_core(flash_io0_ieb), .flash_io0_ieb_core(flash_io0_ieb),
.flash_io1_ieb_core(flash_io1_ieb), .flash_io1_ieb_core(flash_io1_ieb),
.flash_io0_do_core(flash_io0_do), .flash_io0_do_core(flash_io0_do),
@ -1503,5 +1500,9 @@ module caravel (
.spare_xfqn(spare_xfqn_nc) .spare_xfqn(spare_xfqn_nc)
); );
`ifdef TOP_ROUTING
caravel_power_routing caravel_power_routing();
`endif
endmodule endmodule
// `default_nettype wire // `default_nettype wire

2
verilog/rtl/chip_io.v
View File

@ -75,8 +75,6 @@ module chip_io(
input flash_clk_oeb_core, input flash_clk_oeb_core,
input flash_io0_oeb_core, input flash_io0_oeb_core,
input flash_io1_oeb_core, input flash_io1_oeb_core,
input flash_csb_ieb_core, // NOTE: unused, fix me!
input flash_clk_ieb_core, // NOTE: unused, fix me!
input flash_io0_ieb_core, input flash_io0_ieb_core,
input flash_io1_ieb_core, input flash_io1_ieb_core,
input flash_io0_do_core, input flash_io0_do_core,