From 6ac8234a1a9bf26ae3a632b0bd8d94e590eb9f80 Mon Sep 17 00:00:00 2001
From: Leon Hiemstra <hiemstra@astron.nl>
Date: Thu, 8 Jan 2015 14:54:55 +0000
Subject: [PATCH]  updated to quartus 14.1

---
 .../flash/asmi_parallel/compile_ip.tcl        |   6 +-
 .../ip_arria10/flash/asmi_parallel/hdllib.cfg |   2 +-
 .../ip_arria10_asmi_parallel.qsys             | 126 ++++++++++--------
 .../flash/remote_update/compile_ip.tcl        |   4 +-
 .../ip_arria10/flash/remote_update/hdllib.cfg |   2 +-
 .../ip_arria10_remote_update.qsys             |  80 ++++++-----
 6 files changed, 121 insertions(+), 99 deletions(-)

diff --git a/libraries/technology/ip_arria10/flash/asmi_parallel/compile_ip.tcl b/libraries/technology/ip_arria10/flash/asmi_parallel/compile_ip.tcl
index 857812ee28..58e9715033 100644
--- a/libraries/technology/ip_arria10/flash/asmi_parallel/compile_ip.tcl
+++ b/libraries/technology/ip_arria10/flash/asmi_parallel/compile_ip.tcl
@@ -28,7 +28,7 @@
 
 set IP_DIR   "$env(RADIOHDL)/libraries/technology/ip_arria10/flash/asmi_parallel/generated/sim"
 
-vmap ip_arria10_asmi_parallel_altera_asmi_parallel_140 ./work/
+vmap ip_arria10_asmi_parallel_altera_asmi_parallel_141 ./work/
 
-vlog "$IP_DIR/../altera_asmi_parallel_140/sim/ip_arria10_asmi_parallel_altera_asmi_parallel_140_o6bwnxy.v" -work ip_arria10_asmi_parallel_altera_asmi_parallel_140
-vcom "$IP_DIR/ip_arria10_asmi_parallel.vhd"                                                                                                                       
+vcom "$IP_DIR/../altera_asmi_parallel_141/sim/ip_arria10_asmi_parallel_altera_asmi_parallel_141_miexaoi.vhd" -work ip_arria10_asmi_parallel_altera_asmi_parallel_141
+vcom "$IP_DIR/ip_arria10_asmi_parallel.vhd"
diff --git a/libraries/technology/ip_arria10/flash/asmi_parallel/hdllib.cfg b/libraries/technology/ip_arria10/flash/asmi_parallel/hdllib.cfg
index 4498816f43..5228427403 100644
--- a/libraries/technology/ip_arria10/flash/asmi_parallel/hdllib.cfg
+++ b/libraries/technology/ip_arria10/flash/asmi_parallel/hdllib.cfg
@@ -1,5 +1,5 @@
 hdl_lib_name = ip_arria10_asmi_parallel
-hdl_library_clause_name = ip_arria10_asmi_parallel_altera_asmi_parallel_140
+hdl_library_clause_name = ip_arria10_asmi_parallel_altera_asmi_parallel_141
 hdl_lib_uses = 
 hdl_lib_technology = ip_arria10
 
