luke
/
OpenRAM
mirror of https://github.com/VLSIDA/OpenRAM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into STA-refactor

This commit is contained in:
Sam Crow 2023-07-19 12:19:28 -07:00
parent 2ced895b32 5dbc22091c
commit b30dfa03e7
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -97,6 +97,7 @@ $(SRAM_LIB_DIR): check-pdk-root
@echo "Cloning SRAM library..." @echo "Cloning SRAM library..."
@[ -d $(SRAM_LIB_DIR) ] || \ @[ -d $(SRAM_LIB_DIR) ] || \
git clone $(SRAM_LIB_GIT_REPO) $(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) @git -C $(SRAM_LIB_DIR) checkout $(SRAM_LIB_GIT_COMMIT)
install: $(SRAM_LIB_DIR) install: $(SRAM_LIB_DIR)

2
VERSION
View File

@ -1 +1 @@
1.2.19 1.2.22

6
macros/Makefile
View File

@ -28,6 +28,8 @@ ROM_SRCS=$(filter-out disabled-% %_common.py,$(sort $(notdir $(wildcard $(ROM_CO
ROM_DIRS=$(basename $(ROM_SRCS)) ROM_DIRS=$(basename $(ROM_SRCS))
ROM_STAMPS=$(addsuffix .ok,$(ROM_DIRS)) ROM_STAMPS=$(addsuffix .ok,$(ROM_DIRS))
DIRS=$(SRAM_DIRS) $(ROM_DIRS)
configs: configs:
@echo @echo
@echo "Using OpenRAM at $(OPENRAM_HOME)" @echo "Using OpenRAM at $(OPENRAM_HOME)"
@ -80,12 +82,12 @@ sram: $(WORKING_SRAM_STAMPS)
%.ok: sram_configs/%.py %.ok: sram_configs/%.py
@echo "Building $*" @echo "Building $*"
@mkdir -p $* @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 %.ok: rom_configs/%.py
@echo "Building $*" @echo "Building $*"
@mkdir -p $* @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) .DELETE_ON_ERROR: $(WORKING_SRAM_STAMPS) $(WORKING_ROM_STAMPS)