diff --git a/libraries/technology/flash/hdllib.cfg b/libraries/technology/flash/hdllib.cfg
index e3bf434a4ce1023b80a340f289c187e187f76432..e6dc1a8b05d98342086c5465e55946c9bea730cd 100644
--- a/libraries/technology/flash/hdllib.cfg
+++ b/libraries/technology/flash/hdllib.cfg
@@ -7,9 +7,9 @@ hdl_lib_uses_synth = technology
ip_arria10_e3sge3_asmi_parallel
ip_arria10_e3sge3_remote_update
ip_arria10_e1sg_asmi_parallel # modelsim crashes when asmi_parallel ip is used(segmentation violation)
- ip_arria10_e1sg_remote_update
- ip_arria10_e2sg_asmi_parallel
- ip_arria10_e2sg_remote_update
+ ip_arria10_e1sg_remote_update # modelsim crashes when asmi_parallel ip is used(segmentation violation)
+ ip_arria10_e2sg_asmi_parallel # modelsim crashes when asmi_parallel ip is used(segmentation violation)
+ ip_arria10_e2sg_remote_update # modelsim crashes when asmi_parallel ip is used(segmentation violation)
hdl_lib_uses_sim =
hdl_lib_technology =
hdl_lib_disclose_library_clause_names =
@@ -26,8 +26,8 @@ hdl_lib_disclose_library_clause_names =
synth_files =
tech_flash_component_pkg.vhd
- tech_flash_asmi_parallel.vhd #e1sg component is not instantiated in simulation
- tech_flash_remote_update.vhd
+ tech_flash_asmi_parallel.vhd #e1sg,e2sg component is not instantiated in simulation, only for synthesis
+ tech_flash_remote_update.vhd #e1sg,e2sg component is not instantiated in simulation, only for synthesis
test_bench_files =
diff --git a/libraries/technology/flash/tech_flash_asmi_parallel.vhd b/libraries/technology/flash/tech_flash_asmi_parallel.vhd
index b91e7ee92f51a48fd18ed2595e63346228128711..7a0431e7b19f866832a42eae8f5a8713fbadd4bb 100644
--- a/libraries/technology/flash/tech_flash_asmi_parallel.vhd
+++ b/libraries/technology/flash/tech_flash_asmi_parallel.vhd
@@ -32,7 +32,7 @@ LIBRARY ip_stratixiv_flash_lib;
LIBRARY ip_arria10_asmi_parallel_altera_asmi_parallel_150;
LIBRARY ip_arria10_e3sge3_asmi_parallel_altera_asmi_parallel_151;
--LIBRARY ip_arria10_e1sg_asmi_parallel_altera_asmi_parallel_180;
-LIBRARY ip_arria10_e2sg_asmi_parallel_altera_asmi_parallel_1910;
+--LIBRARY ip_arria10_e2sg_asmi_parallel_altera_asmi_parallel_1910;
ENTITY tech_flash_asmi_parallel IS
GENERIC (
diff --git a/libraries/technology/flash/tech_flash_remote_update.vhd b/libraries/technology/flash/tech_flash_remote_update.vhd
index e30a5affdb1aaabf0a90da230e54e3f9efe23928..4d097ce383ff615caf77ee8622b80291cbfc259f 100644
--- a/libraries/technology/flash/tech_flash_remote_update.vhd
+++ b/libraries/technology/flash/tech_flash_remote_update.vhd
@@ -31,8 +31,8 @@ USE technology_lib.technology_select_pkg.ALL;
LIBRARY ip_stratixiv_flash_lib;
LIBRARY ip_arria10_remote_update_altera_remote_update_150;
LIBRARY ip_arria10_e3sge3_remote_update_altera_remote_update_151;
-LIBRARY ip_arria10_e1sg_remote_update_altera_remote_update_180;
-LIBRARY ip_arria10_e2sg_remote_update_altera_remote_update_1910;
+--LIBRARY ip_arria10_e1sg_remote_update_altera_remote_update_180;
+--LIBRARY ip_arria10_e2sg_remote_update_altera_remote_update_1910;
ENTITY tech_flash_remote_update IS
GENERIC (
diff --git a/libraries/technology/ip_arria10_e2sg/altera_libraries/altera_asmi_parallel_1910/hdllib.cfg b/libraries/technology/ip_arria10_e2sg/altera_libraries/altera_asmi_parallel_1910/hdllib.cfg
index b55caa82d66dcb7b7741133b823c55b6ffaa1a7c..e12f81a5e5ffcaf9be45fd6668552b82c4dd0a11 100644
--- a/libraries/technology/ip_arria10_e2sg/altera_libraries/altera_asmi_parallel_1910/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e2sg/altera_libraries/altera_asmi_parallel_1910/hdllib.cfg
@@ -1,4 +1,5 @@
hdl_lib_name = ip_arria10_e2sg_altera_asmi_parallel_1910
+# Note, this library causes modelsim to crash!
hdl_library_clause_name = altera_asmi_parallel_1910
hdl_lib_uses_synth =
hdl_lib_uses_sim =
diff --git a/libraries/technology/ip_arria10_e2sg/altera_libraries/altera_remote_update_1910/compile_ip.tcl b/libraries/technology/ip_arria10_e2sg/altera_libraries/altera_remote_update_1910/compile_ip.tcl
index 9b124aeee40aa003c243d361ed26215b2b3a0b39..13a78195a945f878b6b502e093c00fd70fc0870c 100644
--- a/libraries/technology/ip_arria10_e2sg/altera_libraries/altera_remote_update_1910/compile_ip.tcl
+++ b/libraries/technology/ip_arria10_e2sg/altera_libraries/altera_remote_update_1910/compile_ip.tcl
@@ -26,7 +26,7 @@
# - replace QSYS_SIMDIR by IP_DIR
# - if the testbench is also generated with QSYS then only the IP_TBDIR files are needed, because these also contain the source files.
-#vlib ./work/ ;# Assume library work already exist
+vlib ./work/ ;# Assume library work already exist
set IP_DIR "$env(HDL_BUILD_DIR)/$env(BUILDSET)/qsys-generate/ip_arria10_e2sg_remote_update/sim"
diff --git a/libraries/technology/ip_arria10_e2sg/altera_libraries/altera_remote_update_1910/hdllib.cfg b/libraries/technology/ip_arria10_e2sg/altera_libraries/altera_remote_update_1910/hdllib.cfg
index 83a19e1b246e72236be1eed67d13ec305050deaa..428e6c1871dce197004ef1b1d9344c2a3e948728 100644
--- a/libraries/technology/ip_arria10_e2sg/altera_libraries/altera_remote_update_1910/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e2sg/altera_libraries/altera_remote_update_1910/hdllib.cfg
@@ -1,4 +1,5 @@
hdl_lib_name = ip_arria10_e2sg_altera_remote_update_1910
+# Note, this library causes modelsim to crash!
hdl_library_clause_name = altera_remote_update_1910
hdl_lib_uses_synth =
hdl_lib_uses_sim = ip_arria10_e2sg_altera_remote_update_core_1910
diff --git a/libraries/technology/ip_arria10_e2sg/altera_libraries/altera_remote_update_core_1910/compile_ip.tcl b/libraries/technology/ip_arria10_e2sg/altera_libraries/altera_remote_update_core_1910/compile_ip.tcl
index 41bea969d2a7353840feacfd2ed38f9bcc3d3143..006a7835bfd6063ecc7898382e6bc0d8640a6747 100644
--- a/libraries/technology/ip_arria10_e2sg/altera_libraries/altera_remote_update_core_1910/compile_ip.tcl
+++ b/libraries/technology/ip_arria10_e2sg/altera_libraries/altera_remote_update_core_1910/compile_ip.tcl
@@ -26,7 +26,7 @@
# - replace QSYS_SIMDIR by IP_DIR
# - if the testbench is also generated with QSYS then only the IP_TBDIR files are needed, because these also contain the source files.
-#vlib ./work/ ;# Assume library work already exist
+vlib ./work/ ;# Assume library work already exist
set IP_DIR "$env(HDL_BUILD_DIR)/$env(BUILDSET)/qsys-generate/ip_arria10_e2sg_remote_update/sim"
diff --git a/libraries/technology/ip_arria10_e2sg/flash/asmi_parallel/compile_ip.tcl b/libraries/technology/ip_arria10_e2sg/flash/asmi_parallel/compile_ip.tcl
index d14407ec43819d25f028e97d1dd64f2497e1b21e..1ce4968f35431047637732f3bdd3bd62649b5233 100644
--- a/libraries/technology/ip_arria10_e2sg/flash/asmi_parallel/compile_ip.tcl
+++ b/libraries/technology/ip_arria10_e2sg/flash/asmi_parallel/compile_ip.tcl
@@ -26,10 +26,7 @@
# - replace QSYS_SIMDIR by IP_DIR
# - if the testbench is also generated with QSYS then only the IP_TBDIR files are needed, because these also contain the source files.
-vlib ./work/ ;# Assume library work already exist
-
+#vlib ./work/ ;# Assume library work already exist
set IP_DIR "$env(HDL_BUILD_DIR)/$env(BUILDSET)/qsys-generate/ip_arria10_e2sg_asmi_parallel/sim"
-
-
- vcom "$IP_DIR/ip_arria10_e2sg_asmi_parallel.vhd"
+ vcom "$IP_DIR/ip_arria10_e2sg_asmi_parallel.vhd"
diff --git a/libraries/technology/ip_arria10_e2sg/flash/asmi_parallel/hdllib.cfg b/libraries/technology/ip_arria10_e2sg/flash/asmi_parallel/hdllib.cfg
index 474a468c1eb0fc088b5b0ebc0d330c1d91ffa92e..07ae00fb5840b2d978c0b2986dde9ec85f9994c2 100644
--- a/libraries/technology/ip_arria10_e2sg/flash/asmi_parallel/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e2sg/flash/asmi_parallel/hdllib.cfg
@@ -1,9 +1,7 @@
hdl_lib_name = ip_arria10_e2sg_asmi_parallel
hdl_library_clause_name = ip_arria10_e2sg_asmi_parallel_altera_asmi_parallel_1910
hdl_lib_uses_synth =
-hdl_lib_uses_sim =
-# Do not use this simulation library: it causes Modelsim to crash:
-#ip_arria10_e2sg_altera_asmi_parallel_1910
+hdl_lib_uses_sim = ip_arria10_e2sg_altera_asmi_parallel_1910
hdl_lib_technology = ip_arria10_e2sg
synth_files =
diff --git a/libraries/technology/ip_arria10_e2sg/flash/remote_update/hdllib.cfg b/libraries/technology/ip_arria10_e2sg/flash/remote_update/hdllib.cfg
index d699858547cda662671410e916de6b4c582272b5..662398ca5c0bda555b53a358a5c96aad79ce308d 100644
--- a/libraries/technology/ip_arria10_e2sg/flash/remote_update/hdllib.cfg
+++ b/libraries/technology/ip_arria10_e2sg/flash/remote_update/hdllib.cfg
@@ -1,9 +1,7 @@
hdl_lib_name = ip_arria10_e2sg_remote_update
hdl_library_clause_name = ip_arria10_e2sg_remote_update_altera_remote_update_1910
hdl_lib_uses_synth =
-hdl_lib_uses_sim =
-# Do not use this simulation library: it causes Modelsim to crash:
-#ip_arria10_e2sg_altera_remote_update_1910
+hdl_lib_uses_sim = ip_arria10_e2sg_altera_remote_update_1910
hdl_lib_technology = ip_arria10_e2sg
synth_files =