update GL and sdf netlist with caravan new netlist

verilog/includes/gl_caravel_vcs.v

@@ -29,7 +29,7 @@
 // `include "caravel/verilog/rtl/clock_div.v"
 
 `include "caravel/verilog/gl/constant_block.v" 
-// `include "caravel/verilog/rtl/chip_io_alt.v" 		     
+`include "caravel/verilog/gl/chip_io_alt.v" 		     
 `include "caravel/verilog/gl/chip_io.v" 		     
 `include "caravel/verilog/gl/mprj_logic_high.v" 	     
 `include "caravel/verilog/gl/mprj2_logic_high.v"	     
@@ -41,6 +41,7 @@
 `include "caravel/verilog/gl/xres_buf.v"		     
 `include "caravel/verilog/gl/spare_logic_block.v"	     
 `include "caravel/verilog/gl/housekeeping.v"		     
+`include "caravel/verilog/gl/housekeeping_alt.v"		     
 `include "caravel/verilog/gl/caravel_clocking.v"	     
 // `include "caravel/verilog/rtl/digital_pll.v"		     
 
@@ -64,7 +65,10 @@
 `include "caravel/verilog/gl/empty_macro.v" 
 `include "caravel/verilog/gl/manual_power_connections.v" 
 `include "caravel/verilog/gl/copyright_block.v" 
+`include "caravel/verilog/rtl/copyright_block_a.v" 
 `include "caravel/verilog/gl/caravel_logo.v" 
+`include "caravel/verilog/rtl/caravan_logo.v" 
 `include "caravel/verilog/gl/caravel_motto.v" 
+`include "caravel/verilog/rtl/caravan_motto.v" 
 `include "caravel/verilog/gl/open_source.v" 
 `include "caravel/verilog/gl/user_id_textblock.v" 

verilog/includes/includes.gl+sdf.caravel

@@ -26,6 +26,7 @@ $CARAVEL_PATH/rtl/clock_div.v
 $CARAVEL_PATH/rtl/housekeeping_spi.v
 
 $CARAVEL_PATH/gl/chip_io.v			
+$CARAVEL_PATH/gl/chip_io_alt.v			
 $CARAVEL_PATH/gl/mprj_logic_high.v		
 $CARAVEL_PATH/gl/mprj2_logic_high.v		
 $CARAVEL_PATH/gl/mgmt_protect.v 		
@@ -36,17 +37,32 @@ $CARAVEL_PATH/gl/gpio_logic_high.v
 $CARAVEL_PATH/gl/xres_buf.v			
 $CARAVEL_PATH/gl/spare_logic_block.v		
 $CARAVEL_PATH/gl/housekeeping.v 		
+$CARAVEL_PATH/gl/housekeeping_alt.v 		
 $CARAVEL_PATH/gl/caravel_clocking.v		
 $CARAVEL_PATH/gl/digital_pll.v  		
 // $CARAVEL_PATH/gl/__user_project_wrapper.v	
 $CARAVEL_PATH/gl/user_id_programming.v  	
 $CARAVEL_PATH/gl/caravel.v			
+$CARAVEL_PATH/gl/caravan.v			
+$CARAVEL_PATH/gl/caravel_core.v			
+$CARAVEL_PATH/gl/caravan_core.v			
 
 // These blocks are manually designed	     
 $CARAVEL_PATH/gl/gpio_defaults_block_0403.v	
 $CARAVEL_PATH/gl/gpio_defaults_block_1803.v	
 
 
+$CARAVEL_PATH/gl/empty_macro.v 		     
+$CARAVEL_PATH/gl/manual_power_connections.v 		     
+$CARAVEL_PATH/gl/copyright_block.v 		     
+$CARAVEL_PATH/rtl/copyright_block_a.v 		     
+$CARAVEL_PATH/gl/caravel_logo.v 		     
+$CARAVEL_PATH/rtl/caravan_logo.v 		     
+$CARAVEL_PATH/gl/caravel_motto.v 		     
+$CARAVEL_PATH/rtl/caravan_motto.v 		     
+$CARAVEL_PATH/gl/open_source.v 		     
+$CARAVEL_PATH/gl/user_id_textblock.v 
+
 //$PDK_ROOT/$PDK/libs.ref/sky130_fd_io/verilog/sky130_fd_io.v
 //$PDK_ROOT/$PDK/libs.ref/sky130_fd_io/verilog/sky130_ef_io.v
 //$PDK_ROOT/$PDK/libs.ref/sky130_fd_sc_hd/verilog/primitives.v

