rebase caravel
diff --git a/.gitmodules b/.gitmodules
index 0fbcc7c..4668a64 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,6 +8,6 @@
[submodule "verilog/rtl/syntacore/scr1/dependencies/coremark"]
path = verilog/rtl/syntacore/scr1/dependencies/coremark
url = https://github.com/eembc/coremark
-[submodule "caravel-lite"]
+[submodule "caravel"]
path = caravel
url = https://github.com/efabless/caravel-lite.git
diff --git a/README.md b/README.md
index e7f9267..987945d 100644
--- a/README.md
+++ b/README.md
@@ -471,16 +471,14 @@
```
## Step-3: clone Openlane scripts under workarea
```bash
- git clone https://github.com/dineshannayya/OpenLane.git
+ git clone https://github.com/The-OpenROAD-Project/OpenLane.git
```
-## Step-4: Environment setting
- - Note: PDK alreay installed inside the docker, no need to define the PDK_ROOT, This will be point to /opt/pdk path inside the docker
- if user define the PDK_ROOT path, then flow will use the user defined PDK PATH. Set these enviornmental variable in .bashrc file
+## Step-4: add Environment setting
```bash
export CARAVEL_ROOT=<Carvel Installed Path>
export OPENLANE_ROOT=<OpenLane Installed Path>
- export IMAGE_NAME=dineshannayya/openlane:rc7
+ export OPENLANE_IMAGE_NAME=efabless/openlane:latest
export PDK_ROOT=<PDK Installed PATH>
export PDK_PATH=<PDK Install Path>/sky130A
```
@@ -549,15 +547,6 @@
4. `CVC` - Performs Circuit Validity Checks
-## **important Note**
-
-Following tools in openlane docker is older version, we need to update these tool set.
-* Icarus Verilog version 12.0 (devel) (s20150603-1107-ga446c34d)
-* Yosys 0.9+4081 (git sha1 b6721aa9, clang 10.0.0-4ubuntu1 -fPIC -Os)
-
-We have modified these openlane changes in our git repo, you can use from these path
- git clone https://github.com/dineshannayya/openlane.git
- docker pull dineshannayya/openlane:rc7
diff --git a/caravel b/caravel
index 0f16ba8..13f2590 160000
--- a/caravel
+++ b/caravel
@@ -1 +1 @@
-Subproject commit 0f16ba8eaae841a6f122fc0d5837005d3312fd2b
+Subproject commit 13f2590e4b3a74b910dac56a6b757f5a66fd5212
diff --git a/openlane/user_project_wrapper/pdn.tcl b/openlane/user_project_wrapper/pdn.tcl
index 3982b7f..c23f68f 100644
--- a/openlane/user_project_wrapper/pdn.tcl
+++ b/openlane/user_project_wrapper/pdn.tcl
@@ -70,12 +70,12 @@
foreach macro_instance $::env(FP_PDN_MACROS) {
set macro_instance_grid [subst $macro]
dict append $macro_instance_grid instance $macro_instance
- pdngen::specify_grid macro [subst $macro_instance_grid]
set ::halo [list $::env(FP_HORIZONTAL_HALO) $::env(FP_VERTICAL_HALO)]
+ pdngen::specify_grid macro [subst $macro_instance_grid]
}
} else {
- pdngen::specify_grid macro [subst $macro]
set ::halo [list $::env(FP_HORIZONTAL_HALO) $::env(FP_VERTICAL_HALO)]
+ pdngen::specify_grid macro [subst $macro]
}
# CAN NOT ENABLE THE TCL COMMAND BECAUSE THERE IS NO ARGUMENT FOR SPECIFYING THE POWER AND GROUND PIN NAMES ON THE MACRO
# define_pdn_grid -macro -orient {R0 R180 MX MY R90 R270 MXR90 MYR90} -grid_over_pg_pins -starts_with POWER -pin_direction vertical -halo [subst {$::env(FP_HORIZONTAL_HALO) $::env(FP_VERTICAL_HALO)}]
diff --git a/spef/pinmux.spef.gz b/spef/pinmux.spef.gz
deleted file mode 100644
index 13cd881..0000000
--- a/spef/pinmux.spef.gz
+++ /dev/null
Binary files differ
diff --git a/spef/sar_adc.spef.gz b/spef/sar_adc.spef.gz
deleted file mode 100644
index 5b2a506..0000000
--- a/spef/sar_adc.spef.gz
+++ /dev/null
Binary files differ
diff --git a/spef/spi_master.spef.gz b/spef/spi_master.spef.gz
deleted file mode 100644
index 8c13e3f..0000000
--- a/spef/spi_master.spef.gz
+++ /dev/null
Binary files differ
