Skip to content

Commit

Permalink
Merge branch 'esl-epfl:main' into dma-broadcast
Browse files Browse the repository at this point in the history
  • Loading branch information
grinningmosfet authored Nov 1, 2023
2 parents cc3579f + 0b8d3c6 commit 2a8ed5d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ MAKE = make

# Get the absolute path
mkfile_path := $(shell dirname "$(realpath $(firstword $(MAKEFILE_LIST)))")
$(info $$You are executing from: $(mkfile_path))

# Include the self-documenting tool
FILE=$(mkfile_path)/Makefile
Expand Down Expand Up @@ -49,14 +50,17 @@ COMPILER_PREFIX ?= riscv32-unknown-
ARCH ?= rv32imc

# Path relative from the location of sw/Makefile from which to fetch source files. The directory of that file is the default value.
SOURCE ?= "."
SOURCE ?= $(".")

# Simulation engines options are verilator (default) and questasim
SIMULATOR ?= verilator

# Timeout for simulation, default 120
TIMEOUT ?= 120

# Export variables to sub-makefiles
export

## @section Conda
conda: environment.yml
conda env create -f environment.yml
Expand Down Expand Up @@ -175,7 +179,7 @@ run-helloworld: mcu-gen verilator-sim
## Uses verilator to simulate the HW model and run the FW
## UART Dumping in uart0.log to show recollected results
run-blinkyfreertos: mcu-gen verilator-sim
$(MAKE) -C sw PROJECT=blinky_freertos TARGET=$(TARGET) LINKER=$(LINKER) COMPILER=$(COMPILER) COMPILER_PREFIX=$(COMPILER_PREFIX) ARCH=$(ARCH);
$(MAKE) -C sw PROJECT=example_freertos_blinky TARGET=$(TARGET) LINKER=$(LINKER) COMPILER=$(COMPILER) COMPILER_PREFIX=$(COMPILER_PREFIX) ARCH=$(ARCH);
cd ./build/openhwgroup.org_systems_core-v-mini-mcu_0/sim-verilator; \
./Vtestharness +firmware=../../../sw/build/main.hex; \
cat uart0.log; \
Expand Down
7 changes: 5 additions & 2 deletions sw/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ COMPILER_PREFIX ?= riscv32-unknown-
ARCH ?= rv32imc

# Path relative from the location of sw/Makefile from which to fetch source files. The directory of that file is the default value.
SOURCE ?= "."
SOURCE ?= $(".")

# riscv toolchain install path
RISCV ?= ~/.riscv
Expand All @@ -56,7 +56,7 @@ source_path := $(realpath $(mkfile_path)/$(SOURCE))
$(info $$You are fetching sources from $(source_path) )


SOURCE_PATH = $(source_path)/
SOURCE_PATH = $(source_path)/
ROOT_PROJECT = $(mkfile_path)/
INC_FOLDERS = $(mkfile_path)/device/target/$(TARGET)/
LINK_FOLDER = $(mkfile_path)/linker
Expand All @@ -70,6 +70,9 @@ else
CMAKE=cmake3
endif

# Export variables to sub-makefiles
export

# Let's CMake!
include cmake/targets.mak

Expand Down

0 comments on commit 2a8ed5d

Please sign in to comment.