Update caravel-lite references

scarv · Apr 20, 2021 · e542bdf · e542bdf
1 parent 32b6e9f
commit e542bdf
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 250 deletions.
diff --git a/.github/scripts/build/run-xor.sh b/.github/scripts/build/run-xor.sh
@@ -15,7 +15,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 export UPRJ_ROOT=$(pwd)
-export CARAVEL_ROOT=$(pwd)/caravel-lite
+export CARAVEL_ROOT=$(pwd)/caravel
 cd ..
 export PDK_ROOT=$(pwd)/pdks
 export IMAGE_NAME=efabless/openlane:$OPENLANE_TAG

diff --git a/.github/scripts/dv/run-dv-wrapper.sh b/.github/scripts/dv/run-dv-wrapper.sh
@@ -22,7 +22,7 @@ SIM_MODE=$2
 DV_TEST_IDS=(${IDS//,/ })
 
 export TARGET_PATH=$(pwd)
-export CARAVEL_ROOT=$(pwd)/caravel-lite
+export CARAVEL_ROOT=$(pwd)/caravel
 
 if [ ! -d $TARGET_PATH ] 
 then

diff --git a/.github/scripts/precheck/run-precheck-drc.sh b/.github/scripts/precheck/run-precheck-drc.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 # SPDX-License-Identifier: Apache-2.0
 export TARGET_PATH=$(pwd)
-export CARAVEL_ROOT=$(pwd)/caravel-lite
+export CARAVEL_ROOT=$(pwd)/caravel
 cd ..
 export PDK_ROOT=$(pwd)/precheck_pdks
 cd $TARGET_PATH/open_mpw_precheck/

diff --git a/.github/scripts/precheck/run-precheck.sh b/.github/scripts/precheck/run-precheck.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 # SPDX-License-Identifier: Apache-2.0
 export TARGET_PATH=$(pwd)
-export CARAVEL_ROOT=$(pwd)/caravel-lite
+export CARAVEL_ROOT=$(pwd)/caravel
 cd ..
 export PDK_ROOT=$(pwd)/precheck_pdks
 cd $TARGET_PATH/open_mpw_precheck/

diff --git a/Makefile b/Makefile
@@ -65,8 +65,12 @@ endif
 # Create symbolic links to caravel's main files
 .PHONY: simlink
 simlink: check-caravel
-	@ln -f $(CARAVEL_ROOT)/openlane/Makefile openlane/Makefile
-	@ln -f $(CARAVEL_ROOT)/openlane/user_project_wrapper_empty/pin_order.cfg openlane/user_project_wrapper/pin_order.cfg
+	mkdir -p openlane
+	mkdir -p openlane/user_project_wrapper
+	cd openlane &&\
+	ln -sf ../$(CARAVEL_ROOT)/openlane/Makefile Makefile
+	cd openlane/user_project_wrapper &&\
+	ln -sf ../../$(CARAVEL_ROOT)/openlane/user_project_wrapper_empty/pin_order.cfg pin_order.cfg
 
 # Update Caravel
 .PHONY: update_caravel

diff --git a/openlane/Makefile b/openlane/Makefile
diff --git a/openlane/Makefile b/openlane/Makefile
@@ -0,0 +1 @@
+../caravel/openlane/Makefile
diff --git a/openlane/user_proj_example/config.tcl b/openlane/user_proj_example/config.tcl
@@ -18,7 +18,7 @@ set script_dir [file dirname [file normalize [info script]]]
 set ::env(DESIGN_NAME) user_proj_example
 
 set ::env(VERILOG_FILES) "\
-	$script_dir/../../caravel-lite/verilog/rtl/defines.v \
+	$script_dir/../../caravel/verilog/rtl/defines.v \
 	$script_dir/../../verilog/rtl/user_proj_example.v"
 
 set ::env(CLOCK_PORT) ""

diff --git a/openlane/user_project_wrapper/config.tcl b/openlane/user_project_wrapper/config.tcl
@@ -26,7 +26,7 @@ set ::env(DESIGN_NAME) user_project_wrapper
 
 ## Source Verilog Files
 set ::env(VERILOG_FILES) "\
-	$script_dir/../../caravel-lite/verilog/rtl/defines.v \
+	$script_dir/../../caravel/verilog/rtl/defines.v \
 	$script_dir/../../verilog/rtl/user_project_wrapper.v"
 
 ## Clock configurations

diff --git a/openlane/user_project_wrapper/pin_order.cfg b/openlane/user_project_wrapper/pin_order.cfg
diff --git a/openlane/user_project_wrapper/pin_order.cfg b/openlane/user_project_wrapper/pin_order.cfg
@@ -0,0 +1 @@
+../../caravel/openlane/user_project_wrapper_empty/pin_order.cfg
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../caravel/openlane/user_project_wrapper_empty/pin_order.cfg