Merge branch 'caravan-mpw9-PnR' of github.com:efabless/caravel into caravan-mpw9-PnR

manifest

@@ -6,8 +6,8 @@ cf40562ae6508f3dc5e81420e31f7b5886dc3c8f  verilog/rtl/__user_analog_project_wrap
 cc82a78753f5f5d0a1519bd81adbcff8a4296d91  verilog/rtl/__user_project_wrapper.v
 3c8c04f53b2848dc46132cda82c614e06e56571b  verilog/rtl/buff_flash_clkrst.v
 8a23782a7870d50eb281d72bebf13320cd009813  verilog/rtl/caravan.v
-a3c5cbf5f6f56f7d5066b86d3de0d709f09432af  verilog/rtl/caravan_core.v
-06e92151b5928e3f28e30a5cde76f7dd6530ed91  verilog/rtl/caravan_netlists.v
+7ff8e0a3294fbe9dd06eafe74250d5c58c902bdb  verilog/rtl/caravan_core.v
+d36e539fad7563a03974cb7d18489e6a0ccfe80d  verilog/rtl/caravan_netlists.v
 a3d12a2d2d3596800bec47d1266dce2399a2fcc6  verilog/rtl/caravan_openframe.v
 b532b4c6315c29fd19fe38ac221b6fc41e6f5ecb  verilog/rtl/caravan_power_routing.v
 fa26aa34b4b382aacad9b7ac07a36b17172a401f  verilog/rtl/caravel.v
@@ -32,6 +32,7 @@ f59fbff4794516ddae686d0e9c785aafebdd2224  verilog/rtl/empty_macro.v
 406b6eba38e0a7e8ff561dc4e5395dbefc9c175c  verilog/rtl/gpio_signal_buffering.v
 45ea4a2d466d6d70e9e86011a62c1bd3f706ef99  verilog/rtl/gpio_signal_buffering_alt.v
 7ba9d7552eb3bbe4c7c11e2b8464be3c09d91e0b  verilog/rtl/housekeeping.v
+5963b6d10f61b0224fa4f783d1147e587cf571d5  verilog/rtl/housekeeping_alt.v
 34c6ab585986a00216c72f2f1fea0e5a8523867b  verilog/rtl/housekeeping_spi.v
 9fa366d3ac47b18c175131396248e7e7c81e3eb1  verilog/rtl/manual_power_connections.v
 0a00fd77505b29c1367b2c21d0bbc940fc50ab01  verilog/rtl/mgmt_protect.v

verilog/rtl/caravan_core.v

@@ -649,7 +649,7 @@ module caravan_core (
 
     // Housekeeping interface
 
-    housekeeping housekeeping (
+    housekeeping_alt housekeeping_alt (
 	`ifdef USE_POWER_PINS
 		.VPWR(vccd),
 		.VGND(vssd),
@@ -1396,4 +1396,4 @@ module caravan_core (
 `endif
 
 endmodule
-// `default_nettype wire
+// `default_nettype wire

verilog/rtl/caravan_netlists.v

@@ -53,7 +53,7 @@
 	`include "gl/caravel_clocking.v"
 	`include "gl/user_id_programming.v"
 	`include "gl/chip_io_alt.v"
-	`include "gl/housekeeping.v"
+	`include "gl/housekeeping_alt.v"
 	`include "gl/mprj_logic_high.v"
 	`include "gl/mprj2_logic_high.v"
 	`include "gl/mgmt_protect.v"
@@ -81,7 +81,7 @@
 	`include "mprj_io.v"
 	`include "chip_io_alt.v"
 	`include "housekeeping_spi.v"
-	`include "housekeeping.v"
+	`include "housekeeping_alt.v"
 	`include "mprj_logic_high.v"
 	`include "mprj2_logic_high.v"
 	`include "mgmt_protect.v"
@@ -94,6 +94,11 @@
 	`include "xres_buf.v"
 	`include "spare_logic_block.v"
 	`include "mgmt_core_wrapper.v"
+	`include "buff_flash_clkrst.v"
+	`include "RAM128.v"
+	`include "RAM256.v"
+	`include "VexRiscv_MinDebug.v"
+	`include "mgmt_core.v"
 	`include "caravan.v"
     `endif