Commit dfe01116 authored by Alén Arias Vázquez's avatar Alén Arias Vázquez 😎

added to makefile option to build the docker, complete readme

parent 854a2134
Pipeline #3734 passed with stages
in 101 minutes and 35 seconds
...@@ -2,11 +2,15 @@ ...@@ -2,11 +2,15 @@
# ############################################################################## # ##############################################################################
# Settings # Settings
DOCKER_NAME=vivado DOCKER_NAME=vivado
DOCKERFILE_PATH=docker
XILINX_TOOLS=/opt/Xilinx XILINX_TOOLS=/opt/Xilinx
XIL_VER?=2019.2 XIL_VER?=2019.2
SETUP_XIL_ENV=source ${XILINX_TOOLS}/Vivado/${XIL_VER}/settings64.sh SETUP_XIL_ENV=source ${XILINX_TOOLS}/Vivado/${XIL_VER}/settings64.sh
CALL_VIVADO_DEF=vivado -source build_project.tcl -mode batch -nolog -nojournal -notrace -tclargs CALL_VIVADO_DEF=vivado -source build_project.tcl -mode batch -nolog -nojournal -notrace -tclargs
docker_build:
docker build -f ${DOCKERFILE_PATH}/Dockerfile -t ${DOCKER_NAME} ${DOCKERFILE_PATH}
CALL_DOCKER?=docker run -w${CURDIR} \ CALL_DOCKER?=docker run -w${CURDIR} \
-v${CURDIR}:${CURDIR} \ -v${CURDIR}:${CURDIR} \
-v ${HOME}:${HOME} \ -v ${HOME}:${HOME} \
......
...@@ -25,10 +25,24 @@ Unfortunately Windows is not supported yet ...@@ -25,10 +25,24 @@ Unfortunately Windows is not supported yet
## Build Container ## Build Container
```console ```console
sudo chmod 777 docker/Dockerbuild.sh make docker_build
cd docker && sh Dockerbuild.sh
``` ```
## Build Design
- Build bitstream:
```console
make <project>.build
```
- Build just the block design:
```console
make <project>.bd
```
In both cases the project options are:
- diot_v1
- diot_v2
## Maintainers ## Maintainers
- [Alén Arias Vázquez](mailto:alen.arias.vazquez@cern.ch) - [Alén Arias Vázquez](mailto:alen.arias.vazquez@cern.ch)
- [Greg Daniluk](mailto:grzegorz.daniluk@cern.ch) - [Greg Daniluk](mailto:grzegorz.daniluk@cern.ch)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment