Merge pull request #452 from d-m-bailey/override-mcw-tag

Changes to fix mpw-9 failures
This commit is contained in:
Jeff DiCorpo 2023-06-14 08:01:05 -07:00 committed by GitHub
commit 59e29ac40b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions

View File

@ -31,12 +31,18 @@ SPLIT_FILES := $(shell find . -type f -name "*.$(ARCHIVE_EXT).00.split")
SPLIT_FILES_SOURCES := $(basename $(basename $(basename $(SPLIT_FILES)))) SPLIT_FILES_SOURCES := $(basename $(basename $(basename $(SPLIT_FILES))))
# Needed to uncompress the existing archives # Needed to uncompress the existing archives
ARCHIVES := $(shell find . -type f -not -path "./signoff/*" -not -path "./mgmt_core_wrapper/signoff/*" -name "*.$(ARCHIVE_EXT)") ARCHIVES := $(shell find . -type f -not -path "*/signoff/*" -name "*.$(ARCHIVE_EXT)")
ARCHIVE_SOURCES := $(basename $(ARCHIVES)) ARCHIVE_SOURCES := $(basename $(ARCHIVES))
# Needed to compress and split files/archives that are too large # Needed to compress and split files/archives that are too large
LARGE_FILES := $(shell find ./gds -type f -name "*.gds") LARGE_FILES := $(shell find ./gds -type f -name "*.gds")
LARGE_FILES += $(shell find . -type f -size +$(FILE_SIZE_LIMIT_MB)M -not -path "./signoff/*" -not -path "./mgmt_core_wrapper/signoff/*" -not -path "./.git/*" -not -path "./*/.git/*" -not -path "./gds/*" -not -path "./tapeout/outputs/oas/*" -not -path "./openlane/*") LARGE_FILES += $(shell find . -type f -size +$(FILE_SIZE_LIMIT_MB)M \
-not -path "*/signoff/*" \
-not -path "*/.git/*" \
-not -path "./gds/*" \
-not -path "./tapeout/outputs/oas/*" \
-not -path "*/openlane/*" \
-not -name "*.$(ARCHIVE_EXT)")
LARGE_FILES_GZ := $(addsuffix .$(ARCHIVE_EXT), $(LARGE_FILES)) LARGE_FILES_GZ := $(addsuffix .$(ARCHIVE_EXT), $(LARGE_FILES))
LARGE_FILES_GZ_SPLIT := $(addsuffix .$(ARCHIVE_EXT).00.split, $(LARGE_FILES)) LARGE_FILES_GZ_SPLIT := $(addsuffix .$(ARCHIVE_EXT).00.split, $(LARGE_FILES))
# consider splitting existing archives # consider splitting existing archives
@ -57,11 +63,11 @@ MCW_LITE?=1
ifeq ($(MCW),LITEX_VEXRISCV) ifeq ($(MCW),LITEX_VEXRISCV)
MCW_NAME := mcw-litex-vexriscv MCW_NAME := mcw-litex-vexriscv
MCW_REPO := https://github.com/efabless/caravel_mgmt_soc_litex MCW_REPO := https://github.com/efabless/caravel_mgmt_soc_litex
MCW_TAG := $(MPW_TAG) MCW_TAG ?= $(MPW_TAG)
else else
MCW_NAME := mcw-pico MCW_NAME := mcw-pico
MCW_REPO := https://github.com/efabless/caravel_pico MCW_REPO := https://github.com/efabless/caravel_pico
MCW_TAG := $(MPW_TAG) MCW_TAG ?= $(MPW_TAG)
endif endif
# Install caravel as submodule, (1): submodule, (0): clone # Install caravel as submodule, (1): submodule, (0): clone