Commit 3dba8dd6 authored by Andrey Filippov's avatar Andrey Filippov

Split installation parameters, added copying primitives library to local

project directory
parent 52ced914
...@@ -35,6 +35,11 @@ ...@@ -35,6 +35,11 @@
<menu name="Vivado" <menu name="Vivado"
label="Vivado Tools" label="Vivado Tools"
icon="xilinx.png"> icon="xilinx.png">
<menuitem name="CopyUnisims"
label="Copy Xilinx primitives library to the local project"
icon="xilinx.png"
call="VivadoUnisims"/>
<menuitem name="Vivado Server" <menuitem name="Vivado Server"
label="Run remote Vivado session" label="Run remote Vivado session"
icon="xilinx.png" icon="xilinx.png"
......
...@@ -29,9 +29,34 @@ ...@@ -29,9 +29,34 @@
<parameter id="SSHSwitches" label="Other ssh switches" <parameter id="SSHSwitches" label="Other ssh switches"
type="String" format="CopyValue" default="" readonly="false" visible="true" /> type="String" format="CopyValue" default="" readonly="false" visible="true" />
<parameter id="VivadoRelease" label="Vivado release number (part of the path)"
type="String" format="CopyValue" default="2013.4" readonly="false"
visible="true" />
<parameter id="VivadoInstallationRoot" label="Vivado Installation Root"
type="String" format="CopyValue" default="/opt/Xilinx/Vivado" readonly="false"
visible="true" />
<parameter id="VivadoRelativeExeOptions" label="Vivado relative executable path and options"
type="String" format="CopyValue" default="bin/vivado -mode tcl" readonly="false"
visible="true" />
<parameter id="VivadoUnisimsPath" label="Relative location of Xilinx unisims library"
type="String" format="CopyValue" default="data/verilog/src" readonly="false"
visible="true" />
<!-- /opt/Xilinx/Vivado/2013.4/bin/vivado -mode tcl -->
<parameter id="RemoteCommand" label="Remote ssh command" <parameter id="RemoteCommand" label="Remote ssh command"
type="String" format="CopyValue" default="/opt/Xilinx/Vivado/2013.4/bin/vivado -mode tcl" readonly="false" type="String" format="CopyValue"
default="%VivadoInstallationRoot/%VivadoRelease/%VivadoRelativeExeOptions"
readonly="true"
visible="true" />
<parameter id="VivadoUnisimsAbsolutePath" label="Full path of Xilinx unisims primitives library"
type="String" format="CopyValue"
default="%VivadoInstallationRoot/%VivadoRelease/%VivadoUnisimsPath"
readonly="true"
visible="true" /> visible="true" />
<parameter id="SSHExtra" label="ssh extra parameters" type="String" <parameter id="SSHExtra" label="ssh extra parameters" type="String"
format="CopyValue" default="" readonly="false" visible="true" /> format="CopyValue" default="" readonly="false" visible="true" />
...@@ -51,9 +76,14 @@ ...@@ -51,9 +76,14 @@
"ShellSwitches" "ShellSwitches"
"PreSSH" "PreSSH"
"SSHSwitches" "SSHSwitches"
"RemoteCommand"
"SSHExtra" "SSHExtra"
"VivadoConsole" "VivadoConsole"
"VivadoRelease"
"VivadoInstallationRoot"
"VivadoRelativeExeOptions"
"VivadoUnisimsPath"
"RemoteCommand"
"VivadoUnisimsAbsolutePath"
</group> </group>
</input> </input>
...@@ -65,14 +95,17 @@ ...@@ -65,14 +95,17 @@
interface="FPGAPprojectInterface"> interface="FPGAPprojectInterface">
<!-- Simulation parameters --> <!-- Simulation parameters -->
<parameter id="SimulationTopFile" label="Project top simulation file" <parameter id="SimulationTopFile" label="Project top simulation file"
type="Filename" default="default_top (testing)" format="CopyValue" type="Filename" default="" format="CopyValue"
readonly="false" /> readonly="false" />
<parameter id="SimulationTopModule" label="Project top simulation module" <parameter id="SimulationTopModule" label="Project top simulation module"
type="String" default="" format="CopyValue" readonly="false" /> type="String" default="" format="CopyValue" readonly="false" />
<parameter id="ImplementationTopFile" label="Project file with top implementation module"
type="Filename" default="" format="CopyValue" readonly="false" />
<parameter id="SimulDir" label="project simulation directory" <parameter id="SimulDir" label="project simulation directory"
type="Pathname" default="simulation" format="CopyValue" readonly="false" /> type="Pathname" default="simulation" format="CopyValue" readonly="false" />
<!-- Vivado parameters --> <!-- Vivado parameters -->
<parameter id="part" label= "Xilinx device to use"
default="" visible="true" omit="" type="String" format="Dash"/>
<parameter id="VivadoProjectRoot" label="Relative (to user home directory) path of the workspace on Vivado server" <parameter id="VivadoProjectRoot" label="Relative (to user home directory) path of the workspace on Vivado server"
type="String" default="vdt" format="RemoteRootSyntax" readonly="false" /> type="String" default="vdt" format="RemoteRootSyntax" readonly="false" />
...@@ -102,9 +135,11 @@ ...@@ -102,9 +135,11 @@
<group name="Simulation" label="Simulation properties"> <group name="Simulation" label="Simulation properties">
"SimulationTopFile" "SimulationTopFile"
"SimulationTopModule" "SimulationTopModule"
"ImplementationTopFile"
"SimulDir" "SimulDir"
</group> </group>
<group name="Vivado" label="Vivado general properties"> <group name="Vivado" label="Vivado general properties">
"part"
"VivadoProjectRoot" "VivadoProjectRoot"
"VivadoLocalDir" "VivadoLocalDir"
"VivadoIgnoreSource" "VivadoIgnoreSource"
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</input> </input>
<output> <output>
<line name="vivado_launch" <line name="Vivado"
interrupt="\x03"> interrupt="\x03">
"%ShellSwitches" "%ShellSwitches"
"%PreSSH" "%PreSSH"
......
This diff is collapsed.
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