Commit 98311bbb authored by Colm Ryan's avatar Colm Ryan
Browse files

roll to Vivado 2016.1

parent 15a6ad49
......@@ -19,18 +19,18 @@ RUN apt-get update && apt-get install -y \
#Copy in Vivado installer and config file
# TODO: is there any way to save image size here?
ADD Xilinx_Vivado_SDK_2015.3_0929_1.tar.gz /
COPY install_config.txt /Xilinx_Vivado_SDK_2015.3_0929_1/
ADD Xilinx_Vivado_SDK_2016.1_0409_1.tar.gz /
COPY install_config.txt /Xilinx_Vivado_SDK_2016.1_0409_1/
#run the install
RUN /Xilinx_Vivado_SDK_2015.3_0929_1/xsetup --agree 3rdPartyEULA,WebTalkTerms,XilinxEULA --batch Install --config /Xilinx_Vivado_SDK_2015.3_0929_1/install_config.txt
RUN /Xilinx_Vivado_SDK_2016.1_0409_1/xsetup --agree 3rdPartyEULA,WebTalkTerms,XilinxEULA --batch Install --config /Xilinx_Vivado_SDK_2016.1_0409_1/install_config.txt
#make a Vivado user
RUN adduser --disabled-password --gecos '' vivado
USER vivado
WORKDIR /home/vivado
#add vivado tools to path
RUN echo "source /opt/Xilinx/Vivado/2015.3/settings64.sh" >> /home/vivado/.bashrc
RUN echo "source /opt/Xilinx/Vivado/2016.1/settings64.sh" >> /home/vivado/.bashrc
#copy in the license file
RUN mkdir /home/vivado/.Xilinx
......
......@@ -9,7 +9,7 @@ Vivado installed into a docker image for CI purposes.
2. Potentialy modify the `install_config.txt` to change the install options.
3. Build the image (will take about 10 minutes)
```shell
docker build -t caryan/vivado:2015.3 .
docker build -t caryan/vivado:2016.1 .
```
## Running
......
#### Vivado WebPACK Install Configuration ####
Edition=Vivado WebPACK
#### Vivado HL WebPACK Install Configuration ####
Edition=Vivado HL WebPACK
# Path where Xilinx software will be installed.
Destination=/opt/Xilinx
# Choose the Products/Devices the you would like to install.
Modules=Software Development Kit:0,DocNav:0,Zynq-7000:0,System Generator for DSP:0,Artix-7:1,Kintex-7:0
Modules=Software Development Kit (SDK):0,DocNav:0,Kintex UltraScale:0,Zynq-7000:1,System Generator for DSP:0,Artix-7:1,Kintex-7:0
# Choose the post install scripts you'd like to run as part of the finalization step. Please note that some of these scripts may require user interaction during runtime.
InstallOptions=Acquire or Manage a License Key:0,Enable WebTalk for SDK to send usage statistics to Xilinx:0
......
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