Merge branch 'release' of github.com:jasteve4/ActuatorController into release
diff --git a/Makefile b/Makefile index 5012f59..716e83a 100644 --- a/Makefile +++ b/Makefile
@@ -65,8 +65,8 @@ # Openlane blocks=$(shell cd openlane && find * -maxdepth 0 -type d) .PHONY: $(blocks) -$(blocks): - export CARAVEL_ROOT=$(CARAVEL_ROOT) && cd openlane && $(MAKE) $@ +$(blocks): % : + export CARAVEL_ROOT=$(CARAVEL_ROOT) && cd openlane && $(MAKE) $* dv_patterns=$(shell cd verilog/dv && find * -maxdepth 0 -type d) dv-targets-rtl=$(dv_patterns:%=verify-%-rtl) @@ -88,24 +88,18 @@ -e MCW_ROOT=$(MCW_ROOT) \ -u $$(id -u $$USER):$$(id -g $$USER) efabless/dv_setup:latest \ sh -c $(verify_command) -docker_run_verify-sdf=\ - docker run -v ${TARGET_PATH}:${TARGET_PATH} -v ${PDK_ROOT}:${PDK_ROOT} \ - -v ${CARAVEL_ROOT}:${CARAVEL_ROOT} \ - -e TARGET_PATH=${TARGET_PATH} -e PDK_ROOT=${PDK_ROOT} \ - -e CARAVEL_ROOT=${CARAVEL_ROOT} \ - -e TOOLS=/opt/riscv32i \ - -e DESIGNS=$(TARGET_PATH) \ - -e CORE_VERILOG_PATH=$(TARGET_PATH)/mgmt_core_wrapper/verilog \ - -e GCC_PREFIX=riscv32-unknown-elf \ - -e MCW_ROOT=$(MCW_ROOT) \ - -u $$(id -u $$USER):$$(id -g $$USER) efabless/caravel_openlane:2021.11.23_01.42.34 \ - sh -c $(verify_command) .PHONY: harden harden: $(blocks) -.PHONY: verify -verify: $(dv-targets) +.PHONY: verify-all-rtl +verify-all-rtl: $(dv-targets-rtl) + +.PHONY: verify-all-gl +verify-all-gl: $(dv-targets-gl) + +.PHONY: verify-all-gl-sdf +verify-all-gl-sdf: $(dv-targets-gl-sdf) $(dv-targets-rtl): SIM=RTL $(dv-targets-rtl): verify-%-rtl: $(dv_base_dependencies) @@ -117,7 +111,7 @@ $(dv-targets-gl-sdf): SIM=GL_SDF $(dv-targets-gl-sdf): verify-%-gl-sdf: $(dv_base_dependencies) - $(docker_run_verify-sdf) + $(docker_run_verify) clean-targets=$(blocks:%=clean-%) .PHONY: $(clean-targets) @@ -213,3 +207,4 @@ +
diff --git a/gds/user_project_wrapper.gds b/gds/user_project_wrapper.gds deleted file mode 100644 index 50beaae..0000000 --- a/gds/user_project_wrapper.gds +++ /dev/null Binary files differ
diff --git a/verilog/rtl/system_controller.v b/verilog/rtl/system_controller.v index a440f8e..4aa1111 100644 --- a/verilog/rtl/system_controller.v +++ b/verilog/rtl/system_controller.v
@@ -60,6 +60,7 @@ reg [2:0] mem_read_state; reg [15:0] memory_data_reg; reg [31:0] system_data; + wire system_control_n;