Skip to content

Commit 64099be

Browse files
committed
make from FRIGATE_ROOT
Signed-off-by: Kareem Farid <kareefardi@users.noreply.github.com>
1 parent f7012a2 commit 64099be

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

.github/actions/setup-dependencies/action.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ inputs:
55
required: false
66
type: boolean
77
default: false
8-
github-token:
9-
required: true
10-
type: string
118
runs:
129
using: "composite"
1310
steps:
@@ -18,7 +15,6 @@ runs:
1815
echo "FRIGATE_ROOT=$(make echo-var VAR=FRIGATE_ROOT)" >> $GITHUB_ENV
1916
echo "MGMT_ROOT=$(make echo-var VAR=MGMT_ROOT)" >> $GITHUB_ENV
2017
echo "PDK_ROOT=$(make echo-var VAR=PDK_ROOT)" >> $GITHUB_ENV
21-
echo "IPM_ROOT=$HOME/.ipm" >> $GITHUB_ENV
2218
echo "PDK=sky130A" >> $GITHUB_ENV
2319
echo "FRIGATE_BRANCH=$(make echo-var VAR=FRIGATE_BRANCH)" >> $GITHUB_ENV
2420
echo "MGMT_BRANCH=$(make echo-var VAR=MGMT_BRANCH)" >> $GITHUB_ENV
@@ -55,17 +51,17 @@ runs:
5551
shell: bash
5652
if: ${{ steps.cache-mgmt.outputs.cache-hit != 'true' && inputs.cache-only != 'true' }}
5753
run: |
58-
make install-mcw
54+
make -C {{env.FRIGATE_ROOT }} install-mcw
5955
cd ${{ env.MGMT_ROOT }}
6056
rm -rf maglef def openlane scripts signoff spi LICENSE manifest docs lib litex lvs .git .githooks .github .travisCI docs lib spef xschem .gitignore .readthedocs.yml .travis.yml README.rst README.src.rst
6157
- name: Download PANAMAX
6258
shell: bash
6359
run: |
64-
make install-panamax
60+
make -C {{env.FRIGATE_ROOT }} install-panamax
6561
- name: Download analog
6662
shell: bash
6763
run: |
68-
make install-analog
64+
make -C {{env.FRIGATE_ROOT }} install-analog
6965
- name: Download PDK
7066
shell: bash
7167
if: ${{ steps.cache-pdk.outputs.cache-hit != 'true' && inputs.cache-only != 'true' }}

Makefile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,17 @@ setup-cocotb-env:
111111

112112
.PHONY: cocotb-verify-all-rtl
113113
cocotb-verify-all-rtl:
114-
@(cd $(PROJECT_ROOT)/verilog/dv/cocotb && $(PROJECT_ROOT)/venv-cocotb/bin/caravel_cocotb -tl user_proj_tests/user_proj_tests.yaml --CI )
114+
@(cd $(PROJECT_ROOT)/verilog/dv/cocotb && $(PROJECT_ROOT)/venv-cocotb/bin/caravel_cocotb -tl user_proj_tests/user_proj_tests.yaml $(COCOTB_ARGS) )
115115

116116
.PHONY: cocotb-verify-all-gl
117117
cocotb-verify-all-gl:
118-
@(cd $(PROJECT_ROOT)/verilog/dv/cocotb && $(PROJECT_ROOT)/venv-cocotb/bin/caravel_cocotb -tl user_proj_tests/user_proj_tests_gl.yaml -sim GL --CI)
118+
@(cd $(PROJECT_ROOT)/verilog/dv/cocotb && $(PROJECT_ROOT)/venv-cocotb/bin/caravel_cocotb -tl user_proj_tests/user_proj_tests_gl.yaml -sim GL $(COCOTB_ARGS))
119119

120120
$(cocotb-dv-targets-rtl): cocotb-verify-%-rtl:
121-
@(cd $(PROJECT_ROOT)/verilog/dv/cocotb && $(PROJECT_ROOT)/venv-cocotb/bin/caravel_cocotb -t $* --CI)
121+
@(cd $(PROJECT_ROOT)/verilog/dv/cocotb && $(PROJECT_ROOT)/venv-cocotb/bin/caravel_cocotb -t $* $(COCOTB_ARGS))
122122

123123
$(cocotb-dv-targets-gl): cocotb-verify-%-gl:
124-
@(cd $(PROJECT_ROOT)/verilog/dv/cocotb && $(PROJECT_ROOT)/venv-cocotb/bin/caravel_cocotb -t $* -sim GL --CI)
124+
@(cd $(PROJECT_ROOT)/verilog/dv/cocotb && $(PROJECT_ROOT)/venv-cocotb/bin/caravel_cocotb -t $* -sim GL $(COCOTB_ARGS))
125125

126126
# Install cocotb docker
127127
.PHONY: simenv-cocotb
@@ -223,6 +223,11 @@ endif
223223
.PHONY: harden
224224
harden: $(designs)
225225

226+
.PHONY: echo-var
227+
echo-var:
228+
@echo $($(VAR))
229+
230+
226231
.PHONY: clean
227232
clean:
228233
rm -rf dependencies

0 commit comments

Comments
 (0)