From 7bd312faff775b99e291a643908bc5f9d7a0694a Mon Sep 17 00:00:00 2001 From: vlsida-bot Date: Tue, 18 Jul 2023 00:59:02 +0000 Subject: [PATCH 1/6] Bump version: 1.2.19 -> 1.2.20 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9ddbe16d..53fc08d6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.19 +1.2.20 From 148d80531eebf2136a693d1e4413f09a461d0cfd Mon Sep 17 00:00:00 2001 From: mrg Date: Tue, 18 Jul 2023 10:48:22 -0700 Subject: [PATCH 2/6] Add fetch to remove error when re-installing PDK cells. --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index e10caba0..18768dd4 100644 --- a/Makefile +++ b/Makefile @@ -97,6 +97,7 @@ $(SRAM_LIB_DIR): check-pdk-root @echo "Cloning SRAM library..." @[ -d $(SRAM_LIB_DIR) ] || \ git clone $(SRAM_LIB_GIT_REPO) $(SRAM_LIB_DIR) + @git -C $(SRAM_LIB_DIR) fetch @git -C $(SRAM_LIB_DIR) checkout $(SRAM_LIB_GIT_COMMIT) install: $(SRAM_LIB_DIR) From 699f7b311ee4879329f5f43152e8e746e9883821 Mon Sep 17 00:00:00 2001 From: mrg Date: Tue, 18 Jul 2023 10:58:04 -0700 Subject: [PATCH 3/6] Add DIRS back to Makefile so we can use targets without .ok extension. --- macros/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/macros/Makefile b/macros/Makefile index 58b7f09e..fed3bd58 100644 --- a/macros/Makefile +++ b/macros/Makefile @@ -28,6 +28,8 @@ ROM_SRCS=$(filter-out disabled-% %_common.py,$(sort $(notdir $(wildcard $(ROM_CO ROM_DIRS=$(basename $(ROM_SRCS)) ROM_STAMPS=$(addsuffix .ok,$(ROM_DIRS)) +DIRS=$(SRAM_DIRS) $(ROM_DIRS) + configs: @echo @echo "Using OpenRAM at $(OPENRAM_HOME)" From 3ef61a298ff55f1001e03d8469109d055afb079d Mon Sep 17 00:00:00 2001 From: vlsida-bot Date: Tue, 18 Jul 2023 22:18:17 +0000 Subject: [PATCH 4/6] Bump version: 1.2.20 -> 1.2.21 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 53fc08d6..9728bd69 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.20 +1.2.21 From 54c2710aea44ffc0b8dc285a2023d2a50ed5a01e Mon Sep 17 00:00:00 2001 From: mrg Date: Tue, 18 Jul 2023 15:45:15 -0700 Subject: [PATCH 5/6] Add OPENRAM_TMP back to macro Makefiles to save results. --- macros/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macros/Makefile b/macros/Makefile index fed3bd58..b50db045 100644 --- a/macros/Makefile +++ b/macros/Makefile @@ -82,12 +82,12 @@ sram: $(WORKING_SRAM_STAMPS) %.ok: sram_configs/%.py @echo "Building $*" @mkdir -p $* - @python3 -u $(SRAM_COMPILER) $(OPENRAM_OPTS) -o $* -p $(MACRO_DIR)/$* $(MACRO_DIR)/$< && touch $@ + @OPENRAM_TMP=$*/tmp python3 -u $(SRAM_COMPILER) $(OPENRAM_OPTS) -o $* -p $(MACRO_DIR)/$* $(MACRO_DIR)/$< && touch $@ %.ok: rom_configs/%.py @echo "Building $*" @mkdir -p $* - @python3 -u $(ROM_COMPILER) $(OPENRAM_OPTS) -o $* -p $(MACRO_DIR)/$* $(MACRO_DIR)/$< && touch $@ + @OPENRAM_TMP=$*/tmp python3 -u $(ROM_COMPILER) $(OPENRAM_OPTS) -o $* -p $(MACRO_DIR)/$* $(MACRO_DIR)/$< && touch $@ .DELETE_ON_ERROR: $(WORKING_SRAM_STAMPS) $(WORKING_ROM_STAMPS) From 5dbc22091ceb81cdf6136c213effc281dbb92da6 Mon Sep 17 00:00:00 2001 From: vlsida-bot Date: Wed, 19 Jul 2023 00:29:46 +0000 Subject: [PATCH 6/6] Bump version: 1.2.21 -> 1.2.22 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9728bd69..9a83513a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.21 +1.2.22