diff --git a/mag/caravan.mag b/mag/caravan.mag index ef4ccb79..59601d59 100644 --- a/mag/caravan.mag +++ b/mag/caravan.mag @@ -1,7 +1,7 @@ magic tech sky130A magscale 1 2 -timestamp 1685510561 +timestamp 1685639048 << metal5 >> rect 78610 1018624 90778 1030789 rect 130010 1018624 142178 1030789 @@ -68,11 +68,11 @@ rect 570422 6811 582590 18976 rect 624222 6811 636390 18976 use caravan_logo caravan_logo timestamp 0 -transform 1 0 216000 0 1 5100 +transform 1 0 202000 0 1 5100 box 0 0 1 1 use caravan_motto caravan_motto timestamp 0 -transform 1 0 270000 0 1 -7000 +transform 1 0 -108000 0 1 -1400 box 0 0 1 1 use caravan_core chip_core timestamp 0 diff --git a/openlane/caravan/config.tcl b/openlane/caravan/config.tcl index 8972e2e2..87831983 100644 --- a/openlane/caravan/config.tcl +++ b/openlane/caravan/config.tcl @@ -30,9 +30,9 @@ set ::env(VERILOG_FILES) "\ set ::env(SYNTH_READ_BLACKBOX_LIB) 0 set ::env(VERILOG_FILES_BLACKBOX) "\ - $verilog_root/rtl/caravel_logo.v \ - $verilog_root/rtl/caravel_motto.v \ - $verilog_root/rtl/copyright_block.v \ + $verilog_root/rtl/caravan_logo.v \ + $verilog_root/rtl/caravan_motto.v \ + $verilog_root/rtl/copyright_block_a.v \ $verilog_root/rtl/open_source.v \ $verilog_root/rtl/user_id_textblock.v \ $verilog_root/rtl/defines.v \ @@ -41,20 +41,20 @@ set ::env(VERILOG_FILES_BLACKBOX) "\ $verilog_root/gl/caravan_core.v" set ::env(EXTRA_LEFS) "\ - $lef_root/caravel_logo-stub.lef \ - $lef_root/caravel_motto-stub.lef \ - $lef_root/copyright_block-stub.lef \ + $lef_root/caravan_logo-stub.lef \ + $lef_root/caravan_motto-stub.lef \ + $lef_root/copyright_block_a-stub.lef \ $lef_root/open_source-stub.lef \ $lef_root/user_id_textblock-stub.lef \ $lef_root/chip_io_alt.lef \ $lef_root/caravan_core.lef" set ::env(EXTRA_GDS_FILES) "\ - $gds_root/copyright_block.gds \ + $gds_root/copyright_block_a.gds \ $gds_root/open_source.gds \ $gds_root/user_id_textblock.gds \ - $gds_root/caravel_logo.gds \ - $gds_root/caravel_motto.gds \ + $gds_root/caravan_logo.gds \ + $gds_root/caravan_motto.gds \ $gds_root/chip_io_alt.gds \ $gds_root/caravan_core.gds" diff --git a/openlane/caravan/interactive.tcl b/openlane/caravan/interactive.tcl index 29bc2b93..74bda924 100644 --- a/openlane/caravan/interactive.tcl +++ b/openlane/caravan/interactive.tcl @@ -28,10 +28,10 @@ init_floorplan add_macro_placement padframe 0 0 N add_macro_placement chip_core 211.5 210.5 N add_macro_placement user_id_textblock 175 35 N -add_macro_placement copyright_block 482 85 N +add_macro_placement copyright_block_a 482 85 N add_macro_placement open_source 768 15 N -add_macro_placement caravel_logo 1080 25.5 N -add_macro_placement caravel_motto 1350 -35 N +add_macro_placement caravan_logo 1010 25.5 N +add_macro_placement caravan_motto -540 -7 N manual_macro_placement f diff --git a/verilog/rtl/caravan.v b/verilog/rtl/caravan.v index cbcbda33..f8d4319f 100644 --- a/verilog/rtl/caravan.v +++ b/verilog/rtl/caravan.v @@ -405,9 +405,9 @@ module caravan ( .mprj_io_one(mprj_io_one) ); -copyright_block copyright_block(); -caravel_logo caravel_logo(); -caravel_motto caravel_motto(); +copyright_block_a copyright_block_a(); +caravan_logo caravan_logo(); +caravan_motto caravan_motto(); open_source open_source(); user_id_textblock user_id_textblock(); diff --git a/verilog/rtl/caravan_logo.v b/verilog/rtl/caravan_logo.v new file mode 100644 index 00000000..d3172624 --- /dev/null +++ b/verilog/rtl/caravan_logo.v @@ -0,0 +1,2 @@ +module caravan_logo (); +endmodule diff --git a/verilog/rtl/caravan_motto.v b/verilog/rtl/caravan_motto.v new file mode 100644 index 00000000..87062a42 --- /dev/null +++ b/verilog/rtl/caravan_motto.v @@ -0,0 +1,2 @@ +module caravan_motto (); +endmodule diff --git a/verilog/rtl/copyright_block_a.v b/verilog/rtl/copyright_block_a.v new file mode 100644 index 00000000..8af46c21 --- /dev/null +++ b/verilog/rtl/copyright_block_a.v @@ -0,0 +1,2 @@ +module copyright_block_a (); +endmodule