diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a43783ed..aa78eb910 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: - name: init mem and no ext mem run: make fpga-run BOARD=CYCLONEV-GT-DK INIT_MEM=1 USE_EXTMEM=0 - name: no init mem and ext mem - run: make -C ../iob_soc_V* fpga-run BOARD=CYCLONEV-GT-DK INIT_MEM=0 USE_EXTMEM=1 + run: make fpga-run BOARD=CYCLONEV-GT-DK INIT_MEM=0 USE_EXTMEM=1 aes-ku040: @@ -78,7 +78,7 @@ jobs: - name: init mem and no ext mem run: make fpga-run BOARD=AES-KU040-DB-G INIT_MEM=1 USE_EXTMEM=0 - name: no init mem and ext mem - run: make -C ../iob_soc_V* fpga-run BOARD=AES-KU040-DB-G INIT_MEM=0 USE_EXTMEM=1 + run: make fpga-run BOARD=AES-KU040-DB-G INIT_MEM=0 USE_EXTMEM=1 doc: runs-on: self-hosted diff --git a/document/doc_build.mk b/document/doc_build.mk index 9e40a5af4..caf49eb1c 100644 --- a/document/doc_build.mk +++ b/document/doc_build.mk @@ -14,13 +14,3 @@ INT_FAMILY ?=CYCLONEV-GT-DK #results for xilinx fpga XIL_FAMILY ?=AES-KU040-DB-G -#tests -TEST_LIST+=test1 -test1: pb.pdf - cat pb.aux >> test.log - -TEST_LIST+=test2 -test2: presentation.pdf - cat presentation.aux >> test.log - -.PHONY: $(TEST_LIST) diff --git a/document/tsrc/presentation.tex b/document/tsrc/presentation.tex index 240afa4b7..365ec02a9 100644 --- a/document/tsrc/presentation.tex +++ b/document/tsrc/presentation.tex @@ -32,7 +32,7 @@ \title[IOb-SoC Presentation]{IOb-SoC} \subtitle{Tutorial: Create a RISC-V-based System-on-Chip} \institute[IObundle Lda.]{IObundle Lda.} -\titlegraphic{\includegraphics[height=2.5cm]{\TEX/figures/Logo.png}} +\titlegraphic{\includegraphics[height=2.5cm]{figures/Logo.png}} %\author[José T. de Sousa]{Jos\'e T. de Sousa} %\institute[IObundle Lda]{IObundle Lda} \date{\today} @@ -52,7 +52,7 @@ \end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%% -\logo{\includegraphics[scale=0.2]{\TEX/figures/Logo.png}~% +\logo{\includegraphics[scale=0.2]{figures/Logo.png}~% } %%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/software/sw_build.mk b/software/sw_build.mk index b8be33db9..c6ad70a99 100644 --- a/software/sw_build.mk +++ b/software/sw_build.mk @@ -79,11 +79,3 @@ EMUL_SRC+=src/iob_str.c # PERIPHERAL SOURCES EMUL_SRC+=$(wildcard src/iob-*.c) -EMUL_TEST_LIST+=pcemul_test1 -pcemul_test1: - make run_emul TEST_LOG="> test.log" - - -CLEAN_LIST+=clean1 -clean1: - @rm -rf iob_soc_conf.h diff --git a/submodules/LIB b/submodules/LIB index 6ca514807..51e5bd312 160000 --- a/submodules/LIB +++ b/submodules/LIB @@ -1 +1 @@ -Subproject commit 6ca5148077eaccdfc6f304780bf609de5c9f3061 +Subproject commit 51e5bd3121aae14e52a82dd64cf24398d3abdced