diff --git a/libraries/technology/ip_arria10/flash/asmi_parallel/ip_arria10_asmi_parallel.qsys b/libraries/technology/ip_arria10/flash/asmi_parallel/ip_arria10_asmi_parallel.qsys
index 0a4e09369d..b2d574199c 100644
--- a/libraries/technology/ip_arria10/flash/asmi_parallel/ip_arria10_asmi_parallel.qsys
+++ b/libraries/technology/ip_arria10/flash/asmi_parallel/ip_arria10_asmi_parallel.qsys
@@ -11,6 +11,11 @@
 {
    element $${FILENAME}
    {
+      datum _originalDeviceFamily
+      {
+         value = "Arria 10";
+         type = "String";
+      }
    }
    element asmi_parallel_0
    {
@@ -40,34 +45,15 @@
  <parameter name="timeStamp" value="0" />
  <parameter name="useTestBenchNamingPattern" value="false" />
  <instanceScript></instanceScript>
- <interface name="clkin" internal="asmi_parallel_0.clkin" type="clock" dir="end">
-  <port name="clkin" internal="clkin" />
- </interface>
- <interface name="read" internal="asmi_parallel_0.read" type="conduit" dir="end">
-  <port name="read" internal="read" />
- </interface>
- <interface name="rden" internal="asmi_parallel_0.rden" type="conduit" dir="end">
-  <port name="rden" internal="rden" />
- </interface>
  <interface name="addr" internal="asmi_parallel_0.addr" type="conduit" dir="end">
   <port name="addr" internal="addr" />
  </interface>
- <interface name="reset" internal="asmi_parallel_0.reset" type="reset" dir="end">
-  <port name="reset" internal="reset" />
- </interface>
- <interface name="sce" internal="asmi_parallel_0.sce" type="conduit" dir="end">
-  <port name="sce" internal="sce" />
- </interface>
- <interface
-   name="dataout"
-   internal="asmi_parallel_0.dataout"
-   type="conduit"
-   dir="end">
-  <port name="dataout" internal="dataout" />
- </interface>
  <interface name="busy" internal="asmi_parallel_0.busy" type="conduit" dir="end">
   <port name="busy" internal="busy" />
  </interface>
+ <interface name="clkin" internal="asmi_parallel_0.clkin" type="clock" dir="end">
+  <port name="clkin" internal="clkin" />
+ </interface>
  <interface
    name="data_valid"
    internal="asmi_parallel_0.data_valid"
@@ -75,9 +61,21 @@
    dir="end">
   <port name="data_valid" internal="data_valid" />
  </interface>
- <interface name="wren" internal="asmi_parallel_0.wren" type="conduit" dir="end">
-  <port name="wren" internal="wren" />
+ <interface
+   name="datain"
+   internal="asmi_parallel_0.datain"
+   type="conduit"
+   dir="end">
+  <port name="datain" internal="datain" />
+ </interface>
+ <interface
+   name="dataout"
+   internal="asmi_parallel_0.dataout"
+   type="conduit"
+   dir="end">
+  <port name="dataout" internal="dataout" />
  </interface>
+ <interface name="die_erase" internal="asmi_parallel_0.die_erase" />
  <interface
    name="en4b_addr"
    internal="asmi_parallel_0.en4b_addr"
@@ -85,19 +83,20 @@
    dir="end">
   <port name="en4b_addr" internal="en4b_addr" />
  </interface>
+ <interface name="ex4b_addr" internal="asmi_parallel_0.ex4b_addr" />
  <interface
-   name="write"
-   internal="asmi_parallel_0.write"
+   name="fast_read"
+   internal="asmi_parallel_0.fast_read"
    type="conduit"
    dir="end">
-  <port name="write" internal="write" />
+  <port name="fast_read" internal="fast_read" />
  </interface>
  <interface
-   name="datain"
-   internal="asmi_parallel_0.datain"
+   name="illegal_erase"
+   internal="asmi_parallel_0.illegal_erase"
    type="conduit"
    dir="end">
-  <port name="datain" internal="datain" />
+  <port name="illegal_erase" internal="illegal_erase" />
  </interface>
  <interface
    name="illegal_write"
@@ -106,6 +105,16 @@
    dir="end">
   <port name="illegal_write" internal="illegal_write" />
  </interface>
+ <interface name="rden" internal="asmi_parallel_0.rden" type="conduit" dir="end">
+  <port name="rden" internal="rden" />
+ </interface>
+ <interface name="read" internal="asmi_parallel_0.read" />
+ <interface name="reset" internal="asmi_parallel_0.reset" type="reset" dir="end">
+  <port name="reset" internal="reset" />
+ </interface>
+ <interface name="sce" internal="asmi_parallel_0.sce" type="conduit" dir="end">
+  <port name="sce" internal="sce" />
+ </interface>
  <interface
    name="sector_erase"
    internal="asmi_parallel_0.sector_erase"
@@ -114,54 +123,55 @@
   <port name="sector_erase" internal="sector_erase" />
  </interface>
  <interface
-   name="illegal_erase"
-   internal="asmi_parallel_0.illegal_erase"
+   name="shift_bytes"
+   internal="asmi_parallel_0.shift_bytes"
    type="conduit"
    dir="end">
-  <port name="illegal_erase" internal="illegal_erase" />
+  <port name="shift_bytes" internal="shift_bytes" />
+ </interface>
+ <interface name="wren" internal="asmi_parallel_0.wren" type="conduit" dir="end">
+  <port name="wren" internal="wren" />
  </interface>
- <interface name="ex4b_addr" internal="asmi_parallel_0.ex4b_addr" />
- <interface name="die_erase" internal="asmi_parallel_0.die_erase" />
  <interface
-   name="shift_bytes"
-   internal="asmi_parallel_0.shift_bytes"
+   name="write"
+   internal="asmi_parallel_0.write"
    type="conduit"
    dir="end">
-  <port name="shift_bytes" internal="shift_bytes" />
+  <port name="write" internal="write" />
  </interface>
  <module
+   name="asmi_parallel_0"
    kind="altera_asmi_parallel"
-   version="14.0"
+   version="14.1"
    enabled="1"
-   name="asmi_parallel_0"
    autoexport="1">
-  <parameter name="DEVICE_FAMILY" value="Arria 10" />
-  <parameter name="INTENDED_DEVICE_FAMILY" value="Arria 10" />
   <parameter name="CBX_AUTO_BLACKBOX" value="ALL" />
+  <parameter name="DATA_WIDTH" value="STANDARD" />
+  <parameter name="DEVICE_FAMILY" value="Arria 10" />
+  <parameter name="ENABLE_SIM" value="false" />
   <parameter name="EPCS_TYPE" value="EPCQL1024" />
-  <parameter name="gui_read_sid" value="false" />
-  <parameter name="gui_read_rdid" value="false" />
-  <parameter name="gui_read_status" value="false" />
-  <parameter name="gui_read_address" value="false" />
-  <parameter name="gui_fast_read" value="false" />
-  <parameter name="DATA_WIDTH" value="QUAD" />
-  <parameter name="gui_read_dummyclk" value="false" />
-  <parameter name="gui_write" value="true" />
-  <parameter name="gui_wren" value="true" />
-  <parameter name="gui_single_write" value="false" />
-  <parameter name="gui_page_write" value="true" />
+  <parameter name="INTENDED_DEVICE_FAMILY" value="Arria 10" />
   <parameter name="PAGE_SIZE" value="256" />
-  <parameter name="gui_use_eab" value="false" />
+  <parameter name="WRITE_DUMMY_CLK" value="0" />
   <parameter name="gui_bulk_erase" value="false" />
   <parameter name="gui_die_erase" value="false" />
+  <parameter name="gui_ex4b_addr" value="false" />
+  <parameter name="gui_fast_read" value="true" />
+  <parameter name="gui_page_write" value="true" />
+  <parameter name="gui_read_address" value="false" />
+  <parameter name="gui_read_dummyclk" value="false" />
+  <parameter name="gui_read_rdid" value="false" />
+  <parameter name="gui_read_sid" value="false" />
+  <parameter name="gui_read_status" value="false" />
   <parameter name="gui_sector_erase" value="true" />
   <parameter name="gui_sector_protect" value="false" />
-  <parameter name="gui_ex4b_addr" value="false" />
+  <parameter name="gui_single_write" value="false" />
   <parameter name="gui_use_asmiblock" value="false" />
-  <parameter name="WRITE_DUMMY_CLK" value="0" />
-  <parameter name="ENABLE_SIM" value="false" />
+  <parameter name="gui_use_eab" value="false" />
+  <parameter name="gui_wren" value="true" />
+  <parameter name="gui_write" value="true" />
  </module>
  <interconnectRequirement for="$system" name="qsys_mm.clockCrossingAdapter" value="HANDSHAKE" />
- <interconnectRequirement for="$system" name="qsys_mm.maxAdditionalLatency" value="1" />
  <interconnectRequirement for="$system" name="qsys_mm.insertDefaultSlave" value="FALSE" />
+ <interconnectRequirement for="$system" name="qsys_mm.maxAdditionalLatency" value="1" />
 </system>
diff --git a/libraries/technology/ip_arria10/flash/remote_update/compile_ip.tcl b/libraries/technology/ip_arria10/flash/remote_update/compile_ip.tcl
index 3d05ac8803..d2dc751055 100644
--- a/libraries/technology/ip_arria10/flash/remote_update/compile_ip.tcl
+++ b/libraries/technology/ip_arria10/flash/remote_update/compile_ip.tcl
@@ -28,7 +28,7 @@
 
 set IP_DIR   "$env(RADIOHDL)/libraries/technology/ip_arria10/flash/remote_update/generated/sim"
 
-vmap ip_arria10_remote_update_altera_remote_update_140 ./work/
+vmap ip_arria10_remote_update_altera_remote_update_141 ./work/
 
-vlog "$IP_DIR/../altera_remote_update_140/sim/ip_arria10_remote_update_altera_remote_update_140_5hyen6i.v" -work ip_arria10_remote_update_altera_remote_update_140
+vlog -sv "$IP_DIR/../altera_remote_update_141/sim/mentor/altera_remote_update.sv" -work ip_arria10_remote_update_altera_remote_update_141
 vcom "$IP_DIR/ip_arria10_remote_update.vhd"                                                                                                                       
diff --git a/libraries/technology/ip_arria10/flash/remote_update/hdllib.cfg b/libraries/technology/ip_arria10/flash/remote_update/hdllib.cfg
index 6e89b00668..bf9062c9e1 100644
--- a/libraries/technology/ip_arria10/flash/remote_update/hdllib.cfg
+++ b/libraries/technology/ip_arria10/flash/remote_update/hdllib.cfg
@@ -1,5 +1,5 @@
 hdl_lib_name = ip_arria10_remote_update
-hdl_library_clause_name = ip_arria10_remote_update_altera_remote_update_140
+hdl_library_clause_name = ip_arria10_remote_update_altera_remote_update_141
 hdl_lib_uses = 
 hdl_lib_technology = ip_arria10
 
diff --git a/libraries/technology/ip_arria10/flash/remote_update/ip_arria10_remote_update.qsys b/libraries/technology/ip_arria10/flash/remote_update/ip_arria10_remote_update.qsys
index 7178ea0b43..20d646f4a1 100644
--- a/libraries/technology/ip_arria10/flash/remote_update/ip_arria10_remote_update.qsys
+++ b/libraries/technology/ip_arria10/flash/remote_update/ip_arria10_remote_update.qsys
@@ -6,11 +6,16 @@
    version="1.0"
    description=""
    tags="INTERNAL_COMPONENT=true"
-   categories="" />
+   categories="System" />
  <parameter name="bonusData"><![CDATA[bonusData 
 {
    element $${FILENAME}
    {
+      datum _originalDeviceFamily
+      {
+         value = "Arria 10";
+         type = "String";
+      }
    }
    element remote_update_0
    {
@@ -40,12 +45,32 @@
  <parameter name="timeStamp" value="0" />
  <parameter name="useTestBenchNamingPattern" value="false" />
  <instanceScript></instanceScript>
+ <interface name="busy" internal="remote_update_0.busy" type="conduit" dir="end">
+  <port name="busy" internal="busy" />
+ </interface>
+ <interface name="clock" internal="remote_update_0.clock" type="clock" dir="end">
+  <port name="clock" internal="clock" />
+ </interface>
  <interface
-   name="read_param"
-   internal="remote_update_0.read_param"
+   name="ctl_nupdt"
+   internal="remote_update_0.ctl_nupdt"
    type="conduit"
    dir="end">
-  <port name="read_param" internal="read_param" />
+  <port name="ctl_nupdt" internal="ctl_nupdt" />
+ </interface>
+ <interface
+   name="data_in"
+   internal="remote_update_0.data_in"
+   type="conduit"
+   dir="end">
+  <port name="data_in" internal="data_in" />
+ </interface>
+ <interface
+   name="data_out"
+   internal="remote_update_0.data_out"
+   type="conduit"
+   dir="end">
+  <port name="data_out" internal="data_out" />
  </interface>
  <interface
    name="param"
@@ -55,34 +80,28 @@
   <port name="param" internal="param" />
  </interface>
  <interface
-   name="reconfig"
-   internal="remote_update_0.reconfig"
+   name="read_param"
+   internal="remote_update_0.read_param"
    type="conduit"
    dir="end">
-  <port name="reconfig" internal="reconfig" />
+  <port name="read_param" internal="read_param" />
  </interface>
  <interface
-   name="reset_timer"
-   internal="remote_update_0.reset_timer"
+   name="reconfig"
+   internal="remote_update_0.reconfig"
    type="conduit"
    dir="end">
-  <port name="reset_timer" internal="reset_timer" />
- </interface>
- <interface name="clock" internal="remote_update_0.clock" type="clock" dir="end">
-  <port name="clock" internal="clock" />
+  <port name="reconfig" internal="reconfig" />
  </interface>
  <interface name="reset" internal="remote_update_0.reset" type="reset" dir="end">
   <port name="reset" internal="reset" />
  </interface>
- <interface name="busy" internal="remote_update_0.busy" type="conduit" dir="end">
-  <port name="busy" internal="busy" />
- </interface>
  <interface
-   name="data_out"
-   internal="remote_update_0.data_out"
+   name="reset_timer"
+   internal="remote_update_0.reset_timer"
    type="conduit"
    dir="end">
-  <port name="data_out" internal="data_out" />
+  <port name="reset_timer" internal="reset_timer" />
  </interface>
  <interface
    name="write_param"
@@ -91,28 +110,21 @@
    dir="end">
   <port name="write_param" internal="write_param" />
  </interface>
- <interface
-   name="data_in"
-   internal="remote_update_0.data_in"
-   type="conduit"
-   dir="end">
-  <port name="data_in" internal="data_in" />
- </interface>
  <module
+   name="remote_update_0"
    kind="altera_remote_update"
-   version="14.0"
+   version="14.1"
    enabled="1"
-   name="remote_update_0"
    autoexport="1">
-  <parameter name="DEVICE_FAMILY" value="Arria 10" />
   <parameter name="CBX_AUTO_BLACKBOX" value="ALL" />
-  <parameter name="operation_mode" value="REMOTE" />
-  <parameter name="GUI_config_device" value="EPCQ512" />
-  <parameter name="m_support_write_config_check" value="true" />
+  <parameter name="DEVICE" value="10AX115U3F45I2LG" />
+  <parameter name="DEVICE_FAMILY" value="Arria 10" />
+  <parameter name="GUI_config_device" value="EPCQL1024" />
   <parameter name="check_app_pof" value="false" />
-  <parameter name="AUTO_CLOCK_CLOCK_RATE" value="0" />
+  <parameter name="m_support_write_config_check" value="true" />
+  <parameter name="operation_mode" value="REMOTE" />
  </module>
  <interconnectRequirement for="$system" name="qsys_mm.clockCrossingAdapter" value="HANDSHAKE" />
- <interconnectRequirement for="$system" name="qsys_mm.maxAdditionalLatency" value="1" />
  <interconnectRequirement for="$system" name="qsys_mm.insertDefaultSlave" value="FALSE" />
+ <interconnectRequirement for="$system" name="qsys_mm.maxAdditionalLatency" value="1" />
 </system>
-- 
GitLab