Skip to content

Commit

Permalink
Merge pull request IObundle#128 from P-Miranda/build-lib
Browse files Browse the repository at this point in the history
Update LIB submodule, remove FPGA and DOC flows, working with build-lib
  • Loading branch information
jjts authored Aug 3, 2022
2 parents 5be2c5f + 027596f commit fa29a6f
Show file tree
Hide file tree
Showing 41 changed files with 77 additions and 674 deletions.
37 changes: 2 additions & 35 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,39 +30,6 @@ jobs:
with:
submodules: 'recursive'
- name: test-clean
run: make test-clean
run: make setup
- name: test-sim
run: make test-sim

fpga:
runs-on: self-hosted
timeout-minutes: 30
# always run, except when previous job was cancelled
if: ${{ !cancelled() }}
# run after indicated job
needs: sim

steps:
- uses: actions/checkout@v3
with:
submodules: 'recursive'
- name: test-clean
run: make test-clean
- name: test-fpga
run: make test-fpga
doc:
runs-on: self-hosted
timeout-minutes: 30
# always run, except when previous job was cancelled
if: ${{ !cancelled() }}
# run after indicated job
needs: fpga

steps:
- uses: actions/checkout@v3
with:
submodules: 'recursive'
- name: test-clean
run: make test-clean
- name: test-doc
run: make test-doc
run: make -C iob_uart_V0.10/ sim-test
110 changes: 7 additions & 103 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,109 +1,13 @@
UART_DIR:=.
include config.mk
LIB_DIR=submodules/LIB

#
# SIMULATE
#
VCD ?=0

sim:
make -C $(SIM_DIR) run

sim-test:
make -C $(SIM_DIR) test

sim-clean:
make -C $(SIM_DIR) clean-all

#
# FPGA COMPILE
#

fpga-build:
make -C $(FPGA_DIR) build

fpga-build-all:
$(foreach s, $(FPGA_FAMILY_LIST), make fpga-build FPGA_FAMILY=$s;)

fpga-test:
make -C $(FPGA_DIR) test

fpga-clean:
make -C $(FPGA_DIR) clean-all

fpga-clean-all:
$(foreach s, $(FPGA_FAMILY_LIST), make fpga-clean FPGA_FAMILY=$s;)


#
# DOCUMENT
#

doc-build:
make -C $(DOC_DIR) $(DOC).pdf

doc-build-all:
$(foreach s, $(DOC_LIST), make doc-build DOC=$s;)

doc-test:
make -C $(DOC_DIR) test

doc-clean:
make -C $(DOC_DIR) clean

doc-clean-all:
$(foreach s, $(DOC_LIST), make doc-clean DOC=$s;)


#
# TEST ON SIMULATORS AND BOARDS
#

test-sim:
make sim-test

test-sim-clean:
make sim-clean

test-fpga:
make fpga-test FPGA_FAMILY=CYCLONEV-GT
make fpga-test FPGA_FAMILY=XCKU

test-fpga-clean:
make fpga-clean FPGA_FAMILY=CYCLONEV-GT
make fpga-clean FPGA_FAMILY=XCKU

test-doc:
make doc-test DOC=pb
make doc-test DOC=ug

test-doc-clean:
make doc-clean DOC=pb
make doc-clean DOC=ug

test: test-clean test-sim test-fpga test-doc

test-clean: test-sim-clean test-fpga-clean test-doc-clean

#
# CLEAN ALL
#

clean-all: uart-gen-clean sim-clean fpga-clean-all doc-clean-all
setup:
make -C $(LIB_DIR) $@

clean:
make -C $(LIB_DIR) $@

debug:
@echo $(SIM_DIR)
@echo $(FPGA_DIR)
@echo $(DOC_DIR)

.PHONY: sim sim-test sim-clean \
fpga-build fpga-build-all fpga-test fpga-clean fpga-clean-all \
doc-build doc-build-all doc-test doc-clean doc-clean-all \
test-sim test-sim-clean \
test-fpga test-fpga-clean \
test-doc test-doc-clean \
test test-clean \
clean-all debug
make -C $(LIB_DIR) $@


.PHONY: setup clean debug
41 changes: 0 additions & 41 deletions config.mk

This file was deleted.

6 changes: 0 additions & 6 deletions document/benefits.tex

This file was deleted.

9 changes: 0 additions & 9 deletions document/deliverables.tex

This file was deleted.

32 changes: 0 additions & 32 deletions document/document.mk

This file was deleted.

18 changes: 0 additions & 18 deletions document/features.tex

This file was deleted.

Binary file removed document/figures/bd.odg
Binary file not shown.
Binary file removed document/figures/inst.odg
Binary file not shown.
Binary file removed document/figures/symb.odg
Binary file not shown.
Binary file removed document/figures/tbbd.odg
Binary file not shown.
9 changes: 0 additions & 9 deletions document/intro.tex

This file was deleted.

9 changes: 0 additions & 9 deletions document/pb/Makefile

This file was deleted.

Binary file removed document/pb/pb.pdf
Binary file not shown.
24 changes: 0 additions & 24 deletions document/pb/test.expected

This file was deleted.

7 changes: 0 additions & 7 deletions document/title.tex

This file was deleted.

13 changes: 0 additions & 13 deletions document/ug/Makefile

This file was deleted.

47 changes: 0 additions & 47 deletions document/ug/if.tex

This file was deleted.

10 changes: 0 additions & 10 deletions document/ug/inst.tex

This file was deleted.

1 change: 0 additions & 1 deletion document/ug/revhist.tex

This file was deleted.

Loading

0 comments on commit fa29a6f

Please sign in to comment.