verilog/includes/includes.gl.caravel

@@ -35,18 +35,21 @@
 -v $(CARAVEL_PATH)/gl/xres_buf.v		     
 -v $(CARAVEL_PATH)/gl/spare_logic_block.v	     
 -v $(CARAVEL_PATH)/gl/housekeeping.v		     
+-v $(CARAVEL_PATH)/gl/housekeeping_alt.v		     
 -v $(CARAVEL_PATH)/gl/caravel_clocking.v	     
 -v $(CARAVEL_PATH)/gl/user_id_programming.v	   
 -v $(CARAVEL_PATH)/gl/mprj_io_buffer.v	   
 -v $(CARAVEL_PATH)/gl/caravel.v 		     
 -v $(CARAVEL_PATH)/gl/caravan.v 
 -v $(CARAVEL_PATH)/gl/caravel_core.v 
+-v $(CARAVEL_PATH)/gl/caravan_core.v 
 
 ###########################################################
 ## These blocks are manually designed 		
 ###########################################################
 -v $(CARAVEL_PATH)/gl/constant_block.v
 -v $(CARAVEL_PATH)/gl/chip_io.v 
+-v $(CARAVEL_PATH)/gl/chip_io_alt.v 
 -v $(CARAVEL_PATH)/gl/mgmt_protect_hv.v 	     		     
 -v $(CARAVEL_PATH)/gl/gpio_defaults_block_0403.v     
 -v $(CARAVEL_PATH)/gl/gpio_defaults_block_0801.v     
@@ -78,8 +81,11 @@
 -v $(CARAVEL_PATH)/gl/empty_macro.v 		     
 -v $(CARAVEL_PATH)/gl/manual_power_connections.v 		     
 -v $(CARAVEL_PATH)/gl/copyright_block.v 		     
+-v $(CARAVEL_PATH)/rtl/copyright_block_a.v 		     
 -v $(CARAVEL_PATH)/gl/caravel_logo.v 		     
+-v $(CARAVEL_PATH)/rtl/caravan_logo.v 		     
 -v $(CARAVEL_PATH)/gl/caravel_motto.v 		     
+-v $(CARAVEL_PATH)/rtl/caravan_motto.v 		     
 -v $(CARAVEL_PATH)/gl/open_source.v 		     
 -v $(CARAVEL_PATH)/gl/user_id_textblock.v 
 

verilog/includes/rtl_caravel_vcs.v

@@ -47,6 +47,7 @@
 `include "caravel/verilog/rtl/xres_buf.v"		     
 `include "caravel/verilog/rtl/spare_logic_block.v"	     
 `include "caravel/verilog/rtl/housekeeping.v"		     
+`include "caravel/verilog/rtl/housekeeping_alt.v"		     
 `include "caravel/verilog/rtl/caravel_clocking.v"	     
 `include "caravel/verilog/rtl/digital_pll.v"		     
 
@@ -55,6 +56,7 @@
 `include "caravel/verilog/rtl/caravel_core.v" 		     
 `include "caravel/verilog/rtl/caravel.v" 		     
 `include "caravel/verilog/rtl/caravan.v" 		     
+`include "caravel/verilog/rtl/caravan_core.v" 		     
 
 // These blocks are manually designed 		
 `include "caravel/verilog/gl/gpio_defaults_block_0403.v"     
@@ -67,7 +69,10 @@
 `include "caravel/verilog/rtl/empty_macro.v" 
 `include "caravel/verilog/rtl/manual_power_connections.v" 
 `include "caravel/verilog/rtl/copyright_block.v" 
+`include "caravel/verilog/rtl/copyright_block_a.v" 
 `include "caravel/verilog/rtl/caravel_logo.v" 
+`include "caravel/verilog/rtl/caravan_logo.v" 
 `include "caravel/verilog/rtl/caravel_motto.v" 
+`include "caravel/verilog/rtl/caravan_motto.v" 
 `include "caravel/verilog/rtl/open_source.v" 
 `include "caravel/verilog/rtl/user_id_textblock.v"